mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixup

Browse source
This commit is contained in:
Nassim Jahnke 2023-12-06 21:14:54 +01:00
parent ff2946e04b
commit 9bc67abccf
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
patches/server/1018-Optimise-chunk-tick-iteration.patch
View file

@ -187,7 +187,7 @@ index 68550d4497a5f10bf653482f79be77373df53f27..55f96545d6db95e3e657502a7910d96f
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
index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..5b4e62e1d31f9c34fb186a9de0e9bc9c9fb18552 100644
index 5689a463ae25778cc0f0b1970e3894d863253dfc..5b4e62e1d31f9c34fb186a9de0e9bc9c9fb18552 100644
--- a/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 {
@ -241,7 +241,7 @@ index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..5b4e62e1d31f9c34fb186a9de0e9bc9c
if (this.level.getServer().tickRateManager().runsNormally()) {
gameprofilerfiller.popPush("naturalSpawnCount");
@@ -562,38 +587,108 @@ public class ServerChunkCache extends ChunkSource {
@@ -562,38 +587,107 @@ public class ServerChunkCache extends ChunkSource {
gameprofilerfiller.popPush("spawnAndTick");
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
@ -362,11 +362,10 @@ index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..5b4e62e1d31f9c34fb186a9de0e9bc9c
+ }
+ }
+ // Paper end - optimise chunk tick iteration
+ this.level.timings.chunkTicks.stopTiming(); // Paper
this.level.timings.chunkTicks.stopTiming(); // Paper
gameprofilerfiller.popPush("customSpawners");
if (flag) {
@@ -604,11 +699,23 @@ public class ServerChunkCache extends ChunkSource {
@@ -605,11 +699,23 @@ public class ServerChunkCache extends ChunkSource {
}
gameprofilerfiller.popPush("broadcast");