aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0024-Remove-Spigot-timings.patch
diff options
context:
space:
mode:
authorJason Penilla <[email protected]>2024-11-06 12:10:01 -0700
committerJason Penilla <[email protected]>2024-11-06 12:10:01 -0700
commit019d58e2601e31497d45361da82e5ce061802258 (patch)
treed1cf5efad4ba6940a352312c8232316c195cadfa /patches/server/0024-Remove-Spigot-timings.patch
parentfcb6c72bc95ff62b9cd78dec457f485dafcc70a4 (diff)
downloadPaper-019d58e2601e31497d45361da82e5ce061802258.tar.gz
Paper-019d58e2601e31497d45361da82e5ce061802258.zip
Fix Entity#isTicking and update Paper entity commandfix-10299
fixes #10299
Diffstat (limited to 'patches/server/0024-Remove-Spigot-timings.patch')
-rw-r--r--patches/server/0024-Remove-Spigot-timings.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0024-Remove-Spigot-timings.patch b/patches/server/0024-Remove-Spigot-timings.patch
index b3b6ebc014..51dda21a5e 100644
--- a/patches/server/0024-Remove-Spigot-timings.patch
+++ b/patches/server/0024-Remove-Spigot-timings.patch
@@ -153,7 +153,7 @@ index 9d6be455c3bbcdbcb9d3d24b0bad79f46ba6a8cb..a129ddfe7b00d6abab94437806a5cfb9
@Override
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index c615510f3f59292715bcff1bd9e4e896c9733436..ccb6f28689a3cf7da4ea323c5dd8f595036c4b43 100644
+index a970ceab0176d97f9d274ed257c2f86f3b63e430..4a0fedff38f12ec87905558a100f1772cee03dd4 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -207,13 +207,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -170,7 +170,7 @@ index c615510f3f59292715bcff1bd9e4e896c9733436..ccb6f28689a3cf7da4ea323c5dd8f595
ChunkResult<ChunkAccess> chunkresult = (ChunkResult) completablefuture.join();
ChunkAccess ichunkaccess1 = (ChunkAccess) chunkresult.orElse(null); // CraftBukkit - decompile error
-@@ -420,25 +418,19 @@ public class ServerChunkCache extends ChunkSource {
+@@ -414,25 +412,19 @@ public class ServerChunkCache extends ChunkSource {
ProfilerFiller gameprofilerfiller = Profiler.get();
gameprofilerfiller.push("purge");
@@ -196,7 +196,7 @@ index c615510f3f59292715bcff1bd9e4e896c9733436..ccb6f28689a3cf7da4ea323c5dd8f595
gameprofilerfiller.pop();
this.clearCache();
}
-@@ -531,9 +523,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -525,9 +517,7 @@ public class ServerChunkCache extends ChunkSource {
}
if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) {