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

current-paper

@@ -1 +1 @@
-1.14.4--c6ca20c40abd5ea29ec4e8a84c1bf8c26b64ccdb
+1.14.4--f136ce754ceebedff2a7e5579616bf5be6c9b9d5

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
 

patches/server/0003-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From 96390b05dddd5db2d85fac861f902356ec8f8719 Mon Sep 17 00:00:00 2001
+From fab96d6bd565297078a7d3ac53eb3da5a6a1f70d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 8 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 0c3ec8357..20c143e31 100644
+index 0c3ec83570..20c143e314 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -21,11 +21,11 @@ index 0c3ec8357..20c143e31 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4cd0bc64b..c14ca997d 100644
+index e2bb7c5b5b..2d152627cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2165,4 +2165,11 @@ public final class CraftServer implements Server {
-         return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
+@@ -2170,4 +2170,11 @@ public final class CraftServer implements Server {
+         return net.minecraft.server.MinecraftServer.currentTick;
      }
      // Paper end
 +
@@ -37,5 +37,5 @@ index 4cd0bc64b..c14ca997d 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.24.0.rc1
 

patches/server/0044-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 976e0f922370ffca7ef3a2403b677561f59a5c18 Mon Sep 17 00:00:00 2001
+From f91fe361c6bb589031f8760abbb38909ee0b25a9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1b6a9623c..ab596e74e 100644
+index 1b6a9623cf..ab596e74e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index 1b6a9623c..ab596e74e 100644
                          tickSection = curTime;
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b38de26d6..cdfd39374 100644
+index f7e1da705d..48d4f1f5aa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -136,6 +136,11 @@ public class PurpurConfig {
@@ -46,10 +46,10 @@ index b38de26d6..cdfd39374 100644
      private static void disableDropsOnCrammingDeath() {
          disableDropsOnCrammingDeath = getBoolean("settings.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c14ca997d..9f11583f0 100644
+index 2d152627cd..ec9e770838 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2171,5 +2171,10 @@ public final class CraftServer implements Server {
+@@ -2176,5 +2176,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }
@@ -61,5 +61,5 @@ index c14ca997d..9f11583f0 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch

@@ -1,4 +1,4 @@
-From 48da1b6628c22b4200913702f32acfc3e0334f6e Mon Sep 17 00:00:00 2001
+From 6146816adad1f317c75340779db9dfc05a2dbc42 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for boats to eject players on land
  2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index b5bcd1f80..37a98eba6 100644
+index b5bcd1f80d..37a98eba61 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -425,6 +425,7 @@ public class EntityBoat extends Entity {
@@ -21,7 +21,7 @@ index b5bcd1f80..37a98eba6 100644
              } else {
                  return EntityBoat.EnumStatus.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ff5dc4a3..f68744460 100644
+index 3ff5dc4a3b..f687444604 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -74,6 +74,11 @@ public class PurpurWorldConfig {
@@ -37,5 +37,5 @@ index 3ff5dc4a3..f68744460 100644
      private void campfireObeysGravity() {
          campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0062-Expose-internal-current-tick.patch

@@ -1,35 +0,0 @@
-From a7144d19244acb40588253a5f6f04de9f16c4498 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 1 Sep 2019 17:22:43 -0500
-Subject: [PATCH] Expose internal current tick
-
----
- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52298bc5b..cd278985e 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -64,6 +64,7 @@ import net.minecraft.server.JsonListEntry;
- import net.minecraft.server.LootTableRegistry;
- import net.minecraft.server.MapIcon;
- import net.minecraft.server.MinecraftKey;
-+import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.MobEffects;
- import net.minecraft.server.PlayerList;
- import net.minecraft.server.ServerCommand;
-@@ -2177,5 +2178,10 @@ public final class CraftServer implements Server {
-     public boolean isLagging() {
-         return getServer().lagging;
-     }
-+
-+    @Override
-+    public int getCurrentTick() {
-+        return MinecraftServer.currentTick;
-+    }
-     // Purpur end
- }
--- 
-2.23.0.rc1
-

patches/server/0063-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From febebfb0e03e59cdea3b1c20073a04aa927e5d1d Mon Sep 17 00:00:00 2001
+From 761fadea4b472815f421735fb46fdd4bc8cbbf55 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow leashing villagers
  3 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 610bf5458..996146f61 100644
+index 610bf54584..996146f61f 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1044,6 +1044,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index 610bf5458..996146f61 100644
              if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index d1d62a900..2a848304d 100644
+index d1d62a900f..2a848304df 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -989,4 +989,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -38,7 +38,7 @@ index d1d62a900..2a848304d 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0481db6f1..04a58a8da 100644
+index 0481db6f15..04a58a8da0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -265,9 +265,11 @@ public class PurpurConfig {
@@ -54,5 +54,5 @@ index 0481db6f1..04a58a8da 100644
  
      public static boolean zombieTargetsTurtleEggs = true;
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0064-Add-option-to-set-armorstand-step-height.patch

@@ -1,4 +1,4 @@
-From 02e613a8dde4ae32890b8ba2eedc9d99596680a2 Mon Sep 17 00:00:00 2001
+From 5632f7443ddeedcff30dccbed2ed6f8576645367 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 6 Oct 2019 12:46:35 -0500
 Subject: [PATCH] Add option to set armorstand step height
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to set armorstand step height
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index f7b9c1aa5..bd4a80132 100644
+index 8bd864cb39..f58cfa6da1 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -62,7 +62,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -22,7 +22,7 @@ index f7b9c1aa5..bd4a80132 100644
  
      public EntityArmorStand(World world, double d0, double d1, double d2) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 04a58a8da..f2f61f997 100644
+index 04a58a8da0..f2f61f9975 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -188,6 +188,11 @@ public class PurpurConfig {
@@ -38,5 +38,5 @@ index 04a58a8da..f2f61f997 100644
      private static void cowsSettings() {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0065-Add-API-for-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 227d0d8be5d540659f9493a1a4b946b01e30cd4e Mon Sep 17 00:00:00 2001
+From c5c4dfeda34cd1c720b4a8bd35eec55df0bcae99 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:37 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
@@ -9,7 +9,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
  2 files changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index f161ccb97..c074d3372 100644
+index f161ccb979..c074d33723 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -72,6 +72,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
@@ -35,7 +35,7 @@ index f161ccb97..c074d3372 100644
  
      protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index f291a8d75..0cd358236 100644
+index f291a8d754..0cd358236e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -112,4 +112,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
@@ -51,5 +51,5 @@ index f291a8d75..0cd358236 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0066-Alternative-Keepalive-Handling.patch

@@ -1,4 +1,4 @@
-From baff2d4e06feec49d075f9996aaaafc0993ccc52 Mon Sep 17 00:00:00 2001
+From de43aa4d94afa84d4cda98b0d2228ff9860cf11e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
  3 files changed, 34 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
-index 8e93f1540..470f92c4f 100644
+index 8e93f1540b..470f92c4fb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6f584d515..b40bea8e8 100644
+index 6f584d515f..b40bea8e8b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -75,7 +75,7 @@ index 6f584d515..b40bea8e8 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f2f61f997..baa069d0c 100644
+index f2f61f9975..baa069d0c8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -167,6 +167,11 @@ public class PurpurConfig {
@@ -91,5 +91,5 @@ index f2f61f997..baa069d0c 100644
      private static void updatePermissionsOnWorldChange() {
          updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0067-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From 4bc1d09fbf1c34beacee789e5bf7fd18e22e3549 Mon Sep 17 00:00:00 2001
+From e7a2f53717adec767dbc1a9a864e7e0deb9d2b57 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:40 -0500
 Subject: [PATCH] Expose getItemStack for Trident
@@ -38,5 +38,5 @@ index 0518e6c683..63287a9b65 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0068-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From c8c4d0de5474cae2b320ffdc1124dcc6b83ecfdc Mon Sep 17 00:00:00 2001
+From 1debe995bd2c920910bbff750353714006b2a131 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
@@ -165,5 +165,5 @@ index 3f94c5a920..a027634801 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0069-Add-entity-jump-API.patch

@@ -1,4 +1,4 @@
-From c2bc5e0e5e4089540dd5c36751d76054c67afd63 Mon Sep 17 00:00:00 2001
+From f244cb2f5cef18819de2098f92bff75d8bd6e5b2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:34:48 -0500
 Subject: [PATCH] Add entity jump API
@@ -48,5 +48,5 @@ index ffd1372284..e408c89220 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0070-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From 34124c2ff2c977b830eb1b30a2d4ad418e0eadce Mon Sep 17 00:00:00 2001
+From efb71f36f1a37e61ec64e76daa8b1f947c51d662 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:56 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -66,10 +66,10 @@ index f687444604..3ad3415c4a 100644
      private void editableSigns() {
          editableSigns = getBoolean("editable-signs", editableSigns);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 243722b672..0f33688cd5 100644
+index f33d9c8b44..ac7e16cdcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2345,6 +2345,24 @@ public class CraftWorld implements World {
+@@ -2350,6 +2350,24 @@ public class CraftWorld implements World {
          return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  
@@ -95,5 +95,5 @@ index 243722b672..0f33688cd5 100644
      @Override
      public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0071-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From 3812a31f019067f240b21deb0927bc1d040335bb Mon Sep 17 00:00:00 2001
+From 20545171b9c5187780a145abd4928ed4bf664f29 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:29:02 -0500
 Subject: [PATCH] Add more evoker API
@@ -51,5 +51,5 @@ index 0636d26473..4ccb938909 100644
 +    // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0072-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 332af179006a86c548ce81589eaca216fd2aacfb Mon Sep 17 00:00:00 2001
+From 7708ca2db335aa2644980d59912d8b13d25e792e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:43 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f33688cd5..112ad300d3 100644
+index ac7e16cdcc..d4db567205 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2361,6 +2361,11 @@ public class CraftWorld implements World {
+@@ -2366,6 +2366,11 @@ public class CraftWorld implements World {
      public void setFluidTickEventEnabled(boolean enabled) {
          getHandle().purpurConfig.fluidTickEvent = enabled;
      }
@@ -24,5 +24,5 @@ index 0f33688cd5..112ad300d3 100644
  
      // Paper start
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0073-Add-setting-to-suppress-unknown-attribute-warnings.patch

@@ -1,4 +1,4 @@
-From 0e42cb76a858713d30f31cc9b9a704ec2154047a Mon Sep 17 00:00:00 2001
+From 1f82c7d2a0f9d88d8a261ccbb9a7bb8e5f515c4e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:52:12 -0500
 Subject: [PATCH] Add setting to suppress unknown attribute warnings
@@ -37,5 +37,5 @@ index baa069d0c8..a8d86b4345 100644
      private static void updatePermissionsOnWorldChange() {
          updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0074-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -1,4 +1,4 @@
-From 53f3da80d0f78b44c813c595464893c59866365b Mon Sep 17 00:00:00 2001
+From 82a289d747be235a3b6311c223e010ee015f8b85 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8d3e45dc0c..38bab59e76 100644
+index 3658a799a7..ae6ed98ed9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1458,8 +1458,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -25,7 +25,7 @@ index 8d3e45dc0c..38bab59e76 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 112ad300d3..b8d45aa3bf 100644
+index d4db567205..b94882b198 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -379,12 +379,16 @@ public class CraftWorld implements World {
@@ -50,5 +50,5 @@ index 112ad300d3..b8d45aa3bf 100644
              return true;
          } catch (Exception e) {
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0075-Add-option-to-allow-iron-golems-to-spawn-in-air.patch

@@ -1,4 +1,4 @@
-From 460df69e28a020627023231fc8f3f38789effe79 Mon Sep 17 00:00:00 2001
+From dc5bbd188cd2d45597e1fb68f3242a453c98a219 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:20:45 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air
@@ -37,5 +37,5 @@ index a8d86b4345..a98e704cff 100644
  
      public static double crystalsAttackPhantomsRadius = 0.0D;
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 6fefb38c58704df607767cb7d8fc8cee0e1430b1 Mon Sep 17 00:00:00 2001
+From aaf778c501cbb4b866392319fcb861a33c087c85 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:16 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -23,5 +23,5 @@ index e408c89220..572d21b349 100644
      // Purpur end
  }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0077-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 88e8ca7cf1e15112a75edc51488a96eddf948014 Mon Sep 17 00:00:00 2001
+From 1de15d02c574f64fa05e6be6d5f8c65faf861429 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:35 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
@@ -37,5 +37,5 @@ index f093744136..01f69e81ad 100644
  
          this.a.r(false);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0078-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From c6e2d30bdaef92215c2204407b3fbdfb1a7135a1 Mon Sep 17 00:00:00 2001
+From 646c030ba66848fbc3f7f0b9cdc60bb4441e931d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:17 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent
@@ -20,5 +20,5 @@ index b5401eaf97..25a92d4bb8 100644
          }
  
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0079-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 316d6ac894cef9c6043e2d15c32d5f302bec7697 Mon Sep 17 00:00:00 2001
+From 7e57a22bc34e8cda17e24822f168012ba21f9b8a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:59 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent
@@ -59,5 +59,5 @@ index f8600cc07f..9d7b7cad38 100644
          // CraftBukkit end
      }
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0080-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From 88d27f66cf67e8193eb5f3bdea6981716bd49d42 Mon Sep 17 00:00:00 2001
+From b47b58dad8826e0d9c701a76764d50962b619bd1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:28:06 -0500
 Subject: [PATCH] Add ThrownEggHatchEvent
@@ -28,5 +28,5 @@ index aedf2ce17d..e82798cf21 100644
                      for (int i = 0; i < b0; ++i) {
                          Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass());
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0081-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch

@@ -1,4 +1,4 @@
-From 18dc84765e5cea1ad800fda880c6703913cd2180 Mon Sep 17 00:00:00 2001
+From cff5f796948cc4264a018359c2bfc91e0c9ba58f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:36:52 -0500
 Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
@@ -26,5 +26,5 @@ index 55b5646103..caa5b4368c 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 -- 
-2.23.0.rc1
+2.24.0.rc1
 

patches/server/0082-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From cd0896d88b091d73b49281f65160d443dd40cc2b Mon Sep 17 00:00:00 2001
+From 742dc7ca52fff8d0a9e487673250662f954e0caa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:54 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
@@ -101,5 +101,5 @@ index c7470d2852..97bb59369f 100644
          WorldGenEndTrophy worldgenendtrophy = new WorldGenEndTrophy(flag);
  
 -- 
-2.23.0.rc1
+2.24.0.rc1