aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch')
-rw-r--r--Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
new file mode 100644
index 0000000000..ffa06f4aad
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+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 be028a80247dfb3bf7c726b1868c6e5c5bd99264..bf7b572e455dfc9dfdacce9d2b93266ec5eac0b4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -508,7 +508,7 @@ public class CraftWorld implements World {
+ @Override
+ public boolean loadChunk(int x, int z, boolean generate) {
+ org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
+- IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
++ IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
+
+ // If generate = false, but the chunk already exists, we will get this back.
+ if (chunk instanceof ProtoChunkExtension) {