Drop Tident#getItemStack() patch in favor of Paper's new Arrow#getItemStack() patch

patches/server/0075-Despawn-egg-hatches-chicken.patch

@@ -1,4 +1,4 @@
-From d425a077b293b1e4368c321ba44314711eb2a6e1 Mon Sep 17 00:00:00 2001
+From ab9d1fa681708fd626c0c7a02291cd17d8bdff0c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 23:47:42 -0600
 Subject: [PATCH] Despawn egg hatches chicken

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

@@ -1,42 +0,0 @@
-From e10b674179217a0cabe811dd22d96dd28dcec896 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
-
----
- .../java/net/minecraft/server/EntityThrownTrident.java     | 2 +-
- .../java/org/bukkit/craftbukkit/entity/CraftTrident.java   | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index 59bb039ad..ed8e26aa4 100644
---- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
-+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-@@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow {
-     }
- 
-     @Override
--    protected ItemStack getItemStack() {
-+    public ItemStack getItemStack() { // Purpur - protected -> public
-         return this.trident.cloneItemStack();
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index 0518e6c68..63287a9b6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-@@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident {
-     public EntityType getType() {
-         return EntityType.TRIDENT;
-     }
-+
-+    // Purpur start
-+    @Override
-+    public org.bukkit.inventory.ItemStack getItemStack() {
-+        return org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(getHandle().getItemStack());
-+    }
-+    // Purpur end
- }
--- 
-2.26.2
-

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

@@ -1,4 +1,4 @@
-From 9bebb70c4071f92b1317115e42b71ef628ee5631 Mon Sep 17 00:00:00 2001
+From 324ade06e16035915b27500e54ab4fb1f1c29a32 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

patches/server/0077-Add-sleep-options.patch

@@ -1,4 +1,4 @@
-From 0f863a2f9ef019645eaf659efc0fbdd135caef40 Mon Sep 17 00:00:00 2001
+From ace26bd42b6a6b5de262a011df936981c281c91e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options

patches/server/0078-Option-for-hay-block-fall-damage.patch

@@ -1,4 +1,4 @@
-From 56ff33caeb30d23da17cfc109c2aa90e290fe7ca Mon Sep 17 00:00:00 2001
+From 670ad16925b34ff2bf80abea7613073586291c86 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 01:31:09 -0600
 Subject: [PATCH] Option for hay block fall damage

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

@@ -1,4 +1,4 @@
-From 26ec61f54554a0718d2beda5f5a8d0aee58b724b Mon Sep 17 00:00:00 2001
+From 8e48776996b8bb36d3834d576e20a70ffd0f332b 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

patches/server/0080-Add-LootableInventoryFirstFillEvent.patch

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

patches/server/0081-Villagers-follow-emerald-blocks.patch

@@ -1,4 +1,4 @@
-From 19e6faba58e550dc1e079ec3ee6e18d3a22ea2db Mon Sep 17 00:00:00 2001
+From 284ff850e9d523d2465658b3b4c6c219eadee509 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks

patches/server/0082-Add-player-death-exp-control-options.patch

@@ -1,4 +1,4 @@
-From 92ca7e1fa2b6587b860228b834de3e7afbf8c119 Mon Sep 17 00:00:00 2001
+From 1cb56387d6a23b9496102a3022d2ad9ee58280da Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options

patches/server/0083-Add-permission-for-F3-N-debug.patch

@@ -1,4 +1,4 @@
-From d0cec740c83328fb65a0ca8c25763f31c4f16d8b Mon Sep 17 00:00:00 2001
+From 6c73c93a24c4766149576a59e16d7e7ab031e149 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug

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

@@ -1,4 +1,4 @@
-From 79dd41722e6a0fd20c5c84f6ed83b6eb25a56a40 Mon Sep 17 00:00:00 2001
+From 2e855c9499f82ddbf21cbd5e1e33d5d5d9e1250c 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

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

@@ -1,4 +1,4 @@
-From 2956498159128f608aa1b247a50bb542a496b507 Mon Sep 17 00:00:00 2001
+From fdca75e7798f5c40990ede9e078f8e68587c9530 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

patches/server/0086-Make-lava-flow-speed-configurable.patch

@@ -1,4 +1,4 @@
-From 2ad07e4e8cf50edf8c2c9a8558941a2cecbdbc57 Mon Sep 17 00:00:00 2001
+From e1fc4760dc7cf41b2258c1351cad5246f733429b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable

patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -1,4 +1,4 @@
-From c9273015b40bdffe3e7cb4fdc7736de1e6f5aa0b Mon Sep 17 00:00:00 2001
+From 02fc90e6d67242d23da3b9f79ff650bd100240aa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option

patches/server/0088-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From 57fa86c225f61c3853117c13638b425715d53c50 Mon Sep 17 00:00:00 2001
+From cbe470f55a4b73c26d920e28b5a34244ccbfb9cf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service

patches/server/0089-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From c6367af96cad3abb8f53f1f67dc7ed78f2ead29f Mon Sep 17 00:00:00 2001
+From ba39fe270c169902970625051d27f30b23d54dc9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:48 -0600
 Subject: [PATCH] Implement EntityMoveEvent

patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,4 +1,4 @@
-From d15dafad3161b283965161bcd83c0e2f608fb010 Mon Sep 17 00:00:00 2001
+From 712f5b54a7f584f4299d2643945661221eb2593d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk

patches/server/0091-Implement-bed-explosion-options.patch

@@ -1,4 +1,4 @@
-From b014b34988129b072bdc1e2636521406e98102a7 Mon Sep 17 00:00:00 2001
+From 6dc574dbdbe31a99b139d32473070ac089288cc8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:04:29 -0600
 Subject: [PATCH] Implement bed explosion options

patches/server/0092-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 04319c50a3ac3023adf72f4209ec5b57464a636f Mon Sep 17 00:00:00 2001
+From 803cabc8255b5c859f12d23d9b40c48e97dc0789 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options

patches/server/0093-Make-natural-spawns-per-biome-configurable.patch

@@ -1,4 +1,4 @@
-From 99a4a1ff5afd0d395ef5fab555743441f60e616e Mon Sep 17 00:00:00 2001
+From bbb6f2f3b18209e87ea8c20a18e88a90eac64f7e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] Make natural spawns per biome configurable

patches/server/0094-Configurable-void-damage-height.patch

@@ -1,4 +1,4 @@
-From 8ee208d56db71cdc6ebaa58e4ec41a207b817e87 Mon Sep 17 00:00:00 2001
+From ea7f180ce6845e25f45c03d5c90c73b36f6c5cac Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height

patches/server/0095-Fix-the-dead-lagging-the-server.patch

@@ -1,4 +1,4 @@
-From b6593875f6295967977bb7df7397bbc7de3b900b Mon Sep 17 00:00:00 2001
+From 151f9b4605ac2ec1d7788f860ad5d331e25754a6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server

patches/server/0096-Add-ping-command.patch

@@ -1,4 +1,4 @@
-From 4eecea21cef90813c2146f04ed615fbcce3104a4 Mon Sep 17 00:00:00 2001
+From e6af557e52c617e3ee4ef0931ce39c2a0829e52b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command

patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -1,4 +1,4 @@
-From 61a6efa1c75f844cfe4d8e36970f701ea23cf6f4 Mon Sep 17 00:00:00 2001
+From f6a2f4d519f4f8b64162fefbfb1de88a8e654c5c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index ed8e26aa4..ca6c0ec29 100644
+index 59bb039ad..b975cc7fb 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
 @@ -38,7 +38,7 @@ public class EntityThrownTrident extends EntityArrow {

patches/server/0098-Configurable-server-mod-name.patch

@@ -1,4 +1,4 @@
-From a6328f61740886172bbdb27c1eb88fb4b51d6650 Mon Sep 17 00:00:00 2001
+From 9fd9d6cc9145840f9407ba06cac930d39d480d94 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name

patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -1,4 +1,4 @@
-From 9f22c699aeb8bb9426f86c11f9b5d5b9d2db6de3 Mon Sep 17 00:00:00 2001
+From 880fd629acbb50e1198acaf479127bfebe3817d6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 18:33:05 -0500
 Subject: [PATCH] End gateway should check if entity can use portal

patches/server/0100-Configurable-TPS-Catchup.patch

@@ -1,4 +1,4 @@
-From 929f8c699620583a084fba59d3d7ae17d231017e Mon Sep 17 00:00:00 2001
+From 68b264656f252e5a829e2a70024ffe9e74fb8e6c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup

patches/server/0101-Breedable-Polar-Bears.patch

@@ -1,4 +1,4 @@
-From 3b0ee494b672eeaa145b503b696fdc7d17a50825 Mon Sep 17 00:00:00 2001
+From 1ee64e547cf37152de6744d3774470e7a29f945e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:46:44 -0500
 Subject: [PATCH] Breedable Polar Bears

patches/server/0102-Configurable-jockey-options.patch

@@ -1,4 +1,4 @@
-From f80fca99a5c328f68c3a90446cbdb5cda49bcdd7 Mon Sep 17 00:00:00 2001
+From e08b23e89c1207ccb55349347521cc0de0cc37cd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options

patches/server/0103-Configurable-enchantment-max-level.patch

@@ -1,4 +1,4 @@
-From f6ac58c03507514d78c1c53b240df7c3c518f2f0 Mon Sep 17 00:00:00 2001
+From df05bfbcf31d32354e0286477ecf261279eb244d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 17:21:42 -0500
 Subject: [PATCH] Configurable enchantment max level

patches/server/0104-Optimize-Chunk-Ticks.patch

@@ -1,4 +1,4 @@
-From 8c5d1a7830e01bdec9b793ca78efb1bdbaa5c681 Mon Sep 17 00:00:00 2001
+From 9e7ef8eea9cb9c27ffc7b15b4ad7926629ca5667 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 00:28:06 -0500
 Subject: [PATCH] Optimize Chunk Ticks

patches/server/0105-Add-configurable-beehive-generation-chance.patch

@@ -1,4 +1,4 @@
-From 3e3ed022c3baa918e0f2ede87d132473c55f75ac Mon Sep 17 00:00:00 2001
+From a4900735eb07249132c6a813145a613e4d86026b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 03:39:34 -0500
 Subject: [PATCH] Add configurable beehive generation chance

patches/server/0106-Add-more-timings-timers.patch

@@ -1,4 +1,4 @@
-From aa1850cfb7ab695152dc0e698dce7b99a58b0ffc Mon Sep 17 00:00:00 2001
+From 758523eb133359d46e347782229675a02ee5a1e9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 02:36:45 -0500
 Subject: [PATCH] Add more timings timers

patches/server/0107-Skip-events-if-there-s-no-listeners.patch

@@ -1,4 +1,4 @@
-From 4a9c0d2f7405197ec0067ccc93100f9fb287418b Mon Sep 17 00:00:00 2001
+From 67afec34bd04c7397e1079296ef6da3659175aa8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners

patches/server/0108-Debug-stick-should-not-update-neighbors.patch

@@ -1,4 +1,4 @@
-From 352888a06e6832cefdfc356aa02970b54fec2e35 Mon Sep 17 00:00:00 2001
+From fb61a83a73f9de95c06c77f7f788d4df811c82f4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 17:16:30 -0500
 Subject: [PATCH] Debug stick should not update neighbors

patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch

@@ -1,4 +1,4 @@
-From d53c537129e476e92384ddf3012206cf251bd5e9 Mon Sep 17 00:00:00 2001
+From 1f2cea0e76872e923b9351c848918889ec610af4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Apr 2020 16:28:38 -0500
 Subject: [PATCH] Add enderman and creeper griefing controls

patches/server/0110-Chickens-can-retaliate.patch

@@ -1,4 +1,4 @@
-From c27089388ed1c2db321d25f60b88ec878bfd0a49 Mon Sep 17 00:00:00 2001
+From fe4b5892ead117ebd0db78ba6415bdb129f81cff Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 12 Apr 2020 13:19:34 -0500
 Subject: [PATCH] Chickens can retaliate

patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch

@@ -1,4 +1,4 @@
-From 7e15be00f7f884c7b0c122b115dbd89e1939f610 Mon Sep 17 00:00:00 2001
+From 02641240d37f617ad72ad74f28ddc87d950e0e7a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:33:11 -0500
 Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule

patches/server/0112-More-anvil-controls.patch

@@ -1,4 +1,4 @@
-From 827c0d379a0b6597d22c5c106eb52807de377870 Mon Sep 17 00:00:00 2001
+From aff14f5361f3b98c2bf66fa61d766e1db14af17e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 19 Apr 2020 00:17:56 -0500
 Subject: [PATCH] More anvil controls

patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch

@@ -1,4 +1,4 @@
-From f09c0fbca0a916ee9cdccbbbff2fe1a2f79cba63 Mon Sep 17 00:00:00 2001
+From 4fec6b17576670bee04b5fe77d3aac03c348d251 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:37:29 -0500
 Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule

patches/server/0114-Player-invulnerabilities.patch

@@ -1,4 +1,4 @@
-From 67b240f9c510dfb11392cb1c4a173aba12d5bf26 Mon Sep 17 00:00:00 2001
+From 6601b605fd122327b6cf4d6dbde13ff5ee278649 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:44 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -75,7 +75,7 @@ index 977392373..6572177c5 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6f7fd0f64..030d19a79 100644
+index 00a30519d..2eeeed017 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1548,6 +1548,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0115-Do-not-strip-colors-from-death-messages.patch

@@ -1,4 +1,4 @@
-From 41f066356c5c3493af9db9d6892e179dc8f051e0 Mon Sep 17 00:00:00 2001
+From 962285cc430c028dd08bff3c3e61b8fbe363dba3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Jun 2020 13:16:02 -0500
 Subject: [PATCH] Do not strip colors from death messages

patches/server/0116-Add-PrepareGrindstoneEvent.patch

@@ -1,4 +1,4 @@
-From 910112766d93a8703e0a04f5d1d9920cfaa7cfd3 Mon Sep 17 00:00:00 2001
+From 6388840e7fdd890b026b827d3b54f7da27a6f511 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 18 Jun 2020 23:29:54 -0500
 Subject: [PATCH] Add PrepareGrindstoneEvent

patches/server/0117-Fix-reloading-paper.yml.patch

@@ -1,4 +1,4 @@
-From ed743edc4805265b70ed281823a74984531e0b0f Mon Sep 17 00:00:00 2001
+From 01f779999483a518fbcc4bb50d1012721f5bd591 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jun 2020 21:36:16 -0500
 Subject: [PATCH] Fix reloading paper.yml

patches/server/0118-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch

@@ -1,4 +1,4 @@
-From 5c1ca79bd88c7166053cff3c3b2deb71193efc47 Mon Sep 17 00:00:00 2001
+From c54950636f4071df3ba78b647838a6c731dad604 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

patches/server/0119-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -1,4 +1,4 @@
-From 5b6860305459b4fe3e1a22b7d8e7271792d3df00 Mon Sep 17 00:00:00 2001
+From aa1c6cff1f8d0d3490aeccb736ebe442bfd4665d 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] MC-168772 Fix - Add turtle egg block options

patches/server/0120-MC-4-Fix-Item-position-desync.patch

@@ -1,4 +1,4 @@
-From 732b58eb1fe4d8da9a4cea23ad014419e81662cb Mon Sep 17 00:00:00 2001
+From 3066c4fd1c0e1722328c02c45a91216cc9757377 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] MC-4 Fix - Item position desync

patches/server/0121-MC-56653-Fix-pig-zombies-aggro.patch

@@ -1,4 +1,4 @@
-From 8c57c949a583f85788a8a5bc481a938918a53d9d Mon Sep 17 00:00:00 2001
+From 92a5d8dbf53574306790877796c786ee0604fb5f 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] MC-56653 Fix - pig zombies aggro

patches/server/0122-EMC-MonsterEggSpawn-Event.patch

@@ -1,4 +1,4 @@
-From d08ef8215637d0902eaca47e8638ad0b860b417d Mon Sep 17 00:00:00 2001
+From 8766ab3142d8c5ae273e6e160f16b5c2eb51f398 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event

patches/server/0123-PaperPR-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From 5ce023753262d5b0a62eb10d6cd6301c0a49f736 Mon Sep 17 00:00:00 2001
+From 645f0e70778082ed0c0355f0d703dc8d3a269af0 Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent

patches/server/0124-PaperPR-PlayerItemCooldownEvent.patch

@@ -1,4 +1,4 @@
-From 9ea86cbc0573b76be31b9f6b1f30659a1677fca2 Mon Sep 17 00:00:00 2001
+From ac3aea5c4687c6c17a2efc5fe044b876d24d74d7 Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:06 +0200
 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-index 27cde8c155..3c3bcc7f91 100644
+index 27cde8c15..3c3bcc7f9 100644
 --- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
 +++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
 @@ -2,12 +2,23 @@ package net.minecraft.server;

patches/server/0125-YAPFA-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From b35e8a48830a90a06fcf803f62bdaba77a370382 Mon Sep 17 00:00:00 2001
+From b21435be03ef81ca9cdaabaf4ace1d2c37bf219e Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler