1 files changed, 6 insertions, 20 deletions
diff --git a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
index eb4d40fdd7..1a6669e596 100644
--- a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 30f567605c740413aa96168ce4eb60ab22ee1180 Mon Sep 17 00:00:00 2001
+From cfd598467afa046d6f71df7841c168df4758dca1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -41,7 +41,7 @@ index 9a6f87e59..873ffa77d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 79cb3953b..7f3e874ba 100644
+index bee52d783..8e91be4a1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -12,14 +12,17 @@ import java.util.Map;
@@ -63,21 +63,7 @@ index 79cb3953b..7f3e874ba 100644
      private final File d;
      private final DataConverterManager e;
      private boolean f;
-@@ -33,11 +36,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-     public boolean chunkExists(World world, int i, int j) {
-         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
- 
--        if (this.c.contains(chunkcoordintpair)) {
-+        //if (this.c.contains(chunkcoordintpair)) { // Paper - Chunk queue improvements
-             if (this.b.containsKey(chunkcoordintpair)) {
-                 return true;
-             }
--        }
-+        //} // Paper - Chunk queue improvements
- 
-         // Paper start - Don't create region files when checking that they exist
-         final RegionFile region = RegionFileCache.a(this.d, i, j, false);
-@@ -151,35 +154,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -134,35 +137,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      protected void a(ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) {
@@ -122,7 +108,7 @@ index 79cb3953b..7f3e874ba 100644
  
                  if (nbttagcompound != null) {
                      try {
-@@ -188,10 +188,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -171,10 +171,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                          ChunkRegionLoader.a.error("Failed to save chunk", exception);
                      }
                  }
@@ -135,7 +121,7 @@ index 79cb3953b..7f3e874ba 100644
              }
  
              return flag;
-@@ -556,4 +557,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -539,4 +540,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              return entity;
          }
      }
@@ -177,5 +163,5 @@ index acfdd52dc..fdbaf5fbd 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.12.2
+2.12.2.windows.2