Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-09 20:30:28 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-2118: Fix crash on chunk regen

Browse Source
This commit is contained in:
md_5 2016-04-04 17:15:02 +10:00
parent 4cc1807b25
commit 60cb5b5603
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -183,6 +183,10 @@ public class CraftWorld implements World {
return false; return false;
} }
return unloadChunk0(x, z, save, safe);
}
private boolean unloadChunk0(int x, int z, boolean save, boolean safe) {
net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z); net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z);
if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data
save = true; save = true;
@ -217,7 +221,7 @@ public class CraftWorld implements World {
} }
public boolean regenerateChunk(int x, int z) { public boolean regenerateChunk(int x, int z) {
unloadChunk(x, z, false, false); unloadChunk0(x, z, false, false);
world.getChunkProviderServer().unloadQueue.remove(x, z); world.getChunkProviderServer().unloadQueue.remove(x, z);