From 772d430cd1473d631a72c03990acefc887497eed Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 6 Dec 2023 22:40:08 +0100 Subject: [PATCH] Fix timings check with tick freezes --- patches/server/0014-Timings-v2.patch | 4 ++-- patches/server/1018-Optimise-chunk-tick-iteration.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index aec0721054..0e9895372d 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -1031,7 +1031,7 @@ index 770f6a08c613093577172385549df8040ded627b..c1bb511cc25ca97282ee02d2b207e294 } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 7cacfceed5ef9276a19123a8a9079579423d03ac..016f387f1f69572634adf3455b295ef5005b84e9 100644 +index 7cacfceed5ef9276a19123a8a9079579423d03ac..5cd680d2ed47aadb5e65a775d70bc662a92e3d7a 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -413,13 +413,15 @@ public class ServerChunkCache extends ChunkSource { @@ -1079,7 +1079,7 @@ index 7cacfceed5ef9276a19123a8a9079579423d03ac..016f387f1f69572634adf3455b295ef5 gameprofilerfiller.push("filteringLoadedChunks"); List list = Lists.newArrayListWithCapacity(this.chunkMap.size()); Iterator iterator = this.chunkMap.getChunks().iterator(); -+ this.level.timings.chunkTicks.startTiming(); // Paper ++ if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper while (iterator.hasNext()) { ChunkHolder playerchunk = (ChunkHolder) iterator.next(); diff --git a/patches/server/1018-Optimise-chunk-tick-iteration.patch b/patches/server/1018-Optimise-chunk-tick-iteration.patch index 7fef900257..9550476e55 100644 --- a/patches/server/1018-Optimise-chunk-tick-iteration.patch +++ b/patches/server/1018-Optimise-chunk-tick-iteration.patch @@ -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 5689a463ae25778cc0f0b1970e3894d863253dfc..5b4e62e1d31f9c34fb186a9de0e9bc9c9fb18552 100644 +index 5152979bf81345fc365e7b16028c7d970d2f5856..6e212f672579a3e08dc362c287be59ca5170d717 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 { @@ -196,7 +196,7 @@ index 5689a463ae25778cc0f0b1970e3894d863253dfc..5b4e62e1d31f9c34fb186a9de0e9bc9c gameprofilerfiller.push("filteringLoadedChunks"); - List list = Lists.newArrayListWithCapacity(this.chunkMap.size()); - Iterator iterator = this.chunkMap.getChunks().iterator(); - this.level.timings.chunkTicks.startTiming(); // Paper + if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper - while (iterator.hasNext()) { - ChunkHolder playerchunk = (ChunkHolder) iterator.next();