2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2021-03-09 07:12:31 +08:00
|
|
|
index be028a80247dfb3bf7c726b1868c6e5c5bd99264..bf7b572e455dfc9dfdacce9d2b93266ec5eac0b4 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
|
2021-03-09 07:12:31 +08:00
|
|
|
@@ -508,7 +508,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) {
|
2019-07-24 03:17:32 +08:00
|
|
|
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);
|
2019-07-24 03:17:32 +08:00
|
|
|
+ IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
|
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) {
|