1 files changed, 38 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
new file mode 100644
index 0000000000..e69374207b
--- /dev/null
+++ b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
@@ -0,0 +1,38 @@
+From 9e02e7677c27c8b05f69b00620f98b3f6a583e31 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Thu, 12 May 2016 02:03:56 -0400
+Subject: [PATCH] Fix Chunk Unload Queue Issues
+
+Vanilla implemented similar logic as Paper had pre 1.9.4, but Spigot
+has not resolved all the bugs with the changes.
+
+This patch fixes known issues and really should be applied by Spigot team.
+
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index 3db29161d..98f2cff15 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -46,7 +46,7 @@ public class Chunk {
+     private long w;
+     private int x;
+     private final ConcurrentLinkedQueue<BlockPosition> y;
+-    public boolean d;
++    public boolean d; public void setShouldUnload(boolean unload) { this.d = unload; } public boolean isUnloading() { return d; } // Paper - OBFHELPER
+     protected gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
+ 
+     // Paper start
+diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+index 54b454fe3..57ae50d2e 100644
+--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+@@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
+ 
+                     if (chunk != null && chunk.d) {
+                         // CraftBukkit start - move unload logic to own method
++                        chunk.setShouldUnload(false); // Paper
+                         if (!unloadChunk(chunk, true)) {
+                             continue;
+                         }
+-- 
+2.12.2
+