Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
01b965e0 Fix getChunkAtIfCachedImmediately (#2915)
0a897d6e Rebuild patches
5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c9eebbb8 Fix Player#applyMending NPE (#2917)
d16a5d88 Performance patches prerequisite (#2802)

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

@@ -1,4 +1,4 @@
-From 6b57d8de1bfc0480aaf902eb577f3bbb52a18a7a Mon Sep 17 00:00:00 2001
+From c7a9cc3cca9498a9d55596b6941f5376f2e2b1bf 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,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 231bc6e31..21bc13f79 100644
+index 388c2bbfa..e4d874557 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1605,6 +1605,17 @@ public final class Bukkit {
@@ -28,13 +28,13 @@ index 231bc6e31..21bc13f79 100644
 +    // Purpur end
 +
      @NotNull
-     public static Server.Spigot spigot()
-     {
+     public static Server.Spigot spigot() {
+         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 314704790..c12e3ba90 100644
+index a13717306..8179c7e72 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1406,4 +1406,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1404,4 +1404,13 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end
@@ -49,5 +49,5 @@ index 314704790..c12e3ba90 100644
 +    // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

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

@@ -1,4 +1,4 @@
-From 010289186dcb60b25f38edec1f9cd04fa4823b60 Mon Sep 17 00:00:00 2001
+From a16b381d7e18bf1f5bec89265dac170878e706f9 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,7 +9,7 @@ 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 21bc13f79..b6f8942c0 100644
+index e4d874557..c45a1161f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1614,6 +1614,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index 21bc13f79..b6f8942c0 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c12e3ba90..ee768158b 100644
+index 8179c7e72..ec702f290 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      String getServerName();
@@ -46,5 +46,5 @@ index c12e3ba90..ee768158b 100644
      // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/api/0013-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 817e206de1b706e4d070f4f8b9eae40cc5856dfa Mon Sep 17 00:00:00 2001
+From 2fa5ae33c37672f73d97561789f802555505ab5a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -86,10 +86,10 @@ index 000000000..4db334854
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7f771b356..d7c4118de 100644
+index 877ea4f32..b9fe2a0fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2073,4 +2073,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0018-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From cb458f71ac63c46f685c10bbf70b7a7db1328438 Mon Sep 17 00:00:00 2001
+From a826a72e5296e80f2858925861cbe089f149fe29 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:29 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -134,10 +134,10 @@ index 000000000..1a8f0b674
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b46b27194..72c83510e 100644
+index 6fe025338..1edf1ec72 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3061,6 +3061,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3058,6 +3058,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  

patches/api/0020-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 80badd7d99ee6288238e318bfdb1ad8953f899c8 Mon Sep 17 00:00:00 2001
+From 211fe2b9508d8cbdd4b1d9a38e0b7c98e7d37745 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 72c83510e..86d1f1663 100644
+index 1edf1ec72..5a28b8bed 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3089,6 +3089,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3086,6 +3086,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param enabled True to enable
       */
      void setFluidTickEventEnabled(boolean enabled);