OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 19:52:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add missing timings stop

Browse source
This commit is contained in:
Nassim Jahnke 2023-12-06 21:04:01 +01:00
parent 03541446b2
commit b32a34c71d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/server/1020-Optimise-chunk-tick-iteration.patch
View file

@ -187,7 +187,7 @@ index 68550d4497a5f10bf653482f79be77373df53f27..55f96545d6db95e3e657502a7910d96f
public String getDebugStatus() { public String getDebugStatus() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..561c5d47668b569d82d2a5fa8ba207064f2c50b4 100644 index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..5b4e62e1d31f9c34fb186a9de0e9bc9c9fb18552 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -516,18 +516,43 @@ public class ServerChunkCache extends ChunkSource { @@ -516,18 +516,43 @@ public class ServerChunkCache extends ChunkSource {
@ -241,7 +241,7 @@ index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..561c5d47668b569d82d2a5fa8ba20706
if (this.level.getServer().tickRateManager().runsNormally()) { if (this.level.getServer().tickRateManager().runsNormally()) {
gameprofilerfiller.popPush("naturalSpawnCount"); gameprofilerfiller.popPush("naturalSpawnCount");
@@ -562,38 +587,107 @@ public class ServerChunkCache extends ChunkSource { @@ -562,38 +587,108 @@ public class ServerChunkCache extends ChunkSource {
gameprofilerfiller.popPush("spawnAndTick"); gameprofilerfiller.popPush("spawnAndTick");
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
@ -362,10 +362,11 @@ index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..561c5d47668b569d82d2a5fa8ba20706
+ } + }
+ } + }
+ // Paper end - optimise chunk tick iteration + // Paper end - optimise chunk tick iteration
+ this.level.timings.chunkTicks.stopTiming(); // Paper
gameprofilerfiller.popPush("customSpawners"); gameprofilerfiller.popPush("customSpawners");
if (flag) { if (flag) {
@@ -604,11 +698,23 @@ public class ServerChunkCache extends ChunkSource { @@ -604,11 +699,23 @@ public class ServerChunkCache extends ChunkSource {
} }
gameprofilerfiller.popPush("broadcast"); gameprofilerfiller.popPush("broadcast");