diff options
| author | Spottedleaf <[email protected]> | 2022-09-02 04:41:08 -0700 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2022-09-02 04:42:05 -0700 |
| commit | 09904fd780175821a43adf74cc5a00d363e4a83d (patch) | |
| tree | 07ea6e4388350a0e17e1a4334cc1eb449522a451 /patches/server/0736-Optimise-chunk-tick-iteration.patch | |
| parent | e8c2c3bfda97143e33dbd35bd9dee528bb51d93c (diff) | |
| download | Paper-09904fd780175821a43adf74cc5a00d363e4a83d.tar.gz Paper-09904fd780175821a43adf74cc5a00d363e4a83d.zip | |
Re-add legacy getChunkAtAsynchronously to ChunkProviderServer
Apparently some plugins use it
Diffstat (limited to 'patches/server/0736-Optimise-chunk-tick-iteration.patch')
| -rw-r--r-- | patches/server/0736-Optimise-chunk-tick-iteration.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0736-Optimise-chunk-tick-iteration.patch b/patches/server/0736-Optimise-chunk-tick-iteration.patch index 13c8c24128..dff38c5fda 100644 --- a/patches/server/0736-Optimise-chunk-tick-iteration.patch +++ b/patches/server/0736-Optimise-chunk-tick-iteration.patch @@ -84,7 +84,7 @@ index b34c90497a5492c289839ba74df9f2f27e29370e..e811c7d617b8c9cc684bc0a58a98d5ec // CraftBukkit start - recursion-safe executor for Chunk loadCallback() and unloadCallback() public final CallbackExecutor callbackExecutor = new CallbackExecutor(); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 9f7ec687e6cf971bb9699e9f4ad7ebe37a3ef882..e585d0047f1dbafeb2bcacf19bd38f3d4b9ab53e 100644 +index 2390fcbc1b21653b1753a58da33f936cec43d0cb..7b1279256ed7963ba4e225b15592816087ab16b4 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -47,6 +47,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp @@ -95,7 +95,7 @@ index 9f7ec687e6cf971bb9699e9f4ad7ebe37a3ef882..e585d0047f1dbafeb2bcacf19bd38f3d public class ServerChunkCache extends ChunkSource { -@@ -808,34 +809,42 @@ public class ServerChunkCache extends ChunkSource { +@@ -810,34 +811,42 @@ public class ServerChunkCache extends ChunkSource { this.lastSpawnState = spawnercreature_d; gameprofilerfiller.popPush("filteringLoadedChunks"); @@ -154,7 +154,7 @@ index 9f7ec687e6cf971bb9699e9f4ad7ebe37a3ef882..e585d0047f1dbafeb2bcacf19bd38f3d NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1); } -@@ -843,7 +852,16 @@ public class ServerChunkCache extends ChunkSource { +@@ -845,7 +854,16 @@ public class ServerChunkCache extends ChunkSource { this.level.tickChunk(chunk1, k); } } @@ -171,7 +171,7 @@ index 9f7ec687e6cf971bb9699e9f4ad7ebe37a3ef882..e585d0047f1dbafeb2bcacf19bd38f3d this.level.timings.chunkTicks.stopTiming(); // Paper gameprofilerfiller.popPush("customSpawners"); if (flag2) { -@@ -851,15 +869,24 @@ public class ServerChunkCache extends ChunkSource { +@@ -853,15 +871,24 @@ public class ServerChunkCache extends ChunkSource { this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies); } // Paper - timings } |