2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2021-06-14 01:06:38 +00:00
|
|
|
index 951445d5dba92ada70ce239098c702dd7b8ce0f1..ad9a4d4a9363741cc47f142c24fa6f4858dd947f 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-06-14 01:06:38 +00:00
|
|
|
@@ -507,7 +507,7 @@ public class CraftWorld implements World {
|
2021-06-11 12:02:28 +00:00
|
|
|
@Override
|
|
|
|
|
public boolean loadChunk(int x, int z, boolean generate) {
|
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
|
2021-06-12 23:45:00 +00:00
|
|
|
- ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
|
|
|
|
|
+ ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
|
// If generate = false, but the chunk already exists, we will get this back.
|
|
|
|
|
if (chunk instanceof ImposterProtoChunk) {
|
