Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132)
c65dcad3 Don't delay chunk unloads during entity ticking
bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114
5553e6b3 Disable Sync Events firing Async errors during shutdown
e12c51d9 Use better variable for isStopping() API
586ee2bb Remove patch for MC-111480, fixed in 1.14
09a94215 Remove streams from Mob AI System
bb5c294e Fix Disabling Asynchronous Chunks
089d8356 Implement Chunk Priority / Urgency System for World Gen
fce69af7 Use dedicated thread for main thread blocking chunk loads
588b62e4 Add tick times API and /mspt command (#3102)
11de41c7 Add API MinecraftServer#isStopping (#3129)
942ff3c2 My patches are under MIT (#3130)

patches/api/0002-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From b7f8049479b52ec5a7c0edb6fd48ae1fa12fb7ad Mon Sep 17 00:00:00 2001
+From 748ec8f720ad952d784ed4e3931d4c9a9de1c17c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
@@ -50,10 +50,10 @@ index 93d5a3f97..5e7e10c8f 100644
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80f9abdca..eaaf9a4e9 100644
+index 9ceaac0e8..20fe14213 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1371,6 +1371,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1386,6 +1386,18 @@ public interface Server extends PluginMessageRecipient {
          }
          // Paper end
  

patches/api/0009-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 9d3f33b35ebc4ff79bff98b87904592581b3ebce Mon Sep 17 00:00:00 2001
+From 190a3d3ef1cd3a3444da5965a8230f44883ebcd3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:08 -0600
 Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
  2 files changed, 38 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3a60094a1..6935cf272 100644
+index 9cac2d299..14e85ac6c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1664,4 +1664,25 @@ public final class Bukkit {
+@@ -1692,4 +1692,25 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -39,12 +39,12 @@ index 3a60094a1..6935cf272 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e8b2fe0c2..9d306c084 100644
+index 8f16fb0cb..90b439071 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1465,4 +1465,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1487,4 +1487,21 @@ public interface Server extends PluginMessageRecipient {
       */
-     int getCurrentTick();
+     boolean isStopping();
      // Paper end
 +
 +    // Purpur start

patches/api/0010-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From 59d3509aaea5bc9b3b15b30602af394a6ef741ec Mon Sep 17 00:00:00 2001
+From d4f6fbd999d628857801e5d9a405ee5b010e9ab5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6935cf272..abf7caf0b 100644
+index 14e85ac6c..ce82eadb5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1666,6 +1666,15 @@ public final class Bukkit {
+@@ -1694,6 +1694,15 @@ public final class Bukkit {
      }
  
      // Purpur start
@@ -29,10 +29,10 @@ index 6935cf272..abf7caf0b 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9d306c084..89e9395e8 100644
+index 90b439071..d2a3114eb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1467,6 +1467,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1489,6 +1489,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

patches/api/0014-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 0fa0f29ff2114ab2c3d770bfb54ef050bb727e87 Mon Sep 17 00:00:00 2001
+From 8cb6d31ea7c41a44a0f02f130c259613b7a384b5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index abf7caf0b..c9fc59a2e 100644
+index ce82eadb5..013e3b2d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1675,6 +1675,15 @@ public final class Bukkit {
+@@ -1703,6 +1703,15 @@ public final class Bukkit {
          return server.getServerName();
      }
  
@@ -29,10 +29,10 @@ index abf7caf0b..c9fc59a2e 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 89e9395e8..6f2e580ce 100644
+index d2a3114eb..a185f2473 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1474,6 +1474,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1496,6 +1496,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();