Updated Upstream (CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
7033f180 Hoist out synchronisation from ChunkRegionLoader

Spigot Changes:
500ff5d4 Rebuild patches

Additional Paper changes:
Fixed Versioned World Folders to not synchronize on ChunkRegionLoader
Optimized Save Queue even more to use a Long2ObjectOpenHashmap for save map
Add World#getXIfLoaded to IWorldReader to expose it to more places

Spigot-Server-Patches/Optimize-Chunk-Access.patch

@@ -44,7 +44,7 @@ index fbebd4591c..b941676829 100644
      public Chunk a(Object object) {
          return this.a(((Long) object).longValue());
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 6b041f06e4..1a1daf36b7 100644
+index d73034f329..b1e6901090 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 {
@@ -77,12 +77,12 @@ index 6b041f06e4..1a1daf36b7 100644
  
          this.asyncTaskHandler.postToMainThread(chunk::addEntities);
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
-             this.saveChunk(chunk, true); // Spigot
+                 this.saveChunk(chunk, true); // Spigot
+             }
+             this.chunks.remove(chunk.chunkKey);
+-            this.lastChunk = null;
++            // this.lastChunk = null; // Paper
          }
-         this.chunks.remove(chunk.chunkKey);
--        this.lastChunk = null;
-+        //this.lastChunk = null; // Paper
          return true;
      }
-     // CraftBukkit end
 --