Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
14513c3c Updated Upstream (Bukkit/CraftBukkit)

current-paper

@@ -1 +1 @@
-1.14.4--0b217f89dfd37f49233a2f8f3dbc8a548f71e7b4
+1.14.4--746152692f785f64c751f88df532012556f153cd

patches/api/0006-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From 7ed154e449e138a75afd69e67f0752ed8350486f Mon Sep 17 00:00:00 2001
+From b83812676462910150c6547ac1e5249c10cb5783 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 00:08:28 -0500
 Subject: [PATCH] Add ExecuteCommandEvent
@@ -179,5 +179,5 @@ index 460fda05a..1e0eb0999 100644
          } catch (CommandException ex) {
              server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0006-Add-village-raid-spawn-reason.patch

@@ -1,29 +0,0 @@
-From 2fae1badaf27a72abd830879c8624fddbc749eb3 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 29 May 2019 23:38:50 -0500
-Subject: [PATCH] Add village raid spawn reason
-
----
- .../java/org/bukkit/event/entity/CreatureSpawnEvent.java    | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 17aa6722b..323322510 100644
---- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-@@ -95,6 +95,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
-          * When a zombie is spawned to invade a village
-          */
-         VILLAGE_INVASION,
-+        // Purpur start
-+        /**
-+         * When an entity is spawned to raid a village
-+         */
-+        VILLAGE_RAID,
-+        // Purpur end
-         /**
-          * When an animal breeds to create a child
-          */
--- 
-2.20.1
-

patches/api/0007-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From a6b15c0844a089b5b6644d49d5729d24de7dcafc Mon Sep 17 00:00:00 2001
+From 2f34a563b865b3e42ba0050a783f727cab88bd06 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions
@@ -121,5 +121,5 @@ index 000000000..d1757f3d4
 +    }
 +}
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0008-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 7ed511aafa501fbfcf86c18a0f2b04ec9ba859e2 Mon Sep 17 00:00:00 2001
+From 9bf10e66e9db9009871610710edb16a8ce420688 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:37:04 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
@@ -28,5 +28,5 @@ index 03ba22659..630c15d23 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0009-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From fee2dae7b361e8f2581abf84d1ea9f7a6eab0adf Mon Sep 17 00:00:00 2001
+From 0d962b82c49e96e14993d5dda1422e617dd5d3c6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -100,5 +100,5 @@ index 000000000..c050b75e9
 +    }
 +}
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0010-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 908db90639dd171e257f91d6e339608f1be3414d Mon Sep 17 00:00:00 2001
+From f8e61f206d1d08534ccdfea936d48944e776113a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement ChunkTooLargeEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 new file mode 100644
-index 00000000..f9d4a42c
+index 000000000..f9d4a42c6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 @@ -0,0 +1,109 @@

patches/api/0011-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From c39b728c52e814a1a45386141e4d3d4021ca5dd3 Mon Sep 17 00:00:00 2001
+From 7a311ecfaa92372c2c11233b1d68fe4b46f4262f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing
@@ -34,5 +34,5 @@ index 75e719ae8..fb7abc2a5 100644
          return size;
      }
 -- 
-2.20.1
+2.23.0.rc1
 

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

@@ -1,4 +1,4 @@
-From 69c75b5e59e75f1e3399efcfc9e203548520b46d Mon Sep 17 00:00:00 2001
+From 197df8b1288d9ab4c40342dd26ac133a8c7f9d72 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
@@ -46,5 +46,5 @@ index 5337e3c5a..14da18751 100644
      // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

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

@@ -1,4 +1,4 @@
-From 4effdeda4f4b6828eaf78212a560842e43d7b323 Mon Sep 17 00:00:00 2001
+From 3a6077c8aec71ab69a738f53ec7f2b7ce1282fee 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 00000000..4db33485
+index 000000000..4db334854
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..4db33485
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d8d8957..d430ce0b 100644
+index 8d8d89576..d430ce0ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2096,4 +2096,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -116,5 +116,5 @@ index 8d8d8957..d430ce0b 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

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

@@ -1,4 +1,4 @@
-From b4d42587db5f3fbd98fc5b6f6d713bfc0eff324a Mon Sep 17 00:00:00 2001
+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
@@ -9,7 +9,7 @@ Subject: [PATCH] Expose internal current tick
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f87b8c3d..919ff23c 100644
+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 {
@@ -29,7 +29,7 @@ index f87b8c3d..919ff23c 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 14da1875..4ff5895f 100644
+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 {

patches/server/0021-Add-village-raid-spawn-reason.patch

@@ -1,25 +0,0 @@
-From eb60a54d282def5c1f1dc58fc32cd43c0441aee0 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 29 May 2019 23:39:04 -0500
-Subject: [PATCH] Add village raid spawn reason
-
----
- src/main/java/net/minecraft/server/Raid.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
-index bdcacc141..723bb35ce 100644
---- a/src/main/java/net/minecraft/server/Raid.java
-+++ b/src/main/java/net/minecraft/server/Raid.java
-@@ -536,7 +536,7 @@ public class Raid {
-                 entityraider.prepare(this.k, this.k.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
-                 entityraider.a(i, false);
-                 entityraider.onGround = true;
--                this.k.addEntity(entityraider);
-+                this.k.addEntity(entityraider, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
-             }
-         }
- 
--- 
-2.23.0.rc1
-

patches/server/0021-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From 4b4c998f0f0fda79a87c37d2a65a5168b2917293 Mon Sep 17 00:00:00 2001
+From d48cc6502c97f0b5b9a003ab2da52b58e624c9a8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:33 -0500
 Subject: [PATCH] Advancement API Additions
@@ -13,7 +13,7 @@ Subject: [PATCH] Advancement API Additions
  create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 
 diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
-index 3ef2f4d2ac..ac4c29f2b6 100644
+index 3ef2f4d2a..ac4c29f2b 100644
 --- a/src/main/java/net/minecraft/server/Advancement.java
 +++ b/src/main/java/net/minecraft/server/Advancement.java
 @@ -20,7 +20,7 @@ import org.apache.commons.lang3.ArrayUtils;
@@ -26,7 +26,7 @@ index 3ef2f4d2ac..ac4c29f2b6 100644
      private final MinecraftKey d;
      private final Map<String, Criterion> e;
 diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
-index e8172d56fe..dc6a0448d4 100644
+index e8172d56f..dc6a0448d 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
 @@ -20,6 +20,7 @@ public class AdvancementDisplay {
@@ -66,7 +66,7 @@ index e8172d56fe..dc6a0448d4 100644
          return this.h;
      }
 diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
-index a9c49a4348..14a35ba4c8 100644
+index a9c49a434..14a35ba4c 100644
 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
 +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
 @@ -1,14 +1,22 @@
@@ -96,7 +96,7 @@ index a9c49a4348..14a35ba4c8 100644
          this.e = i;
          this.f = enumchatformat;
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-index a5aadf2850..36da444145 100644
+index a5aadf285..36da44414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 @@ -4,6 +4,7 @@ import java.util.Collection;
@@ -119,7 +119,7 @@ index a5aadf2850..36da444145 100644
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 new file mode 100644
-index 0000000000..aed74fb180
+index 000000000..aed74fb18
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 @@ -0,0 +1,43 @@
@@ -167,5 +167,5 @@ index 0000000000..aed74fb180
 +    }
 +}
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0022-Always-place-dragon-egg-when-dragon-is-killed.patch

@@ -1,4 +1,4 @@
-From a0e09aac9b0c78e4791feb0d6daad4f83f6cc348 Mon Sep 17 00:00:00 2001
+From 157ff0d50b375dc16d6bf903f499541c5e692fc5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 1 Jun 2019 01:16:35 -0500
 Subject: [PATCH] Always place dragon egg when dragon is killed

patches/server/0023-Fix-outdated-server-showing-in-ping-before-server-fu.patch

@@ -1,4 +1,4 @@
-From c1e11502eceaeaa6098d1452beadf708faa8938f Mon Sep 17 00:00:00 2001
+From e8610bacd36a293a676ef5c17a290093d0d10f98 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 4 Jun 2019 15:50:08 -0500
 Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 295c9ac22d..981ded17ab 100644
+index 295c9ac22..981ded17a 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -21,5 +21,5 @@ index 295c9ac22d..981ded17ab 100644
              // Paper end
          }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0024-Add-config-for-items-breaking-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 77f10a01dd4804673ad11a080ba31150b1b0dfb3 Mon Sep 17 00:00:00 2001
+From 06f097bcd196eca3dcf038a48b02364328cd0e65 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] Add config for items breaking turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add config for items breaking turtle eggs
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 0118a845..83e69425 100644
+index 0118a8451..83e69425b 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -163,6 +163,17 @@ public class BlockTurtleEgg extends Block {
@@ -32,7 +32,7 @@ index 0118a845..83e69425 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 82643156..bc782e2f 100644
+index abd10a500..5c5a729e9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,4 +103,9 @@ public class PurpurWorldConfig {
@@ -46,5 +46,5 @@ index 82643156..bc782e2f 100644
 +    }
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0025-Make-Iron-Golems-Swim.patch

@@ -1,4 +1,4 @@
-From fc1090d07ca3bceb0e087d718eb2ee727843c14f Mon Sep 17 00:00:00 2001
+From ca20da7aa930de137888d851158138ca4526f485 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim

patches/server/0026-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -1,4 +1,4 @@
-From 241a8e7f7837df2514070aada717cae3c338c50c Mon Sep 17 00:00:00 2001
+From 15d7908520fa62896ec47d761fe64269ed9256c6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 21 Jun 2019 14:37:10 -0500
 Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -40,7 +40,7 @@ index 2fc6e210d..54f913901 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c13d1a0c..1605b7707 100644
+index 5c5a729e9..038c2ac07 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -99,6 +99,11 @@ public class PurpurWorldConfig {

patches/server/0027-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 6bed4b809a302f4792a8ebcff626741efea0eb00 Mon Sep 17 00:00:00 2001
+From 1e355ab5bd37cac3655c94264efa2d05aa0d7427 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 75 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fe7aa9d81..26a30e1c0 100644
+index 27ae09757..457d973af 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1295,6 +1295,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0028-Disable-loot-drops-on-death-by-cramming.patch

@@ -1,4 +1,4 @@
-From f445b1fc28a3a5060fc83b4828e9d29a5fc2c421 Mon Sep 17 00:00:00 2001
+From 0f1a76f451bfcea744e9f26ec1407b9aee80b847 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 7 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 587fe2b36..89e5d01aa 100644
+index 791d03aa7..eb397b6bc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1423,8 +1423,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,7 +24,7 @@ index 587fe2b36..89e5d01aa 100644
              deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 40b28ebe5..412a120e2 100644
+index 0e20e0b13..749dce0b4 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 {
@@ -40,5 +40,5 @@ index 40b28ebe5..412a120e2 100644
      private static void requireShiftToMount() {
          requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0029-Make-illusioners-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From 8c0bd778fe20cdb8f7d7e8113400c9d96eeffe89 Mon Sep 17 00:00:00 2001
+From 65ea07c1250e22f8935b0f474126d0bf3e7d765c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Make illusioners naturally spawn

patches/server/0030-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From f17036310d620555bead62b9dae8ef16ace3110b Mon Sep 17 00:00:00 2001
+From 67ad2997ee26dc8ddc1dac341fdc928bb62e6ceb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:36:55 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
@@ -22,10 +22,10 @@ index 4482dd930..bb3b0abd9 100644
      private final int c;
      private final EntityTypes<?> d;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 80f71a77b..0dae1fcf7 100644
+index 3cddf254a..23cdaaf7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -349,4 +349,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -351,4 +351,18 @@ public final class CraftItemFactory implements ItemFactory {
          return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
      }
      // Paper end
@@ -45,5 +45,5 @@ index 80f71a77b..0dae1fcf7 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0031-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 08447652171f63342252d8a3700826e609e1efca Mon Sep 17 00:00:00 2001
+From f0ed584cb0c32d2271305bd018d94323fd7fe3d8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -40,5 +40,5 @@ index bb3b0abd9..4b77c099a 100644
                      tileentity.update();
                      world.notify(blockposition, iblockdata, iblockdata, 3);
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0032-Dont-send-useless-entity-packets.patch

@@ -1,4 +1,4 @@
-From 64bc83f85dc985a6dfb3a172220fb539a290a164 Mon Sep 17 00:00:00 2001
+From a8486da8353fb438f66d58fcaaaaf14225916f90 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -66,7 +66,7 @@ index 1a9802e75..4c5a52c80 100644
      protected boolean h;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 76556e7ea..e408d84e8 100644
+index d44b7b173..f710919da 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,6 +141,11 @@ public class PurpurConfig {
@@ -82,5 +82,5 @@ index 76556e7ea..e408d84e8 100644
      private static void requireShiftToMount() {
          requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0033-Fix-item-position-desync-MC-4.patch

@@ -1,4 +1,4 @@
-From 7fff3f50d6f883e4b1a43c78920ffdf7d41cacb0 Mon Sep 17 00:00:00 2001
+From b7ad8b31987ef8c502c142f2202a66ca7073cfb0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] Fix item position desync (MC-4)
@@ -44,7 +44,7 @@ index 4c5a52c80..9ec3495d5 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e408d84e8..e515f4775 100644
+index f710919da..0e3a64e85 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -146,6 +146,11 @@ public class PurpurConfig {
@@ -60,5 +60,5 @@ index e408d84e8..e515f4775 100644
      private static void requireShiftToMount() {
          requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0034-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch

@@ -1,4 +1,4 @@
-From 082fffa787f9dc329e20e5161b5710eeb43cb4a6 Mon Sep 17 00:00:00 2001
+From ce0bd8b5eab88dfa62e7389e3c8f18d35f3245f9 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Thu, 16 May 2019 01:33:46 +0100
 Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on

patches/server/0035-Add-chance-for-zombie-horse-natural-spawns.patch

@@ -1,4 +1,4 @@
-From b21354a2463378ab72115677283b36ad0c09048a Mon Sep 17 00:00:00 2001
+From e6ce7a5a4bf53e30264a7a62398b3b36eaccc3b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Add chance for zombie horse natural spawns

patches/server/0036-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From 498337a3f63db4ab1025ef71baac9d70d2d81bc5 Mon Sep 17 00:00:00 2001
+From b3c2caf86c47598936242e0e4ee4350e9cedb300 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)

patches/server/0037-Option-to-toggle-milk-curing-bad-omen.patch

@@ -1,4 +1,4 @@
-From 8b062a53f9506ad448ddab046f2f241d96dec569 Mon Sep 17 00:00:00 2001
+From 161868e02a53ea13a1a1a8340f04cf4b5b8c6e4a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
  2 files changed, 7 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
-index a6477d26..f76e611c 100644
+index a6477d26a..f76e611ca 100644
 --- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 @@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item {
@@ -23,7 +23,7 @@ index a6477d26..f76e611c 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ed42fe32..1a9b1289 100644
+index 038c2ac07..a6f014a05 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,4 +113,9 @@ public class PurpurWorldConfig {
@@ -37,5 +37,5 @@ index ed42fe32..1a9b1289 100644
 +    }
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0038-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 43def9bbbf0a34ae04d5aafc30d8905913ce33af Mon Sep 17 00:00:00 2001
+From c2815d499228d60c29927b51f46a736a99ab4d47 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:10:06 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

patches/server/0039-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From 3559aa99c5b8439b40943766a85fe43c001a58fd Mon Sep 17 00:00:00 2001
+From ea954955e70bce65fef4dad7643d85a4a5c774ca Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -10,7 +10,7 @@ Subject: [PATCH] Tulips change fox type
  3 files changed, 34 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index e9f6b3931..07891a055 100644
+index 0a2540ae7..fbe78facd 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -232,6 +232,11 @@ public class EntityFox extends EntityAnimal {

patches/server/0040-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From 9db3ce26c27445e2ba7eecc2b62d406048560829 Mon Sep 17 00:00:00 2001
+From 8ceeb019a4672fd171c39be296a518c58c73cd93 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first

patches/server/0041-Players-should-not-cram-to-death.patch

@@ -1,4 +1,4 @@
-From 263a96137b30b81c1887e968d3e224fe0bf450a0 Mon Sep 17 00:00:00 2001
+From 06a7923a7875817c27cb93db229236f10ffb7603 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,7 +8,7 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index af3c7e595..f9469e9e7 100644
+index e0e94ca11..a90bc090c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1079,7 +1079,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

patches/server/0042-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From a8789afaed676f1623db2623f366ff9c1fd0b1df Mon Sep 17 00:00:00 2001
+From e03fb6aaefc02582d96f392c859a912568bcfdaa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 26a30e1c0..770d21468 100644
+index 457d973af..468d6cc3e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1522,6 +1522,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 26a30e1c0..770d21468 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index e516db270..2fb10f6c2 100644
+index 75ac07537..3cf0fdf56 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -316,7 +316,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -84,7 +84,7 @@ index 2177a4370..05a5169c1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 89e5d01aa..bc701552e 100644
+index eb397b6bc..b4230fcc4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2613,7 +2613,7 @@ public abstract class EntityLiving extends Entity {
@@ -158,7 +158,7 @@ index 56739e6ed..0bac6e424 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).dG())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f8a350649..f589f0e8b 100644
+index 637d662ad..a4b5b871d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -146,6 +146,11 @@ public class PurpurConfig {
@@ -174,5 +174,5 @@ index f8a350649..f589f0e8b 100644
      private static void fixItemPositionDesync() {
          fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 4cfdfc4bf31e03c294d8b7d1c5e9563b5c6dd4d5 Mon Sep 17 00:00:00 2001
+From a5d54a67d7810d520eff68b1aa6cd10f5ef3ed41 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement a hard limit for pillager outpost spawns
  2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index b794a39d..39159e34 100644
+index b794a39d3..39159e34a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -142,6 +142,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -21,7 +21,7 @@ index b794a39d..39159e34 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1a9b1289..fa24cee0 100644
+index a6f014a05..a934099d8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -118,4 +118,9 @@ public class PurpurWorldConfig {
@@ -35,5 +35,5 @@ index 1a9b1289..fa24cee0 100644
 +    }
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/server/0044-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From b91282cffd67895d43061798a14c7c378d6c9edf Mon Sep 17 00:00:00 2001
+From d262588dfcfbf2c1e0740da0895679af1a9313ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
  2 files changed, 8 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index c2ccb858..70e8a422 100644
+index 7f747fac9..830d93a85 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -886,6 +886,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -22,7 +22,7 @@ index c2ccb858..70e8a422 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fa24cee0..83e26324 100644
+index a934099d8..8d01cdc8e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -123,4 +123,11 @@ public class PurpurWorldConfig {
@@ -38,5 +38,5 @@ index fa24cee0..83e26324 100644
 +    }
  }
 -- 
-2.20.1
+2.23.0.rc1
 

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

@@ -1,4 +1,4 @@
-From a2080753291fba978ee9dfaeb08d7d5d7f661ebd Mon Sep 17 00:00:00 2001
+From fc2e5f815d338f68d7cef2c1c865bef56c76a396 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
@@ -30,7 +30,7 @@ index dcb783407..427c1da00 100644
                          tickSection = curTime;
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f589f0e8b..d48f9371b 100644
+index a4b5b871d..3f3ce537c 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 {

patches/server/0046-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From 3174c10502e713e1425ba55a92b50441a0f91a99 Mon Sep 17 00:00:00 2001
+From 017082af56e65fad89599b0e6aac1d3ac71e4659 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
  2 files changed, 13 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 70e8a422a..da3fb4b57 100644
+index 830d93a85..d1d62a900 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0047-Implement-elytra-settings.patch

@@ -1,4 +1,4 @@
-From 95fe8b962045f2eb4d58ec8d87dce9323403c5b5 Mon Sep 17 00:00:00 2001
+From 583da8aa2216a7ff9d38be03aef9b18df7d33b21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -123,7 +123,7 @@ index d2eb861af..b89f9fe7b 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7ff20fe08..b1dcb5f8d 100644
+index 8d01cdc8e..059cf85f4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -130,4 +130,17 @@ public class PurpurWorldConfig {

patches/server/0048-Add-option-to-disable-pillager-patrols.patch

@@ -1,4 +1,4 @@
-From 66461ab5bebe76f172293900f0e44998ac8f66de Mon Sep 17 00:00:00 2001
+From 0ef66de9cec3bf747f5c485bc606c89ef520bd80 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 27 Jul 2019 17:20:35 -0500
 Subject: [PATCH] Add option to disable pillager patrols
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to disable pillager patrols
  2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index bb612b386..99bb38f03 100644
+index a9d32ebdf..b88040e03 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 @@ -9,6 +9,7 @@ public class MobSpawnerPatrol {

patches/server/0049-Add-5-second-tps-average-in-tps.patch

@@ -1,4 +1,4 @@
-From e019732e0457b7a838f9c1934c9a1efb6529c8e7 Mon Sep 17 00:00:00 2001
+From f4f958ee9b4ba86eb7baa0432e253544815f5d58 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps

patches/server/0050-Rate-limit-packets-incoming-from-players.patch

@@ -1,4 +1,4 @@
-From 1e007d01df31875d0e690aa5912d8015ba94a1bc Mon Sep 17 00:00:00 2001
+From 4056829c61fd888d9fd34241d1b7f8eb37cca5fd Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 11 Mar 2019 12:18:29 -0700
 Subject: [PATCH] Rate limit packets incoming from players
@@ -194,7 +194,7 @@ index 96a785af2..ff8b5e76f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 520490d59..8aa8a672d 100644
+index afc1a5f85..30595523e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -140,6 +140,60 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0051-Don-t-recalculate-permissions-for-players-on-world-c.patch

@@ -1,4 +1,4 @@
-From 9bba75e2a35134a30c1f0df816ae3d2e2d834c6c Mon Sep 17 00:00:00 2001
+From 425bfe01bddd2370ecd7b768e88529dcb571c348 Mon Sep 17 00:00:00 2001
 From: Tom <cryptite@gmail.com>
 Date: Fri, 12 Jul 2019 07:59:35 -0500
 Subject: [PATCH] Don't recalculate permissions for players on world change

patches/server/0052-Add-blacklist-option-for-grindstone.patch

@@ -1,4 +1,4 @@
-From 4b7576a0ebb52b99eda351bc4d593158b72c5e0f Mon Sep 17 00:00:00 2001
+From e196b6fe7ca404320b8eacb488b5747980802576 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone

patches/server/0053-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 5fbe7cc1236187e4d0fcc4c584f35c8c00450091 Mon Sep 17 00:00:00 2001
+From d5fca23e69bb1fe7575ba7b0912dcfe5c41417c8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API

patches/server/0054-Advancement-stuffs.patch

@@ -1,4 +1,4 @@
-From 19494803caeaf400fd2e4f5a61c3077ec08a4eab Mon Sep 17 00:00:00 2001
+From 1f830e8fdf85927d6c97aef02f6f0ba0bf391a15 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 11 Aug 2019 22:25:33 -0500
 Subject: [PATCH] Advancement stuffs

patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From fd70dff76d52c53afca8555871d9840e79435886 Mon Sep 17 00:00:00 2001
+From 7482e89496f62fbf7133ce3b092adb1abe9645e4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs

patches/server/0056-Implement-bamboo-growth-settings.patch

@@ -1,4 +1,4 @@
-From 88a916a3fcbe9b2fdfcdaa376a6232ce696b318d Mon Sep 17 00:00:00 2001
+From c7fc75cf4236d8d88a9b0fdd14e377982c829633 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings
@@ -67,7 +67,7 @@ index d94368b03..24f7c1683 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f4fc0b014..2ecf5f9eb 100644
+index 0764be9d1..8915bc9ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -67,6 +67,13 @@ public class PurpurWorldConfig {

patches/server/0057-Option-for-slimes-not-pushable.patch

@@ -1,4 +1,4 @@
-From 57476275f6d8d2db86a75b2e1cf0fe5d8a899832 Mon Sep 17 00:00:00 2001
+From 1af46e167d7e6118cf4f13aaa95bf7a5064af5fc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable

patches/server/0058-Ender-Dragon-always-drops-full-exp.patch

@@ -1,4 +1,4 @@
-From 2774159720ce020a94f34d6a8a5c44cb89922ae2 Mon Sep 17 00:00:00 2001
+From 93bd3c61e49ae4399d44511ebfd63f5d80b91755 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender Dragon always drops full exp

patches/server/0059-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From eab0c36c7c34e5229de7f94217c5547b8355fe30 Mon Sep 17 00:00:00 2001
+From ab7ff9d590be6e82071b6bdae20dc7669d154703 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection

patches/server/0060-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch

@@ -1,4 +1,4 @@
-From f837cc668f0ae41b6ac13a4564db053406bd5c99 Mon Sep 17 00:00:00 2001
+From 7bf0c70941d1bc10251b785b1783f78466c7e2be Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 30 Aug 2019 18:56:32 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds MC-10657

patches/server/0061-Add-killer-rabbit-natural-spawn-chance.patch

@@ -1,4 +1,4 @@
-From 3c184c82e01b27e062f41077a7b73686ae9a98e0 Mon Sep 17 00:00:00 2001
+From b8058776a009869ee20456729f89b913dfd98555 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:24:41 -0500
 Subject: [PATCH] Add killer rabbit natural spawn chance

patches/server/0062-Add-option-to-spawn-Toast.patch

@@ -1,4 +1,4 @@
-From 3d926e3819ad692f7dfebbcc0cfb9e1350ecc803 Mon Sep 17 00:00:00 2001
+From d730d44cdf8403dcfc8df7139f0e8b7d1fd3e960 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Add option to spawn Toast

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

@@ -1,4 +1,4 @@
-From 5ee68a170abfe087c3085d8250d6029e66dc2cc4 Mon Sep 17 00:00:00 2001
+From f19d0643ea0a1abc2d6acdc9af45701d29d16fd0 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

patches/server/0064-Fix-infinite-villager-restocks-MC-157136.patch

@@ -1,4 +1,4 @@
-From daa3ae938b2b76339a6ebb884b13bf6f3c47d847 Mon Sep 17 00:00:00 2001
+From 9dfc4f3d34da8d170c3b41fa26c5b456b3fff561 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 16:08:46 -0500
 Subject: [PATCH] Fix infinite villager restocks MC-157136

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

@@ -1,4 +1,4 @@
-From baac2e148d13279531edb0d1cb3015732a70243b Mon Sep 17 00:00:00 2001
+From 016a5545530488fc4724c391c39216d038c75848 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