Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8d036cea Expose the internal current tick
0c715390 [PATCH] bounding box check for hanging entities (#2664)
527073aa Update config version
0d3b35c3 Rename baby zombie movement config option

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

@@ -1,4 +1,4 @@
-From aa4788e6e4adcf6fe0f5cb3c9093fca7d8717eb8 Mon Sep 17 00:00:00 2001
+From 6b57d8de1bfc0480aaf902eb577f3bbb52a18a7a 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, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6db691591..352e13eef 100644
+index 231bc6e31..21bc13f79 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1601,6 +1601,17 @@ public final class Bukkit {
+@@ -1605,6 +1605,17 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -31,12 +31,12 @@ index 6db691591..352e13eef 100644
      public static Server.Spigot spigot()
      {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 27d3b5ad7..5337e3c5a 100644
+index 314704790..c12e3ba90 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1399,4 +1399,13 @@ public interface Server extends PluginMessageRecipient {
-     @NotNull
-     com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
+@@ -1406,4 +1406,13 @@ public interface Server extends PluginMessageRecipient {
+      */
+     int getCurrentTick();
      // Paper end
 +
 +    // Purpur start - bring back server name
@@ -49,5 +49,5 @@ index 27d3b5ad7..5337e3c5a 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.24.0.rc1
 

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

@@ -1,4 +1,4 @@
-From 197df8b1288d9ab4c40342dd26ac133a8c7f9d72 Mon Sep 17 00:00:00 2001
+From 010289186dcb60b25f38edec1f9cd04fa4823b60 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 352e13eef..f87b8c3d5 100644
+index 21bc13f79..b6f8942c0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1610,6 +1610,15 @@ public final class Bukkit {
+@@ -1614,6 +1614,15 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -29,10 +29,10 @@ index 352e13eef..f87b8c3d5 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5337e3c5a..14da18751 100644
+index c12e3ba90..ee768158b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1407,5 +1407,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      String getServerName();
@@ -46,5 +46,5 @@ index 5337e3c5a..14da18751 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0014-Add-API-for-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 135cd31a9c179f572675c3cf9f8ffddad0b4026f Mon Sep 17 00:00:00 2001
+From 559bc1e8985c4eac9aec6b3e33b8e9f269279860 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:28 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
@@ -26,5 +26,5 @@ index ef48ad9b2..2bb9f768b 100644
       * Represents Villager type, usually corresponding to what biome they spawn
       * in.
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0014-Expose-internal-current-tick.patch

@@ -1,50 +0,0 @@
-From b1d18386b24c15dce55afc1aa9fa95727e2004bb Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 1 Sep 2019 17:22:33 -0500
-Subject: [PATCH] Expose internal current tick
-
----
- src/main/java/org/bukkit/Bukkit.java | 9 +++++++++
- src/main/java/org/bukkit/Server.java | 7 +++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f87b8c3d5..919ff23c7 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1619,6 +1619,15 @@ public final class Bukkit {
-     public static boolean isLagging() {
-         return server.isLagging();
-     }
-+
-+    /**
-+     * Get the current internal server tick
-+     *
-+     * @return Current tick
-+     */
-+    public static int getCurrentTick() {
-+        return server.getCurrentTick();
-+    }
-     // Purpur end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 14da18751..4ff5895ff 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 {
-      * @return True if lagging
-      */
-     boolean isLagging();
-+
-+    /**
-+     * Get the current internal server tick
-+     *
-+     * @return Current tick
-+     */
-+    int getCurrentTick();
-     // Purpur end
- }
--- 
-2.23.0.rc1
-

patches/api/0015-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From 85b258fecc2923ce02367d8b03857279baa31065 Mon Sep 17 00:00:00 2001
+From 0d5448283a81da963c941a60293006682b6c1e07 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:31 -0500
 Subject: [PATCH] Expose getItemStack for Trident
@@ -28,5 +28,5 @@ index 3379ef9ba..27f19074e 100644
 +    // Purpur end
 +}
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0016-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From 6c9243d1efa5a31ec3ce74f295a99a9c5d4237ed Mon Sep 17 00:00:00 2001
+From 8396505c1ca9dc7b9a9980c8f5e1dbdc5d86a387 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API
@@ -197,5 +197,5 @@ index d23226ccb..1ef9479c9 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0017-Add-entity-jump-API.patch

@@ -1,4 +1,4 @@
-From 19317a535dccfc01547e6c4a8a7239cefc0e81e4 Mon Sep 17 00:00:00 2001
+From 5ca385b0adb500d67a5ae59cda74cbcbe05a2cc7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:34:38 -0500
 Subject: [PATCH] Add entity jump API
@@ -93,5 +93,5 @@ index 3a8961853..7196c1b79 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

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

@@ -1,4 +1,4 @@
-From 857970166f62c14fc6bc58a0a60e5fc68d81c091 Mon Sep 17 00:00:00 2001
+From d59551620f404ebae9dcac03a8639362780320e5 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
@@ -175,5 +175,5 @@ index 2d22ab30a..e1f25bdd1 100644
       * Represents various map environment types that a world may be
       */
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0019-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From 91221b140ec7bfc4bf992c7759d84590957c5ea4 Mon Sep 17 00:00:00 2001
+From d39d81493739e7454eaa6d595e207971ed2bb086 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:28:53 -0500
 Subject: [PATCH] Add more evoker API
@@ -34,5 +34,5 @@ index f8d173adc..f2a03f7f8 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

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

@@ -1,4 +1,4 @@
-From bbeeaa0c5fb5bd58b0d4f3326c68184f16bcda1f Mon Sep 17 00:00:00 2001
+From ff6d8f08c7097d865155d545e6dc5dddfc06e57a 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
@@ -29,5 +29,5 @@ index e1f25bdd1..15b3f9c7b 100644
  
      /**
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0021-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 1628dc68442402b9fe5f25bbc0e94643a29fd7d6 Mon Sep 17 00:00:00 2001
+From 6469abdfd45c6db049434e337552f85b5f8cd87c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -35,5 +35,5 @@ index 7196c1b79..5789b4584 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0022-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 4538053cf5be9c25af8a07ebe5ae6f7730d630a7 Mon Sep 17 00:00:00 2001
+From 8012a7d2499ce4337afaec99eab86a337090bcdd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:24 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
@@ -64,5 +64,5 @@ index d79dbcd68..1ed3ea8fa 100644
      public boolean isCancelled() {
          return cancelled;
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0023-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From d47862fed3c83222dbc36271b1c447324d20e771 Mon Sep 17 00:00:00 2001
+From 180cfc574c9ad070004fd1ffc2681b454f657e3d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:10 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent
@@ -57,5 +57,5 @@ index 000000000..ef8eafb7c
 +    }
 +}
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0024-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From d166142389e29ff7cf64e82fc41a7312efbbeb7a Mon Sep 17 00:00:00 2001
+From 32f1ce9130091a21f6e05bfc6a655ae7d8d91cac Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:49 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent
@@ -82,5 +82,5 @@ index 000000000..983d67234
 +    }
 +}
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0025-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From 4087eb1784016c80995dedcb7fa0c7a6042fdb2e Mon Sep 17 00:00:00 2001
+From f3d4ab537b7cd73292713f6571fe36c876910483 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:27:55 -0500
 Subject: [PATCH] Add ThrownEggHatchEvent
@@ -128,5 +128,5 @@ index 000000000..815e871d0
 +    }
 +}
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/api/0026-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From ab115fed95481c6c247f4b64f57d9165af7ded7c Mon Sep 17 00:00:00 2001
+From 53543ffa1feb61f871821e93f329ba8f6f3d92d7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:46 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
@@ -43,5 +43,5 @@ index 397baaefd..7456240b4 100644
      private static final HandlerList handlers = new HandlerList();
      private final List<BlockState> blocks;
 -- 
-2.23.0.rc1
+2.24.0.rc1