Update upstream CB/S

Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 8d2b17317390f32c79ff90a3aece9ec4fed83d41 Mon Sep 17 00:00:00 2001
+From 4701662038fd8f8d30764ff934ae094f0b916f15 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -41,7 +41,7 @@ index 9ab6445..d01bca1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 24cb51b..f298692 100644
+index 4fe7713..d4386e3 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;
@@ -77,7 +77,7 @@ index 24cb51b..f298692 100644
  
          // Paper start - Don't create region files when checking that they exist
          final RegionFile region = RegionFileCache.a(this.d, i, j, false);
-@@ -141,28 +144,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -143,28 +146,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      protected void a(ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) {
@@ -115,7 +115,7 @@ index 24cb51b..f298692 100644
  
                  if (nbttagcompound != null) {
                      try {
-@@ -171,10 +178,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -173,10 +180,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                          ChunkRegionLoader.a.error("Failed to save chunk", exception);
                      }
                  }
@@ -128,7 +128,7 @@ index 24cb51b..f298692 100644
              }
  
              return flag;
-@@ -544,4 +552,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -550,4 +558,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              return entity;
          }
      }

Spigot-Server-Patches/0078-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From 76b8046fd9231671bccba11f30da3f446028dd4e Mon Sep 17 00:00:00 2001
+From 5ec66352ed0784f04a459c49ad3a41cd805ef395 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,10 +6,10 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f298692..4f010ae 100644
+index d4386e3..facc97b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -172,11 +172,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -174,11 +174,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  NBTTagCompound nbttagcompound = chunk.compound; // Paper - Chunk queue improvements
  
                  if (nbttagcompound != null) {

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit ac58f3840ebe6060511c56ca8c4440916ea46425
+Subproject commit 7f1a32252b4fc48bad17ab3e1fc0399ce451f15e

work/Spigot

@@ -1 +1 @@
-Subproject commit 6016ac773a4f7bb51b82cdc0e8c87a6a8b164ceb
+Subproject commit 3ccadba36a71e973ca556ee22bc9e147bacbda12