3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-14 20:10:05 +01:00

Execute chunk tasks while waiting for chunk load in isChunkGenerated

this shouldn't be needed as we are requesting EMPTY status, however there is a deeper issue that we will just work around for now

fixes #10916
Dieser Commit ist enthalten in:
Jason Penilla 2024-06-18 21:04:13 -07:00
Ursprung d23825aa56
Commit 3b1c85b3a2
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0E75A301420E48F8

Datei anzeigen

@ -6,10 +6,10 @@ 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..95de729f0a02a202632ea85a4061607d632588e9 100644
index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..1e7e8e0425dfde875bd79be4432eb7a092d70e4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -367,11 +367,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -367,11 +367,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean isChunkGenerated(int x, int z) {
@ -31,6 +31,7 @@ index fe9e8d1d4ae1f7a4e8f4cf5688004fc969422b3c..95de729f0a02a202632ea85a4061607d
+ 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
+ );
+ world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone);
+ return future.thenApply(c -> {
+ if (c != null) {
+ return c.getPersistedStatus() == ChunkStatus.FULL;