Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fe7ef7b5 Do not schedule to main for getChunkImmediately type calls (#2362)

current-paper

@@ -1 +1 @@
-1.14.4--0369665e6b9baedf0da91fc7d4289d54ebe3c064
+1.14.4--6ebebe7734fb8cde4af5985aea01c6db0787a1a8

patches/server/0052-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From d984124be7de318154ca820efc6c4f94744cf007 Mon Sep 17 00:00:00 2001
+From 905033baaaa9459c844b87cd0ab60dac6bd677a6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -2271,10 +2271,10 @@ index 0000000000..03cb8e0b32
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b465136a66..0e977a8472 100644
+index d714b8d01b..27c884b6e4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -160,11 +160,137 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider {
          return playerChunk.getAvailableChunkNow();
 
      }
@@ -2412,7 +2412,7 @@ index b465136a66..0e977a8472 100644
          if (Thread.currentThread() != this.serverThread) {
              return (IChunkAccess) CompletableFuture.supplyAsync(() -> {
                  return this.getChunkAt(i, j, chunkstatus, flag);
-@@ -186,6 +312,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -150,6 +276,9 @@ public class ChunkProviderServer extends IChunkProvider {
              CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag);
 
              if (!completablefuture.isDone()) { // Paper

patches/server/0053-Reduce-sync-loads.patch

@@ -1,4 +1,4 @@
-From 73f697ee7a133943f7917cab9b6862e2e7668aa0 Mon Sep 17 00:00:00 2001
+From 0939b74e51930c012e1fcc704187fad93980c59f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -275,10 +275,10 @@ index 0000000000..59aec10329
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5c6f9c4809..cd11efc68f 100644
+index 27c884b6e4..ed0ff8573b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -315,6 +315,7 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -279,6 +279,7 @@ public class ChunkProviderServer extends IChunkProvider {
                  // Paper start - async chunk io // Paper start - async chunk loading
                  this.world.asyncChunkTaskManager.raisePriority(x, z, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY);
                  // Paper end

patches/server/0054-implement-optional-per-player-mob-spawns.patch

@@ -1,4 +1,4 @@
-From c8a1368c07cb0ba0bfe9c44c7ddb36cf8c2b354d Mon Sep 17 00:00:00 2001
+From 7b879f573461472f310216d5c2e133462d71506f Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 11 Jun 2019 22:22:16 -0400
 Subject: [PATCH] implement optional per player mob spawns
@@ -29,10 +29,10 @@ index 318a470eea..72b77e27e8 100644
      private void countAllMobsForSpawning() {
          countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index ab87387573..f2c13a07bd 100644
+index ed0ff8573b..882e1d007c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -628,9 +628,21 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -592,9 +592,21 @@ public class ChunkProviderServer extends IChunkProvider {
                                      // Paper start - only allow spawns upto the limit per chunk and update count afterwards
                                      int currEntityCount = object2intmap.getInt(enumcreaturetype);
                                      int difference = k1 - currEntityCount;