Skip to content

Commit b48e2b7

Browse files
way-zerway-zer
committed
Update BE25136(0425408) -> BE25162(733f642)
TIP: arc上游合并了SpriteBatch相关优化
1 parent f8bb98d commit b48e2b7

29 files changed

+127
-837
lines changed

‎patches/client/0001-BUILD-build.gradle.kts-and-clear.patch

+1-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ way-zer <[email protected]> on 2024/6/9
1515
core/build.gradle | 2 -
1616
core/build.gradle.kts | 64 ++++
1717
desktop/build.gradle | 164 +---------
18-
gradle.properties | 2 +
1918
gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 43462 bytes
2019
gradlew | 282 +++++++++++-------
2120
gradlew.bat | 35 ++-
@@ -24,7 +23,7 @@ way-zer <[email protected]> on 2024/6/9
2423
settings.gradle | 10 +-
2524
tools/build.gradle | 44 ++-
2625
tools/src/mindustry/tools/Generators.java | 2 +-
27-
18 files changed, 384 insertions(+), 611 deletions(-)
26+
17 files changed, 382 insertions(+), 611 deletions(-)
2827
create mode 100644 annotations/src/main/java/com/github/bsideup/jabel/Desugar.java
2928
create mode 100644 annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
3029
delete mode 100644 core/build.gradle
@@ -844,19 +843,6 @@ index 7f4ecdcf0a6407ffce7181234527dc6cbc4d484b..b63f4a3ca7964f41f02a3fa12a068f85
844843
-}
845844
+}
846845
\ No newline at end of file
847-
diff --git a/gradle.properties b/gradle.properties
848-
index 827c8445c4ac9ea773041bba50235598c3604fe1..16ce1c54512959ff201113c746e222291fdb11ff 100644
849-
--- a/gradle.properties
850-
+++ b/gradle.properties
851-
@@ -21,6 +21,8 @@ kapt.include.compile.classpath=false
852-
kotlin.stdlib.default.dependency=false
853-
#needed for android compilation
854-
android.useAndroidX=true
855-
+# AGP 8 update
856-
+android.enableR8.fullMode=false
857-
org.gradle.caching=true
858-
#used for slow jitpack builds; TODO see if this actually works
859-
org.gradle.internal.http.socketTimeout=100000
860846
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
861847
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
862848
GIT binary patch

‎patches/client/0003-CS-Version.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ index 48599c6b96474117057e7ca2b87b545873a0ea31..4366eeef830845fb13132a0ae3534129
173173
buffer.put((byte)state.rules.mode().ordinal());
174174
buffer.putInt(netServer.admins.getPlayerLimit());
175175
diff --git a/gradle.properties b/gradle.properties
176-
index 16ce1c54512959ff201113c746e222291fdb11ff..81861490f166f3f5af54997d6bb1ac8adedff122 100644
176+
index 048ee4d9efe3907eacdd135f80bc38bc7d97c605..82e277deb64d1f368ec2dfc6b02ef2011c8c7370 100644
177177
--- a/gradle.properties
178178
+++ b/gradle.properties
179-
@@ -29,3 +29,5 @@ org.gradle.internal.http.socketTimeout=100000
179+
@@ -27,3 +27,5 @@ org.gradle.internal.http.socketTimeout=100000
180180
org.gradle.internal.http.connectionTimeout=100000
181181
android.enableR8.fullMode=false
182-
archash=96cd86d08a
182+
archash=6676d38433
183183
+
184-
+upstreamBuild=25136
184+
+upstreamBuild=25162
185185
\ No newline at end of file

‎patches/client/0004-API-Hooks.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Subject: [PATCH] API: Hooks
1212
create mode 100644 core/src/mindustryX/Hooks.java
1313

1414
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
15-
index 2a7b133588279145272136f6aa2a02276f34d824..fa6e5c5b52cfdb83de5b50539d57c579aa6e0c95 100644
15+
index 2e8d7396c1ac3eea65a6d0fa8bf03f86088768df..e3bf01fb63b179f4669e99c43891b842bcae66a6 100644
1616
--- a/core/src/mindustry/ClientLauncher.java
1717
+++ b/core/src/mindustry/ClientLauncher.java
1818
@@ -171,6 +171,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform

‎patches/client/0011-API-add-LogicAssembledEvent.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 6f65e9981f2291d1c892c23f3ec8603aec8e3a4c..32133826223d3e4fe1be991c8abd3bc2
3434
}
3535
line ++;
3636
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
37-
index 3ca506e0e0ec45bf4bfbc58029e2db65673a4c60..9884b9846f06a48c4596ffa5f29f59279b3c21b7 100644
37+
index a27e35304befd452e741012aa23d6a59a9f30b54..a176f45e5d76ed8396f2d91cc1b25d528f78aefe 100644
3838
--- a/core/src/mindustry/logic/LStatements.java
3939
+++ b/core/src/mindustry/logic/LStatements.java
4040
@@ -20,6 +20,7 @@ import mindustry.logic.LogicFx.*;

‎patches/client/0013-C.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Content-Transfer-Encoding: 8bit
1212
1 file changed, 14 insertions(+)
1313

1414
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
15-
index fa6e5c5b52cfdb83de5b50539d57c579aa6e0c95..8dacfa202c6ade755c54c78c67282541361fea4a 100644
15+
index e3bf01fb63b179f4669e99c43891b842bcae66a6..b4c83b0e03a421e9f4d738944dca1873f6a27c82 100644
1616
--- a/core/src/mindustry/ClientLauncher.java
1717
+++ b/core/src/mindustry/ClientLauncher.java
1818
@@ -238,6 +238,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform

‎patches/client/0017-C-RenderExt-arcChoiceUiIcon.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ index 0a7461a7ec54131d4a81f0a80c3039341f3100d1..18a282b760a6adb78e21b8625b19ed60
9999

100100
super.draw();
101101
diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
102-
index db0fdbfe1e4746cf55043276f84cd5e9677ec5bf..8653e861192ee7ddab781bd03d4843ad83b78c45 100644
102+
index 08a9880162a424f21906fb1d48d21516bfb66b15..eccb17f2542446a1e6fb2a4b0a90bfd08d3c860d 100644
103103
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
104104
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
105-
@@ -17,6 +17,8 @@ import mindustry.world.meta.*;
105+
@@ -18,6 +18,8 @@ import mindustry.world.meta.*;
106106

107107
import java.util.*;
108108

@@ -111,7 +111,7 @@ index db0fdbfe1e4746cf55043276f84cd5e9677ec5bf..8653e861192ee7ddab781bd03d4843ad
111111
import static mindustry.Vars.*;
112112

113113
public class Unloader extends Block{
114-
@@ -222,6 +224,10 @@ public class Unloader extends Block{
114+
@@ -228,6 +230,10 @@ public class Unloader extends Block{
115115
public void draw(){
116116
super.draw();
117117

‎patches/client/0019-C-RenderExt-hiddenItemTransparency.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ index 6fe8e90722ef740148d337a09754febd47a7ab10..8a6de353e073b653abfd14a261090570
127127
public void write(Writes write){
128128
super.write(write);
129129
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
130-
index 2663365fc253a5eee6113ff6070b3624bfdceaf6..0de0b62d119ca4befb1612374f96690b3434b6b3 100644
130+
index 0ec2e16bcd63482b2d3a24a50d8700b2f6b33afe..fa11e9f00f1e62b7bfb78067d1da88e405f91ab3 100644
131131
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
132132
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
133133
@@ -17,6 +17,7 @@ import mindustry.input.*;
@@ -138,7 +138,7 @@ index 2663365fc253a5eee6113ff6070b3624bfdceaf6..0de0b62d119ca4befb1612374f96690b
138138

139139
import static mindustry.Vars.*;
140140

141-
@@ -354,6 +355,20 @@ public class ItemBridge extends Block{
141+
@@ -356,6 +357,20 @@ public class ItemBridge extends Block{
142142
public void draw(){
143143
super.draw();
144144

‎patches/client/0023-C-StatExt.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ index 874fa6ceff4c1ea412db02eb2adfb4e491771b19..728b0d8423dfc2e09f5a8d4ca74fca04
320320
this(stack.item.uiIcon, stack.amount);
321321
}
322322
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
323-
index d2b2cbf2fa285ede7df166c8171c73936196cab1..c1dde3fda61032c7e404f3ec3628a6fcfa3df9af 100644
323+
index 1576cfb1623ba1b1cdfc791e70b5efc1535c25c8..766a0e295b0d165fb39014a2b51d43f70a23c48e 100644
324324
--- a/core/src/mindustry/world/Block.java
325325
+++ b/core/src/mindustry/world/Block.java
326326
@@ -32,6 +32,7 @@ import mindustry.world.blocks.environment.*;
@@ -331,7 +331,7 @@ index d2b2cbf2fa285ede7df166c8171c73936196cab1..c1dde3fda61032c7e404f3ec3628a6fc
331331

332332
import java.lang.reflect.*;
333333
import java.util.*;
334-
@@ -544,7 +545,7 @@ public class Block extends UnlockableContent implements Senseable{
334+
@@ -552,7 +553,7 @@ public class Block extends UnlockableContent implements Senseable{
335335
}
336336
}
337337

@@ -340,7 +340,7 @@ index d2b2cbf2fa285ede7df166c8171c73936196cab1..c1dde3fda61032c7e404f3ec3628a6fc
340340
stats.add(Stat.buildTime, buildCost / 60, StatUnit.seconds);
341341
stats.add(Stat.buildCost, StatValues.items(false, requirements));
342342
}
343-
@@ -556,6 +557,7 @@ public class Block extends UnlockableContent implements Senseable{
343+
@@ -564,6 +565,7 @@ public class Block extends UnlockableContent implements Senseable{
344344
for(var c : consumers){
345345
c.display(stats);
346346
}

‎patches/client/0029-BUILD-Kotlin-1.9.20.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ index 63f413ea5fe200cd88c48bb5efeca4ffe342f438..c2e653f692f743e6ef33a647002f68b5
5151
mods.add(internalMod(meta("MindustryX", "MindustryX", Version.mdtXBuild, "")));
5252
return mods;
5353
diff --git a/gradle.properties b/gradle.properties
54-
index 81861490f166f3f5af54997d6bb1ac8adedff122..85ffb7703a2f41e9ec9d7c4681158d00e12add6c 100644
54+
index 82e277deb64d1f368ec2dfc6b02ef2011c8c7370..27667713782de440711293558d22979f28458fe0 100644
5555
--- a/gradle.properties
5656
+++ b/gradle.properties
5757
@@ -18,7 +18,7 @@ kapt.use.worker.api=true
@@ -62,4 +62,4 @@ index 81861490f166f3f5af54997d6bb1ac8adedff122..85ffb7703a2f41e9ec9d7c4681158d00
6262
+#kotlin.stdlib.default.dependency=false
6363
#needed for android compilation
6464
android.useAndroidX=true
65-
# AGP 8 update
65+
org.gradle.caching=true

‎patches/client/0046-ARC-setBars.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ index 820255f6028e91d1a11ec7dbbee4a796e4d917a8..7c938a53c6fb4c60e7954fa24ec709f4
5050
}
5151
}
5252
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
53-
index c1dde3fda61032c7e404f3ec3628a6fcfa3df9af..01098e5f4564f3e1e7491d34cbbca1a525592c16 100644
53+
index 766a0e295b0d165fb39014a2b51d43f70a23c48e..17eb52a168f9aef61edcdb31a5664dff3eedb6eb 100644
5454
--- a/core/src/mindustry/world/Block.java
5555
+++ b/core/src/mindustry/world/Block.java
5656
@@ -33,6 +33,7 @@ import mindustry.world.blocks.power.*;
@@ -61,7 +61,7 @@ index c1dde3fda61032c7e404f3ec3628a6fcfa3df9af..01098e5f4564f3e1e7491d34cbbca1a5
6161

6262
import java.lang.reflect.*;
6363
import java.util.*;
64-
@@ -578,7 +579,7 @@ public class Block extends UnlockableContent implements Senseable{
64+
@@ -586,7 +587,7 @@ public class Block extends UnlockableContent implements Senseable{
6565

6666
public void addLiquidBar(Liquid liq){
6767
addBar("liquid-" + liq.name, entity -> !liq.unlockedNow() ? null : new Bar(
@@ -70,7 +70,7 @@ index c1dde3fda61032c7e404f3ec3628a6fcfa3df9af..01098e5f4564f3e1e7491d34cbbca1a5
7070
liq::barColor,
7171
() -> entity.liquids.get(liq) / liquidCapacity
7272
));
73-
@@ -586,15 +587,19 @@ public class Block extends UnlockableContent implements Senseable{
73+
@@ -594,15 +595,19 @@ public class Block extends UnlockableContent implements Senseable{
7474

7575
/** Adds a liquid bar that dynamically displays a liquid type. */
7676
public <T extends Building> void addLiquidBar(Func<T, Liquid> current){
@@ -95,7 +95,7 @@ index c1dde3fda61032c7e404f3ec3628a6fcfa3df9af..01098e5f4564f3e1e7491d34cbbca1a5
9595

9696
if(consPower != null){
9797
boolean buffered = consPower.buffered;
98-
@@ -602,7 +607,11 @@ public class Block extends UnlockableContent implements Senseable{
98+
@@ -610,7 +615,11 @@ public class Block extends UnlockableContent implements Senseable{
9999

100100
addBar("power", entity -> new Bar(
101101
() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : UI.formatAmount((int)(entity.power.status * capacity))) :

‎patches/client/0054-C-no-MapPreviewLoader.setupLoaders.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] C: no MapPreviewLoader.setupLoaders
88
1 file changed, 2 insertions(+), 1 deletion(-)
99

1010
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
11-
index 8dacfa202c6ade755c54c78c67282541361fea4a..01c14129869a0b38fe0943b0172db597e3b491a5 100644
11+
index b4c83b0e03a421e9f4d738944dca1873f6a27c82..6042c38333736e5cb7d33db2e3effa8a1e261ca5 100644
1212
--- a/core/src/mindustry/ClientLauncher.java
1313
+++ b/core/src/mindustry/ClientLauncher.java
1414
@@ -137,7 +137,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform

‎patches/client/0055-OSC-lambda.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ index 659112d57a88c0550f161849111a196fba503d03..4050fbd3bfb3365d671c20cf5787e76a
6868
result = e;
6969
cdist = cost;
7070
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
71-
index 85bd903395a602ebe91efd42ad743cbdb316d5fb..f817e6e8c42c12c8310189ff3c6c5fe6c05acf43 100644
71+
index 74fb8a7365206ff4ac557ebd4c19d584a3a7db1a..39ae758712d7c44e3831ff42b7b3eb769f15a62e 100644
7272
--- a/core/src/mindustry/entities/bullet/BulletType.java
7373
+++ b/core/src/mindustry/entities/bullet/BulletType.java
74-
@@ -621,6 +621,7 @@ public class BulletType extends Content implements Cloneable{
74+
@@ -628,6 +628,7 @@ public class BulletType extends Content implements Cloneable{
7575
}
7676
}
7777

7878
+ private static Bullet argBullet;
7979
public void updateHoming(Bullet b){
8080
if(homingPower > 0.0001f && b.time >= homingDelay){
8181
float realAimX = b.aimX < 0 ? b.x : b.aimX;
82-
@@ -628,20 +629,22 @@ public class BulletType extends Content implements Cloneable{
82+
@@ -635,20 +636,22 @@ public class BulletType extends Content implements Cloneable{
8383

8484
Teamc target;
8585
//home in on allies if possible
@@ -107,7 +107,7 @@ index 85bd903395a602ebe91efd42ad743cbdb316d5fb..f817e6e8c42c12c8310189ff3c6c5fe6
107107
if(target != null){
108108
b.vel.setAngle(Angles.moveToward(b.rotation(), b.angleTo(target), homingPower * Time.delta * 50f));
109109
diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java
110-
index a0cab5c03ea751a90a4bedb198af313c8c8d61b1..9e542b5c6b678e4ee464f0d384ae28249fb9c57d 100644
110+
index 7c30b947965d0b29a2cabadf7d2ffa4ce03456f9..b3513f16a28ef923685974f78543973b95e33bac 100644
111111
--- a/core/src/mindustry/graphics/LightRenderer.java
112112
+++ b/core/src/mindustry/graphics/LightRenderer.java
113113
@@ -8,6 +8,7 @@ import arc.math.*;
@@ -307,7 +307,7 @@ index a0cab5c03ea751a90a4bedb198af313c8c8d61b1..9e542b5c6b678e4ee464f0d384ae2824
307307
float rot = Mathf.angleExact(x2 - x, y2 - y);
308308
- TextureRegion ledge = Core.atlas.find("circle-end"), lmid = Core.atlas.find("circle-mid");
309309
-
310-
float color = Draw.getColor().toFloatBits();
310+
float color = Draw.getColorPacked();
311311
float u = lmid.u;
312312
float v = lmid.v2;
313313
@@ -178,60 +294,6 @@ public class LightRenderer{

‎patches/client/0056-API-C-DebugUtil.patch

+17-26
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ Content-Transfer-Encoding: 8bit
99
更多统计信息
1010
way-zer <[email protected]> on 2024/7/21
1111
---
12-
.../arc/graphics/g2d/MySortedSpriteBatch.java | 27 +++++++++++++++++++
13-
core/src/mindustry/ClientLauncher.java | 3 ++-
12+
core/src/arc/graphics/g2d/MySpriteBatch.java | 26 +++++++++++++++++++
13+
core/src/mindustry/ClientLauncher.java | 2 +-
1414
core/src/mindustry/core/Logic.java | 3 +++
1515
.../mindustry/ui/fragments/HudFragment.java | 7 +++++
1616
core/src/mindustryX/Hooks.java | 1 +
1717
core/src/mindustryX/features/DebugUtil.java | 21 +++++++++++++++
18-
6 files changed, 61 insertions(+), 1 deletion(-)
19-
create mode 100644 core/src/arc/graphics/g2d/MySortedSpriteBatch.java
18+
6 files changed, 59 insertions(+), 1 deletion(-)
19+
create mode 100644 core/src/arc/graphics/g2d/MySpriteBatch.java
2020
create mode 100644 core/src/mindustryX/features/DebugUtil.java
2121

22-
diff --git a/core/src/arc/graphics/g2d/MySortedSpriteBatch.java b/core/src/arc/graphics/g2d/MySortedSpriteBatch.java
22+
diff --git a/core/src/arc/graphics/g2d/MySpriteBatch.java b/core/src/arc/graphics/g2d/MySpriteBatch.java
2323
new file mode 100644
24-
index 0000000000000000000000000000000000000000..feca84a8eec0f7d514f9aa6be6f82134d8622721
24+
index 0000000000000000000000000000000000000000..e2bdb30e190a210f25130c423c853892798e4c28
2525
--- /dev/null
26-
+++ b/core/src/arc/graphics/g2d/MySortedSpriteBatch.java
27-
@@ -0,0 +1,27 @@
26+
+++ b/core/src/arc/graphics/g2d/MySpriteBatch.java
27+
@@ -0,0 +1,26 @@
2828
+package arc.graphics.g2d;
2929
+
3030
+import arc.graphics.*;
3131
+import mindustryX.features.*;
3232
+
3333
+//MDTX: add some DebugUtil count.
34-
+public class MySortedSpriteBatch extends SortedSpriteBatch{
34+
+public class MySpriteBatch extends SpriteBatch{
3535
+ @Override
3636
+ protected void flush(){
3737
+ DebugUtil.lastFlushCount++;
@@ -40,8 +40,7 @@ index 0000000000000000000000000000000000000000..feca84a8eec0f7d514f9aa6be6f82134
4040
+
4141
+ @Override
4242
+ protected void flushRequests(){
43-
+ if(flushing) return;
44-
+ DebugUtil.lastVertices += numVertices / 6;
43+
+ DebugUtil.lastVertices += requestVertOffset / 6;
4544
+ DebugUtil.lastDrawRequests += numRequests;
4645
+ super.flushRequests();
4746
+ }
@@ -53,28 +52,20 @@ index 0000000000000000000000000000000000000000..feca84a8eec0f7d514f9aa6be6f82134
5352
+ }
5453
+}
5554
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
56-
index 01c14129869a0b38fe0943b0172db597e3b491a5..7c897514ef279333ed007b17a7b4c242880d8b22 100644
55+
index 6042c38333736e5cb7d33db2e3effa8a1e261ca5..068a243ba87023201aaf0c287e9ee35341e312a3 100644
5756
--- a/core/src/mindustry/ClientLauncher.java
5857
+++ b/core/src/mindustry/ClientLauncher.java
59-
@@ -20,6 +20,7 @@ import mindustry.maps.*;
60-
import mindustry.mod.*;
61-
import mindustry.net.*;
62-
import mindustry.ui.*;
63-
+import mindustryX.features.*;
64-
65-
import static arc.Core.*;
66-
import static mindustry.Vars.*;
67-
@@ -70,7 +71,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
58+
@@ -70,7 +70,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
6859
});
6960

7061
UI.loadColors();
71-
- batch = new SortedSpriteBatch();
72-
+ batch = new MySortedSpriteBatch();
62+
- batch = new SpriteBatch();
63+
+ batch = new MySpriteBatch();
7364
assets = new AssetManager();
7465
assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
7566

7667
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
77-
index 7d1a7bb5b951ab9b07c0ad8edfd83e75e57ad751..784e1b493873ee74cd95bae4b1da54ba7d780bd3 100644
68+
index 59f9b3cdcd0a11e30959e5f8ba2a1cbcaf472cff..788f23d4a1a3b498a0f451f90c426a1b86516e5c 100644
7869
--- a/core/src/mindustry/core/Logic.java
7970
+++ b/core/src/mindustry/core/Logic.java
8071
@@ -16,6 +16,7 @@ import mindustry.type.*;
@@ -85,15 +76,15 @@ index 7d1a7bb5b951ab9b07c0ad8edfd83e75e57ad751..784e1b493873ee74cd95bae4b1da54ba
8576

8677
import java.util.*;
8778

88-
@@ -414,6 +415,7 @@ public class Logic implements ApplicationListener{
79+
@@ -415,6 +416,7 @@ public class Logic implements ApplicationListener{
8980

9081
@Override
9182
public void update(){
9283
+ var start = Time.nanos();
9384
Events.fire(Trigger.update);
9485
universe.updateGlobal();
9586

96-
@@ -497,6 +499,7 @@ public class Logic implements ApplicationListener{
87+
@@ -498,6 +500,7 @@ public class Logic implements ApplicationListener{
9788
}else if(netServer.isWaitingForPlayers() && runStateCheck){
9889
checkGameState();
9990
}

0 commit comments

Comments
 (0)