mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-06 07:32:07 +01:00
Be more specific with prior fix
This commit is contained in:
parent
53c4a446eb
commit
973fefe4e5
@ -15,23 +15,23 @@ Should Mojang choose to alter this behavior in the future, this change
|
||||
will simply defer to whatever that new behavior is.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 1e84afb0a..9055da64a 100644
|
||||
index 1e84afb0a..2ed3fc40b 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
chunk = originalGetChunkAt(i, j);
|
||||
}
|
||||
|
||||
+ // Paper start - If there was an issue loading the chunk from region, stage1 will fail and stage2 will load it sync
|
||||
+ // all we need to do is fetch an instance
|
||||
+ if (chunk == null) {
|
||||
+ chunk = getChunkIfLoaded(i, j);
|
||||
+ }
|
||||
+ // Paper end
|
||||
return null;
|
||||
} else {
|
||||
chunk = ChunkIOExecutor.syncChunkLoad(world, loader, this, i, j);
|
||||
+
|
||||
// If we didn't load the chunk async and have a callback run it now
|
||||
if (runnable != null) {
|
||||
runnable.run();
|
||||
+ // Paper start - If there was an issue loading the chunk from region, stage1 will fail and stage2 will load it sync
|
||||
+ // all we need to do is fetch an instance
|
||||
+ if (chunk == null) {
|
||||
+ chunk = getChunkIfLoaded(i, j);
|
||||
+ }
|
||||
+ // Paper end
|
||||
}
|
||||
} else if (chunk == null && generate) {
|
||||
chunk = originalGetChunkAt(i, j);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
index ef9529add..cdf3b614c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
|
Loading…
Reference in New Issue
Block a user