2019-05-26 09:56:30 +08:00
|
|
|
From fe89300735d0da651bef5654500576c473b2ea8a Mon Sep 17 00:00:00 2001
|
2018-09-22 23:32:38 +08:00
|
|
|
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
|
2019-05-26 09:56:30 +08:00
|
|
|
index 1dee895958..1b2c5012e9 100644
|
2018-09-22 23:32:38 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2019-05-26 09:56:30 +08:00
|
|
|
@@ -477,7 +477,7 @@ public class CraftWorld implements World {
|
2019-05-06 10:58:04 +08:00
|
|
|
@Override
|
2018-09-22 23:32:38 +08:00
|
|
|
public boolean loadChunk(int x, int z, boolean generate) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
|
2019-05-05 16:33:44 +08:00
|
|
|
- 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);
|
2018-09-22 23:32:38 +08:00
|
|
|
|
2019-05-05 16:33:44 +08:00
|
|
|
// If generate = false, but the chunk already exists, we will get this back.
|
|
|
|
if (chunk instanceof ProtoChunkExtension) {
|
2018-09-22 23:32:38 +08:00
|
|
|
--
|
2019-05-05 19:32:20 +08:00
|
|
|
2.21.0
|
2018-09-22 23:32:38 +08:00
|
|
|
|