aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch')
-rw-r--r--patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
new file mode 100644
index 0000000000..bf009e18a3
--- /dev/null
+++ b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Tue, 18 Jun 2024 12:43:06 -0700
+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 18e6c9fb355614de40999310f47502e2847e626b..3134fab97260897601d7c8e2810f11b8be86dbec 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -409,11 +409,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+
+ @Override
+ public boolean isChunkGenerated(int x, int z) {
+- try {
+- return this.isChunkLoaded(x, z) || this.world.getChunkSource().chunkMap.read(new ChunkPos(x, z)).get().isPresent();
+- } catch (InterruptedException | ExecutionException ex) {
+- throw new RuntimeException(ex);
++ // Paper start - Fix this method
++ if (!Bukkit.isPrimaryThread()) {
++ return java.util.concurrent.CompletableFuture.supplyAsync(() -> {
++ return CraftWorld.this.isChunkGenerated(x, z);
++ }, world.getChunkSource().mainThreadProcessor).join();
++ }
++ ChunkAccess chunk = world.getChunkSource().getChunkAtImmediately(x, z);
++ if (chunk != null) {
++ return chunk instanceof ImposterProtoChunk || chunk instanceof net.minecraft.world.level.chunk.LevelChunk;
+ }
++ final java.util.concurrent.CompletableFuture<ChunkAccess> future = new java.util.concurrent.CompletableFuture<>();
++ ca.spottedleaf.moonrise.common.util.ChunkSystem.scheduleChunkLoad(
++ this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.util.Priority.NORMAL, future::complete
++ );
++ world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone);
++ return future.thenApply(c -> {
++ if (c != null) {
++ return c.getPersistedStatus() == ChunkStatus.FULL;
++ }
++ return false;
++ }).join();
++ // Paper end - Fix this method
+ }
+
+ @Override