mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-19 09:05:43 +01:00
aaefc4fbbe
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Spigot Changes: 2474d93d SPIGOT-4462: Catch async chunk regenerate
24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
From 61bb26690d5a5a2c0fbb4094c481fc56d8a16142 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sun, 2 Sep 2018 19:34:33 -0700
|
|
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
|
chunks
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 4b8b66352b..7e6a7b0e90 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -295,7 +295,7 @@ public class CraftWorld implements World {
|
|
public boolean loadChunk(int x, int z, boolean generate) {
|
|
org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
|
|
chunkLoadCount++;
|
|
- return world.getChunkProviderServer().getChunkAt(x, z, true, generate) != null;
|
|
+ return world.getChunkProviderServer().getChunkAt(x, z, true, generate || isChunkGenerated(x, z)) != null; // Paper
|
|
}
|
|
|
|
public boolean isChunkLoaded(Chunk chunk) {
|
|
--
|
|
2.19.1
|
|
|