Update upstream B/CB/S

Spigot-Server-Patches/Chunk-Save-Stats-Debug-Option.patch

@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 916bf53f4..7006466b5 100644
+index 0fb1f8427..dabe4137f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,13 +55,13 @@ index 916bf53f4..7006466b5 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 139f2799c..a10964b5b 100644
+index 895882b2e..a4c0b0c96 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+         this.e = dataconvertermanager;
      }
  
-     // CraftBukkit start
 -    public int getQueueSize() { return queue.size(); } // Paper
 +    // Paper start
 +    private long queuedSaves = 0;
@@ -70,9 +70,9 @@ index 139f2799c..a10964b5b 100644
 +    public long getQueuedSaves() { return queuedSaves; }
 +    public long getProcessedSaves() { return processedSaves.longValue(); }
 +    // Paper end
-     public boolean chunkExists(World world, int i, int j) {
-         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
+     // CraftBukkit start - Add async variant, provide compatibility
+     @Nullable
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          synchronized (lock) {  // Paper - Chunk queue improvements
              this.b.put(chunkcoordintpair, nbttagcompound);