29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 953114a5206b9fffd1d9b46aae12c9a520e53add Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 2 Mar 2016 23:55:20 -0600
|
|
Subject: [PATCH] Don't create a chunk just to unload it
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 02ff463..dfa7e73 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -209,7 +209,13 @@ public class CraftWorld implements World {
|
|
}
|
|
|
|
private boolean unloadChunk0(int x, int z, boolean save, boolean safe) {
|
|
- net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z);
|
|
+ // Paper start - Don't create a chunk just to unload it
|
|
+ net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkIfLoaded(x, z);
|
|
+ if (chunk == null) {
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data
|
|
save = true;
|
|
}
|
|
--
|
|
2.8.0.windows.1
|
|
|