remove patch 68: 副作用过大

TinyLake · Dec 21, 2024 · e729033 · e729033
1 parent c3ad80a
commit e729033
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 38 deletions.
diff --git a/patches/client/0029-H-misc.patch b/patches/client/0029-H-misc.patch
@@ -16,6 +16,7 @@ Content-Transfer-Encoding: 8bit
  core/src/mindustry/core/UI.java               | 20 ++-----------------
  core/src/mindustry/game/Schematics.java       |  8 +++++---
  .../mindustry/graphics/MinimapRenderer.java   |  6 ++++--
+ core/src/mindustry/net/Net.java               |  2 +-
  core/src/mindustry/ui/dialogs/JoinDialog.java | 19 ++++++++++--------
  .../mindustry/ui/dialogs/KeybindDialog.java   |  9 ++++++---
  .../ui/fragments/BlockInventoryFragment.java  |  2 +-
@@ -24,7 +25,7 @@ Content-Transfer-Encoding: 8bit
  .../world/blocks/distribution/Router.java     |  3 ++-
  .../world/blocks/production/BeamDrill.java    | 12 ++++-------
  .../mindustry/desktop/DesktopLauncher.java    | 12 ++++++++++-
- 16 files changed, 79 insertions(+), 49 deletions(-)
+ 17 files changed, 80 insertions(+), 50 deletions(-)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
 index 87c1dfce278bdc123ee761d8e1e16c2b883d2c8a..bb7e299b171161d1416d27e724a40968961725f9 100644
@@ -222,6 +223,19 @@ index e19cb5fb99d1013911ad892249a67b0575dcb1f6..19736bd0dfb4235d6f753a6452198b3c
          float dx = (Core.camera.position.x / tilesize);
          float dy = (Core.camera.position.y / tilesize);
          dx = Mathf.clamp(dx, sz, world.width() - sz);
+diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
+index 22b66b83cde27a73415b9154ed813cdfeb3d3b36..5eeadf6bfe2d6d61973494294be4277c68f6516c 100644
+--- a/core/src/mindustry/net/Net.java
++++ b/core/src/mindustry/net/Net.java
+@@ -36,7 +36,7 @@ public class Net{
+     private final ObjectMap<Class<?>, Cons> clientListeners = new ObjectMap<>();
+     private final ObjectMap<Class<?>, Cons2<NetConnection, Object>> serverListeners = new ObjectMap<>();
+     private final IntMap<StreamBuilder> streams = new IntMap<>();
+-    private final ExecutorService pingExecutor = OS.isWindows && !OS.is64Bit ? Threads.boundedExecutor("Ping Servers", 5) : Threads.unboundedExecutor();
++    private final ExecutorService pingExecutor = OS.isWindows && !OS.is64Bit ? Threads.boundedExecutor("Ping Servers", 5) : Threads.unboundedExecutor("Ping Servers", 4);//MDTX: named and Keep 4 min
+
+     private final NetProvider provider;
+
 diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
 index 3b826c3c79d6e0aaf5d51b91ce4283aa5db486c7..8e612c40aeec86cf4c1cbe271096d72615d2e6f8 100644
 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java

diff --git a/patches/client/0059-FC-reliableSync.patch b/patches/client/0059-FC-reliableSync.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] FC: reliableSync
  1 file changed, 1 insertion(+)
 
 diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
-index 22b66b83cde27a73415b9154ed813cdfeb3d3b36..a0ffd0d960772e45f16d935c46ffdcfcfaded35e 100644
+index 5eeadf6bfe2d6d61973494294be4277c68f6516c..a7d84b5651c86f3c6c96ab11a56a8f1feb09c349 100644
 --- a/core/src/mindustry/net/Net.java
 +++ b/core/src/mindustry/net/Net.java
 @@ -231,6 +231,7 @@ public class Net{

diff --git a/...lient/0069-HC-placeShiftReplacement.patch → ...lient/0068-HC-placeShiftReplacement.patch b/...lient/0069-HC-placeShiftReplacement.patch → ...lient/0068-HC-placeShiftReplacement.patch
diff --git a/patches/client/0068-OC-limit-pingExecutor-Ping.patch b/patches/client/0068-OC-limit-pingExecutor-Ping.patch
diff --git a/...lient/0070-FC-extend-WaveInfoDialog.patch → ...lient/0069-FC-extend-WaveInfoDialog.patch b/...lient/0070-FC-extend-WaveInfoDialog.patch → ...lient/0069-FC-extend-WaveInfoDialog.patch
diff --git a/...1-FC-paste-logicCode-from-schematic.patch → ...0-FC-paste-logicCode-from-schematic.patch b/...1-FC-paste-logicCode-from-schematic.patch → ...0-FC-paste-logicCode-from-schematic.patch