diff options
| author | Jason Penilla <[email protected]> | 2024-06-18 21:15:20 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-06-18 21:15:20 -0700 |
| commit | 4ea696ffe4c52891d67f98f6cbe12e193539d48d (patch) | |
| tree | 126d3c7d8c51dca62bda88dde26ff87097430397 | |
| parent | 3b1c85b3a292c634c816271264a472517ba80f8e (diff) | |
| download | Paper-4ea696ffe4c52891d67f98f6cbe12e193539d48d.tar.gz Paper-4ea696ffe4c52891d67f98f6cbe12e193539d48d.zip | |
Add ticket for chunk load in isChunkGenerated
| -rw-r--r-- | patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch index cd3b8127de..f91e8b2bd0 100644 --- a/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch +++ b/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix CraftWorld#isChunkGenerated The upstream implementation is returning true for non-full chunks. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..1e7e8e0425dfde875bd79be4432eb7a092d70e4b 100644 +index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..8045d6c9398d1c88595da6e41aa1ed27fb6fbad0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -367,11 +367,28 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -29,7 +29,7 @@ index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..1e7e8e0425dfde875bd79be4432eb7a0 } + final java.util.concurrent.CompletableFuture<ChunkAccess> future = new java.util.concurrent.CompletableFuture<>(); + ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystem.scheduleChunkLoad( -+ this.world, x, z, false, ChunkStatus.EMPTY, false, ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, future::complete ++ this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, future::complete + ); + world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone); + return future.thenApply(c -> { |