2024-06-18 21:44:07 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
|
|
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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index 696152286a4d16fa51a23ff6e15fb297f3476007..8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab 100644
|
2024-06-18 21:44:07 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
@@ -397,11 +397,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2024-06-18 21:44:07 +02:00
|
|
|
|
|
|
|
@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<>();
|
2024-07-17 19:24:53 +02:00
|
|
|
+ ca.spottedleaf.moonrise.common.util.ChunkSystem.scheduleChunkLoad(
|
2024-10-25 21:47:52 +02:00
|
|
|
+ this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.util.Priority.NORMAL, future::complete
|
2024-06-18 21:44:07 +02:00
|
|
|
+ );
|
2024-06-19 06:04:13 +02:00
|
|
|
+ world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone);
|
2024-06-18 21:44:07 +02:00
|
|
|
+ return future.thenApply(c -> {
|
|
|
|
+ if (c != null) {
|
|
|
|
+ return c.getPersistedStatus() == ChunkStatus.FULL;
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }).join();
|
|
|
|
+ // Paper end - Fix this method
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|