diff options
author | Jason Penilla <[email protected]> | 2022-02-28 21:11:35 -0700 |
---|---|---|
committer | Jason Penilla <[email protected]> | 2022-02-28 22:52:40 -0700 |
commit | b9037a5c7dd462daf7e1954f93a58306d27e1c8b (patch) | |
tree | 88752456cb86723cd1e64afe15f1bf18fadacd0f /patches/server/0865-Replace-player-chunk-loader-system.patch | |
parent | 146ac7bcd6597ad9695fc4ecc2f66913f7d08cf0 (diff) | |
download | Paper-b9037a5c7dd462daf7e1954f93a58306d27e1c8b.tar.gz Paper-b9037a5c7dd462daf7e1954f93a58306d27e1c8b.zip |
fix issue resulting from kenny's apatch addiction
Diffstat (limited to 'patches/server/0865-Replace-player-chunk-loader-system.patch')
-rw-r--r-- | patches/server/0865-Replace-player-chunk-loader-system.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0865-Replace-player-chunk-loader-system.patch b/patches/server/0865-Replace-player-chunk-loader-system.patch index 8322ead428..94e9434704 100644 --- a/patches/server/0865-Replace-player-chunk-loader-system.patch +++ b/patches/server/0865-Replace-player-chunk-loader-system.patch @@ -1381,7 +1381,7 @@ index 36b6e7295cf7484675c8c2b9624c1f6fea7aed1d..38db3905f47fefb5c958fa24aef2313e public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getOrScheduleFuture(ChunkStatus targetStatus, ChunkMap chunkStorage) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b2efa5f24d20cb16218a0e7522866ee2faaef244..e6c6432f35add7f4c27375e4420179a8ec9355a0 100644 +index 9f367f3e33c6bad8b9df4f18559ebcd98a97c95c..d93eb2d0f38598a8939048de16dc7f14f2d39302 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -217,6 +217,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -1445,8 +1445,8 @@ index b2efa5f24d20cb16218a0e7522866ee2faaef244..e6c6432f35add7f4c27375e4420179a8 - }); + // Paper - no-tick view distance - moved to Chunk neighbour update }); - }, this.mainThreadExecutor); // Paper - queue to execute immediately so this doesn't delay chunk unloading - return completablefuture1; + }, (runnable) -> { + this.mainThreadMailbox.tell(ChunkTaskPriorityQueueSorter.message(holder, runnable)); @@ -1609,33 +1609,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider int k = this.viewDistance; |