OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CraftWorld#isChunkGenerated

Browse source 
The upstream implementation is returning true for non-full chunks.
This commit is contained in:
Jason Penilla 2024-06-18 12:43:06 -07:00
parent 35f6f25e78
commit 1218a52ac9
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -398,11 +398,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