testserver/Spigot-Server-Patches/0054-Don-t-create-a-chunk-j...

29 lines
1.1 KiB
Diff
Raw Normal View History

2016-04-04 14:53:03 +00:00
From 953114a5206b9fffd1d9b46aae12c9a520e53add Mon Sep 17 00:00:00 2001
2015-11-16 01:46:34 +00:00
From: Aikar <aikar@aikar.co>
2016-02-29 23:09:49 +00:00
Date: Wed, 2 Mar 2016 23:55:20 -0600
2015-11-16 01:46:34 +00:00
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
2016-04-04 14:53:03 +00:00
index 02ff463..dfa7e73 100644
2015-11-16 01:46:34 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2016-04-04 14:53:03 +00:00
@@ -209,7 +209,13 @@ public class CraftWorld implements World {
}
2015-11-16 01:46:34 +00:00
2016-04-04 14:53:03 +00:00
private boolean unloadChunk0(int x, int z, boolean save, boolean safe) {
2016-02-29 23:09:49 +00:00
- 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);
2015-11-16 01:46:34 +00:00
+ if (chunk == null) {
+ return false;
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
2016-04-04 14:53:03 +00:00
+
2015-11-16 01:46:34 +00:00
if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data
save = true;
}
--
2016-04-04 14:53:03 +00:00
2.8.0.windows.1
2015-11-16 01:46:34 +00:00