From 5796ff9f94c9d7131d3d27f4ddcb5077b4cbc942 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Wed, 11 Nov 2020 23:27:30 -0600
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
73fc9666 Fix per-world settings not reloading (#4756)
94c99a8d Fix NPE thrown when converting MerchantRecipe from Bukkit to NMS (#4755)
072faf2a Fix minor issue with JavaDoc breaking doc deploys
---
 Paper                                         |   2 +-
 .../server/0060-Fix-reloading-paper.yml.patch |  27 ---
 ...060-Fix-the-dead-lagging-the-server.patch} |   4 +-
 ...Skip-events-if-there-s-no-listeners.patch} |   0
 ... 0062-Add-permission-for-F3-N-debug.patch} |   2 +-
 ...skeleton-takes-wither-damage-option.patch} |   4 +-
 ...ch => 0064-Configurable-TPS-Catchup.patch} |   4 +-
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |   4 +-
 ...erman-and-creeper-griefing-controls.patch} |   6 +-
 ...p-loot-bypass-mob-griefing-gamerule.patch} |   4 +-
 ...ng-can-bypass-mob-griefing-gamerule.patch} |   4 +-
 ...069-Villagers-follow-emerald-blocks.patch} |   8 +-
 ...ch => 0070-Allow-leashing-villagers.patch} |   8 +-
 ...rable-search-radius-for-villagers-t.patch} |   0
 ...tch => 0072-Implement-infinite-lava.patch} |   6 +-
 ...3-Make-lava-flow-speed-configurable.patch} |   4 +-
 ...dd-player-death-exp-control-options.patch} |   4 +-
 ...-disable-saving-projectiles-to-disk.patch} |  12 +-
 ...076-Configurable-void-damage-height.patch} |   4 +-
 ...spenser-curse-of-binding-protection.patch} |   6 +-
 ...-for-boats-to-eject-players-on-land.patch} |   4 +-
 ... 0079-Add-obfhelpers-for-plugin-use.patch} |   0
 ...-mends-most-damages-equipment-first.patch} |   8 +-
 ...81-Implement-bamboo-growth-settings.patch} |   4 +-
 ...should-not-bypass-cramming-gamerule.patch} |  22 +-
 ...083-Add-5-second-tps-average-in-tps.patch} |   6 +-
 ...h => 0084-Implement-elytra-settings.patch} |  10 +-
 ...atch => 0085-Item-entity-immunities.patch} |   0
 ...mand.patch => 0086-Add-ping-command.patch} |   2 +-
 ...=> 0087-Configurable-jockey-options.patch} |  12 +-
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  10 +-
 ...089-Customizable-EnderDragon-Health.patch} |   4 +-
 ...> 0090-Add-phantom-spawning-options.patch} |  14 +-
 ...091-Implement-bed-explosion-options.patch} |   4 +-
 ...nt-respawn-anchor-explosion-options.patch} |   4 +-
 ...Add-allow-water-in-end-world-option.patch} |   8 +-
 ... => 0094-Allow-color-codes-in-books.patch} |   2 +-
 ...espan.patch => 0095-Entity-lifespan.patch} |   6 +-
 ...eport-to-spawn-if-outside-world-bor.patch} |   4 +-
 ...ty.patch => 0097-Squid-EAR-immunity.patch} |   4 +-
 ...=> 0098-Configurable-end-spike-seed.patch} |   4 +-
 ...h => 0099-Configurable-dungeon-seed.patch} |   4 +-
 ...atch => 0100-Phantoms-burn-in-light.patch} |   6 +-
 ...0101-Configurable-villager-breeding.patch} |   0
 ... 0102-Redstone-deactivates-spawners.patch} |   4 +-
 ...ch => 0103-Totems-work-in-inventory.patch} |   4 +-
 ...ch => 0104-Fix-death-message-colors.patch} |   2 +-
 ...-vanilla-scoreboard-colors-patch-to.patch} |   2 +-
 ...tch => 0106-Populator-seed-controls.patch} |   6 +-
 ...-Add-vindicator-johnny-spawn-chance.patch} |   4 +-
 ...t.patch => 0108-DragonEggPlaceEvent.patch} |   2 +-
 ...n-to-disable-mushroom-block-updates.patch} |   4 +-
 ...0110-Dispensers-place-anvils-option.patch} |   6 +-
 ...rs.patch => 0111-Allow-anvil-colors.patch} |   4 +-
 ...atch => 0112-Add-no-tick-block-list.patch} |   6 +-
 ...-disable-dolphin-treasure-searching.patch} |   4 +-
 ...et-reputation-when-villager-is-cure.patch} |   0
 ...patch => 0115-Short-enderman-height.patch} |   6 +-
 ...top-squids-floating-on-top-of-water.patch} |   6 +-
 ...118-Ridables.patch => 0117-Ridables.patch} | 210 +++++++++---------
 ...-height-for-nether-surface-builders.patch} |   2 +-
 ...ng-obsidian-valid-for-portal-frames.patch} |   8 +-
 ...ities-can-use-portals-configuration.patch} |   4 +-
 ...121-LivingEntity-broadcastItemBreak.patch} |   2 +-
 ...zable-WitherBoss-Health-and-Healing.patch} |   4 +-
 ...gling-special-MobSpawners-per-world.patch} |   8 +-
 ...patch => 0124-Raid-cooldown-setting.patch} |   4 +-
 ...-config-options-per-projectile-type.patch} |  32 +--
 ...-Wandering-Trader-spawn-rate-config.patch} |   2 +-
 ...olor-code-support-for-console-loggi.patch} |   2 +-
 ...able-zombie-aggressiveness-towards-.patch} |   8 +-
 ...ent-TileEntity-Lore-and-DisplayName.patch} |   0
 ...-to-recipe-s-ExactChoice-ingredient.patch} |   0
 ...y.patch => 0131-Flying-squids-Oh-my.patch} |   0
 ...patch => 0132-Infinity-bow-settings.patch} |   0
 ...ge.patch => 0133-Stonecutter-damage.patch} |   0
 ...=> 0134-Configurable-daylight-cycle.patch} |   0
 ...e-and-mending-enchantments-together.patch} |   0
 ...patch => 0136-Infinite-fuel-furnace.patch} |   0
 ...ws-should-not-reset-despawn-counter.patch} |   0
 80 files changed, 287 insertions(+), 314 deletions(-)
 delete mode 100644 patches/server/0060-Fix-reloading-paper.yml.patch
 rename patches/server/{0061-Fix-the-dead-lagging-the-server.patch => 0060-Fix-the-dead-lagging-the-server.patch} (95%)
 rename patches/server/{0062-Skip-events-if-there-s-no-listeners.patch => 0061-Skip-events-if-there-s-no-listeners.patch} (100%)
 rename patches/server/{0063-Add-permission-for-F3-N-debug.patch => 0062-Add-permission-for-F3-N-debug.patch} (95%)
 rename patches/server/{0064-Add-wither-skeleton-takes-wither-damage-option.patch => 0063-Add-wither-skeleton-takes-wither-damage-option.patch} (96%)
 rename patches/server/{0065-Configurable-TPS-Catchup.patch => 0064-Configurable-TPS-Catchup.patch} (96%)
 rename patches/server/{0066-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0065-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (96%)
 rename patches/server/{0067-Add-enderman-and-creeper-griefing-controls.patch => 0066-Add-enderman-and-creeper-griefing-controls.patch} (97%)
 rename patches/server/{0068-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0067-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (97%)
 rename patches/server/{0069-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0068-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (96%)
 rename patches/server/{0070-Villagers-follow-emerald-blocks.patch => 0069-Villagers-follow-emerald-blocks.patch} (96%)
 rename patches/server/{0071-Allow-leashing-villagers.patch => 0070-Allow-leashing-villagers.patch} (96%)
 rename patches/server/{0072-Implement-configurable-search-radius-for-villagers-t.patch => 0071-Implement-configurable-search-radius-for-villagers-t.patch} (100%)
 rename patches/server/{0073-Implement-infinite-lava.patch => 0072-Implement-infinite-lava.patch} (96%)
 rename patches/server/{0074-Make-lava-flow-speed-configurable.patch => 0073-Make-lava-flow-speed-configurable.patch} (96%)
 rename patches/server/{0075-Add-player-death-exp-control-options.patch => 0074-Add-player-death-exp-control-options.patch} (97%)
 rename patches/server/{0076-Add-option-to-disable-saving-projectiles-to-disk.patch => 0075-Add-option-to-disable-saving-projectiles-to-disk.patch} (94%)
 rename patches/server/{0077-Configurable-void-damage-height.patch => 0076-Configurable-void-damage-height.patch} (97%)
 rename patches/server/{0078-Dispenser-curse-of-binding-protection.patch => 0077-Dispenser-curse-of-binding-protection.patch} (96%)
 rename patches/server/{0079-Add-option-for-boats-to-eject-players-on-land.patch => 0078-Add-option-for-boats-to-eject-players-on-land.patch} (96%)
 rename patches/server/{0080-Add-obfhelpers-for-plugin-use.patch => 0079-Add-obfhelpers-for-plugin-use.patch} (100%)
 rename patches/server/{0081-Mending-mends-most-damages-equipment-first.patch => 0080-Mending-mends-most-damages-equipment-first.patch} (97%)
 rename patches/server/{0082-Implement-bamboo-growth-settings.patch => 0081-Implement-bamboo-growth-settings.patch} (98%)
 rename patches/server/{0083-Climbing-should-not-bypass-cramming-gamerule.patch => 0082-Climbing-should-not-bypass-cramming-gamerule.patch} (95%)
 rename patches/server/{0084-Add-5-second-tps-average-in-tps.patch => 0083-Add-5-second-tps-average-in-tps.patch} (97%)
 rename patches/server/{0085-Implement-elytra-settings.patch => 0084-Implement-elytra-settings.patch} (97%)
 rename patches/server/{0086-Item-entity-immunities.patch => 0085-Item-entity-immunities.patch} (100%)
 rename patches/server/{0087-Add-ping-command.patch => 0086-Add-ping-command.patch} (99%)
 rename patches/server/{0088-Configurable-jockey-options.patch => 0087-Configurable-jockey-options.patch} (98%)
 rename patches/server/{0089-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0088-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (98%)
 rename patches/server/{0090-Customizable-EnderDragon-Health.patch => 0089-Customizable-EnderDragon-Health.patch} (96%)
 rename patches/server/{0091-Add-phantom-spawning-options.patch => 0090-Add-phantom-spawning-options.patch} (98%)
 rename patches/server/{0092-Implement-bed-explosion-options.patch => 0091-Implement-bed-explosion-options.patch} (97%)
 rename patches/server/{0093-Implement-respawn-anchor-explosion-options.patch => 0092-Implement-respawn-anchor-explosion-options.patch} (98%)
 rename patches/server/{0094-Add-allow-water-in-end-world-option.patch => 0093-Add-allow-water-in-end-world-option.patch} (97%)
 rename patches/server/{0095-Allow-color-codes-in-books.patch => 0094-Allow-color-codes-in-books.patch} (98%)
 rename patches/server/{0096-Entity-lifespan.patch => 0095-Entity-lifespan.patch} (97%)
 rename patches/server/{0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0096-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (96%)
 rename patches/server/{0098-Squid-EAR-immunity.patch => 0097-Squid-EAR-immunity.patch} (95%)
 rename patches/server/{0099-Configurable-end-spike-seed.patch => 0098-Configurable-end-spike-seed.patch} (97%)
 rename patches/server/{0100-Configurable-dungeon-seed.patch => 0099-Configurable-dungeon-seed.patch} (97%)
 rename patches/server/{0101-Phantoms-burn-in-light.patch => 0100-Phantoms-burn-in-light.patch} (98%)
 rename patches/server/{0102-Configurable-villager-breeding.patch => 0101-Configurable-villager-breeding.patch} (100%)
 rename patches/server/{0103-Redstone-deactivates-spawners.patch => 0102-Redstone-deactivates-spawners.patch} (96%)
 rename patches/server/{0104-Totems-work-in-inventory.patch => 0103-Totems-work-in-inventory.patch} (96%)
 rename patches/server/{0105-Fix-death-message-colors.patch => 0104-Fix-death-message-colors.patch} (98%)
 rename patches/server/{0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch => 0105-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch} (98%)
 rename patches/server/{0107-Populator-seed-controls.patch => 0106-Populator-seed-controls.patch} (97%)
 rename patches/server/{0108-Add-vindicator-johnny-spawn-chance.patch => 0107-Add-vindicator-johnny-spawn-chance.patch} (96%)
 rename patches/server/{0109-DragonEggPlaceEvent.patch => 0108-DragonEggPlaceEvent.patch} (97%)
 rename patches/server/{0110-Add-option-to-disable-mushroom-block-updates.patch => 0109-Add-option-to-disable-mushroom-block-updates.patch} (99%)
 rename patches/server/{0111-Dispensers-place-anvils-option.patch => 0110-Dispensers-place-anvils-option.patch} (97%)
 rename patches/server/{0112-Allow-anvil-colors.patch => 0111-Allow-anvil-colors.patch} (97%)
 rename patches/server/{0113-Add-no-tick-block-list.patch => 0112-Add-no-tick-block-list.patch} (97%)
 rename patches/server/{0114-Add-option-to-disable-dolphin-treasure-searching.patch => 0113-Add-option-to-disable-dolphin-treasure-searching.patch} (95%)
 rename patches/server/{0115-Add-option-to-reset-reputation-when-villager-is-cure.patch => 0114-Add-option-to-reset-reputation-when-villager-is-cure.patch} (100%)
 rename patches/server/{0116-Short-enderman-height.patch => 0115-Short-enderman-height.patch} (97%)
 rename patches/server/{0117-Stop-squids-floating-on-top-of-water.patch => 0116-Stop-squids-floating-on-top-of-water.patch} (95%)
 rename patches/server/{0118-Ridables.patch => 0117-Ridables.patch} (98%)
 rename patches/server/{0119-Use-configured-height-for-nether-surface-builders.patch => 0118-Use-configured-height-for-nether-surface-builders.patch} (97%)
 rename patches/server/{0120-Crying-obsidian-valid-for-portal-frames.patch => 0119-Crying-obsidian-valid-for-portal-frames.patch} (95%)
 rename patches/server/{0121-Entities-can-use-portals-configuration.patch => 0120-Entities-can-use-portals-configuration.patch} (97%)
 rename patches/server/{0122-LivingEntity-broadcastItemBreak.patch => 0121-LivingEntity-broadcastItemBreak.patch} (96%)
 rename patches/server/{0123-Customizable-WitherBoss-Health-and-Healing.patch => 0122-Customizable-WitherBoss-Health-and-Healing.patch} (98%)
 rename patches/server/{0124-Allow-toggling-special-MobSpawners-per-world.patch => 0123-Allow-toggling-special-MobSpawners-per-world.patch} (98%)
 rename patches/server/{0125-Raid-cooldown-setting.patch => 0124-Raid-cooldown-setting.patch} (98%)
 rename patches/server/{0126-Despawn-rate-config-options-per-projectile-type.patch => 0125-Despawn-rate-config-options-per-projectile-type.patch} (96%)
 rename patches/server/{0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch => 0126-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch} (99%)
 rename patches/server/{0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch => 0127-PaperPR-Add-hex-color-code-support-for-console-loggi.patch} (98%)
 rename patches/server/{0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0128-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (97%)
 rename patches/server/{0130-Persistent-TileEntity-Lore-and-DisplayName.patch => 0129-Persistent-TileEntity-Lore-and-DisplayName.patch} (100%)
 rename patches/server/{0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0130-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0132-Flying-squids-Oh-my.patch => 0131-Flying-squids-Oh-my.patch} (100%)
 rename patches/server/{0133-Infinity-bow-settings.patch => 0132-Infinity-bow-settings.patch} (100%)
 rename patches/server/{0134-Stonecutter-damage.patch => 0133-Stonecutter-damage.patch} (100%)
 rename patches/server/{0135-Configurable-daylight-cycle.patch => 0134-Configurable-daylight-cycle.patch} (100%)
 rename patches/server/{0136-Allow-infinite-and-mending-enchantments-together.patch => 0135-Allow-infinite-and-mending-enchantments-together.patch} (100%)
 rename patches/server/{0137-Infinite-fuel-furnace.patch => 0136-Infinite-fuel-furnace.patch} (100%)
 rename patches/server/{0138-Arrows-should-not-reset-despawn-counter.patch => 0137-Arrows-should-not-reset-despawn-counter.patch} (100%)

diff --git a/Paper b/Paper
index 5b123cd1d..73fc96669 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 5b123cd1d59b9f50ee32732c1b97897294e338c1
+Subproject commit 73fc96669d7410372f15c68901c01bf923ae9cf4
diff --git a/patches/server/0060-Fix-reloading-paper.yml.patch b/patches/server/0060-Fix-reloading-paper.yml.patch
deleted file mode 100644
index 2ec9a88b0..000000000
--- a/patches/server/0060-Fix-reloading-paper.yml.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 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
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fbfea9e98..b0fcf7604 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -20,7 +20,7 @@ public class PaperWorldConfig {
- 
-     private final String worldName;
-     private final SpigotWorldConfig spigotConfig;
--    private final YamlConfiguration config;
-+    private YamlConfiguration config; // Purpur
-     private boolean verbose;
- 
-     public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
-@@ -31,6 +31,7 @@ public class PaperWorldConfig {
-     }
- 
-     public void init() {
-+        this.config = PaperConfig.config; // Purpur
-         log("-------- World Settings For [" + worldName + "] --------");
-         PaperConfig.readConfig(PaperWorldConfig.class, this);
-     }
diff --git a/patches/server/0061-Fix-the-dead-lagging-the-server.patch b/patches/server/0060-Fix-the-dead-lagging-the-server.patch
similarity index 95%
rename from patches/server/0061-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0060-Fix-the-dead-lagging-the-server.patch
index 4239077d7..aacbd8ba6 100644
--- a/patches/server/0061-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0060-Fix-the-dead-lagging-the-server.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9c781fed14..5a56f0ce76 100644
+index 41cba0914..0bc12fa32 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1529,6 +1529,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 9c781fed14..5a56f0ce76 100644
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ace0743eb1..b30abd4c90 100644
+index ace0743eb..b30abd4c9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2478,7 +2478,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0062-Skip-events-if-there-s-no-listeners.patch b/patches/server/0061-Skip-events-if-there-s-no-listeners.patch
similarity index 100%
rename from patches/server/0062-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0061-Skip-events-if-there-s-no-listeners.patch
diff --git a/patches/server/0063-Add-permission-for-F3-N-debug.patch b/patches/server/0062-Add-permission-for-F3-N-debug.patch
similarity index 95%
rename from patches/server/0063-Add-permission-for-F3-N-debug.patch
rename to patches/server/0062-Add-permission-for-F3-N-debug.patch
index 2d1fcb6b4..9d1f5db57 100644
--- a/patches/server/0063-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0062-Add-permission-for-F3-N-debug.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c92a703da4..36dd79fc5b 100644
+index c92a703da..36dd79fc5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1059,6 +1059,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0064-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0063-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 96%
rename from patches/server/0064-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0063-Add-wither-skeleton-takes-wither-damage-option.patch
index 1d2d5133c..e824899fa 100644
--- a/patches/server/0064-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0063-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 1ae9910fef..c872be77a6 100644
+index 1ae9910fe..c872be77a 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -97,6 +97,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -17,7 +17,7 @@ index 1ae9910fef..c872be77a6 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 11af56df60..79a87a1a16 100644
+index 11af56df6..79a87a1a1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -271,6 +271,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0065-Configurable-TPS-Catchup.patch b/patches/server/0064-Configurable-TPS-Catchup.patch
similarity index 96%
rename from patches/server/0065-Configurable-TPS-Catchup.patch
rename to patches/server/0064-Configurable-TPS-Catchup.patch
index b37bc74e9..4c9a1cf25 100644
--- a/patches/server/0065-Configurable-TPS-Catchup.patch
+++ b/patches/server/0064-Configurable-TPS-Catchup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d74f5a226b..046d3dd838 100644
+index d74f5a226..046d3dd83 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1005,7 +1005,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -24,7 +24,7 @@ index d74f5a226b..046d3dd838 100644
                      this.methodProfiler.exit();
                      this.methodProfiler.b();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 30935339e8..a49807916d 100644
+index 30935339e..a49807916 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -194,4 +194,9 @@ public class PurpurConfig {
diff --git a/patches/server/0066-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0065-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 96%
rename from patches/server/0066-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0065-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 64de79602..e89037ade 100644
--- a/patches/server/0066-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0065-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index a3150bd1ce..b24b8c39d3 100644
+index 8026a55d4..2acbe7437 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 {
@@ -18,7 +18,7 @@ index a3150bd1ce..b24b8c39d3 100644
  
              if (b0 > 0 && !this.z()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9353264c53..646d3ae33d 100644
+index 79a87a1a1..72374b9e7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -114,9 +114,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0067-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0066-Add-enderman-and-creeper-griefing-controls.patch
similarity index 97%
rename from patches/server/0067-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0066-Add-enderman-and-creeper-griefing-controls.patch
index c07ddebbe..4ac2a6cc4 100644
--- a/patches/server/0067-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0066-Add-enderman-and-creeper-griefing-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index eb4a0ef0e7..2256b81624 100644
+index eb4a0ef0e..2256b8162 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -215,7 +215,7 @@ public class EntityCreeper extends EntityMonster {
@@ -18,7 +18,7 @@ index eb4a0ef0e7..2256b81624 100644
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index f53525eb32..7b175240e4 100644
+index f53525eb3..7b175240e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -369,6 +369,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -47,7 +47,7 @@ index f53525eb32..7b175240e4 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 72374b9e76..94fc3230a3 100644
+index 72374b9e7..94fc3230a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -191,8 +191,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0068-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0067-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
similarity index 97%
rename from patches/server/0068-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
rename to patches/server/0067-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
index 4f0836b60..9647c2c0d 100644
--- a/patches/server/0068-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0067-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7c58c82388..a13b52cc3b 100644
+index ba4a2bcfa..b71dea314 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -542,7 +542,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index 7c58c82388..a13b52cc3b 100644
              Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc99d6d67d..1900cf3177 100644
+index 94fc3230a..ef7ca798a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,10 +113,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0069-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0068-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
similarity index 96%
rename from patches/server/0069-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
rename to patches/server/0068-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
index 4387f9ce0..7c63b0bb3 100644
--- a/patches/server/0069-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0068-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java
-index 54a555509e..0ff202c0d7 100644
+index 54a555509..0ff202c0d 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java
 @@ -18,7 +18,7 @@ public class BehaviorFarm extends Behavior<EntityVillager> {
@@ -18,7 +18,7 @@ index 54a555509e..0ff202c0d7 100644
          } else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
              return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef7ca798ab..e31094bd17 100644
+index ef7ca798a..e31094bd1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -277,9 +277,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0070-Villagers-follow-emerald-blocks.patch b/patches/server/0069-Villagers-follow-emerald-blocks.patch
similarity index 96%
rename from patches/server/0070-Villagers-follow-emerald-blocks.patch
rename to patches/server/0069-Villagers-follow-emerald-blocks.patch
index 918abcc4c..ab3d2df2b 100644
--- a/patches/server/0070-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0069-Villagers-follow-emerald-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 7f75be31cb..12bb9e8aac 100644
+index a02f54ab3..3c222a6a3 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index 7f75be31cb..12bb9e8aac 100644
      public BehaviorController<EntityVillager> getBehaviorController() {
          return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index df2ebd3646..a82c9ae418 100644
+index df2ebd364..a82c9ae41 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index df2ebd3646..a82c9ae418 100644
      private CraftMerchant craftMerchant;
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index f1a509063c..74c2d89af5 100644
+index f1a509063..74c2d89af 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -40,6 +40,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,7 +48,7 @@ index f1a509063c..74c2d89af5 100644
          this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
          this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e31094bd17..2c334ecb60 100644
+index e31094bd1..2c334ecb6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -278,10 +278,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0071-Allow-leashing-villagers.patch b/patches/server/0070-Allow-leashing-villagers.patch
similarity index 96%
rename from patches/server/0071-Allow-leashing-villagers.patch
rename to patches/server/0070-Allow-leashing-villagers.patch
index dd1e3e571..6abf14c28 100644
--- a/patches/server/0071-Allow-leashing-villagers.patch
+++ b/patches/server/0070-Allow-leashing-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b71dea314c..84ac5112a2 100644
+index b71dea314..84ac5112a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1145,6 +1145,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index b71dea314c..84ac5112a2 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 12bb9e8aac..a272d353e3 100644
+index 3c222a6a3..563dfc3da 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -33,7 +33,7 @@ index 12bb9e8aac..a272d353e3 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 74c2d89af5..96dda6a14f 100644
+index 74c2d89af..96dda6a14 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -47,6 +47,13 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -51,7 +51,7 @@ index 74c2d89af5..96dda6a14f 100644
      @Override
      public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c334ecb60..0ca84d650e 100644
+index 2c334ecb6..0ca84d650 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -277,17 +277,21 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0072-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0071-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 100%
rename from patches/server/0072-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0071-Implement-configurable-search-radius-for-villagers-t.patch
diff --git a/patches/server/0073-Implement-infinite-lava.patch b/patches/server/0072-Implement-infinite-lava.patch
similarity index 96%
rename from patches/server/0073-Implement-infinite-lava.patch
rename to patches/server/0072-Implement-infinite-lava.patch
index f830f6982..35427fd06 100644
--- a/patches/server/0073-Implement-infinite-lava.patch
+++ b/patches/server/0072-Implement-infinite-lava.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement infinite lava
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index d72a88e927..35d55bc15b 100644
+index d72a88e92..35d55bc15 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -195,7 +195,7 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -36,7 +36,7 @@ index d72a88e927..35d55bc15b 100644
  
      protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) {
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index 29930e801c..ffab239192 100644
+index 29930e801..ffab23919 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -147,6 +147,18 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -59,7 +59,7 @@ index 29930e801c..ffab239192 100644
      protected boolean f() {
          return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 478e6af841..ba9a634be3 100644
+index 13fc46d44..80e18c758 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -158,6 +158,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0074-Make-lava-flow-speed-configurable.patch b/patches/server/0073-Make-lava-flow-speed-configurable.patch
similarity index 96%
rename from patches/server/0074-Make-lava-flow-speed-configurable.patch
rename to patches/server/0073-Make-lava-flow-speed-configurable.patch
index 081084107..fabc15518 100644
--- a/patches/server/0074-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0073-Make-lava-flow-speed-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make lava flow speed configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index ffab239192..d981aa5a5f 100644
+index ffab23919..d981aa5a5 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -18,7 +18,7 @@ index ffab239192..d981aa5a5f 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ba9a634be3..7c9f8d018b 100644
+index 80e18c758..7088bee59 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -160,9 +160,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0075-Add-player-death-exp-control-options.patch b/patches/server/0074-Add-player-death-exp-control-options.patch
similarity index 97%
rename from patches/server/0075-Add-player-death-exp-control-options.patch
rename to patches/server/0074-Add-player-death-exp-control-options.patch
index af08254f2..42cc9ab98 100644
--- a/patches/server/0075-Add-player-death-exp-control-options.patch
+++ b/patches/server/0074-Add-player-death-exp-control-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index eb62555cb2..48f9feaea1 100644
+index 335cb9c4a..75f987411 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -85,6 +85,8 @@ public abstract class EntityHuman extends EntityLiving {
@@ -40,7 +40,7 @@ index eb62555cb2..48f9feaea1 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7c9f8d018b..1f5c4f592a 100644
+index 7088bee59..adcd1779c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -123,6 +123,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0076-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0075-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 94%
rename from patches/server/0076-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0075-Add-option-to-disable-saving-projectiles-to-disk.patch
index 1025d3b15..6f6a797eb 100644
--- a/patches/server/0076-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0075-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index c2adc7f522..24a6102b37 100644
+index 5eb14c4cd..1bc8b11d9 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -489,6 +489,7 @@ public class ChunkRegionLoader {
+@@ -508,6 +508,7 @@ public class ChunkRegionLoader {
  
                  while (iterator1.hasNext()) {
                      Entity entity = (Entity) iterator1.next();
@@ -17,7 +17,7 @@ index c2adc7f522..24a6102b37 100644
                      // Paper start
                      if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 27b7f44786..73698ac51c 100644
+index 0bc12fa32..3f2adc228 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +34,7 @@ index 27b7f44786..73698ac51c 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
-index 08da58677a..3ff61434c3 100644
+index 132fa358b..18fdb9f8d 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
 @@ -19,6 +19,13 @@ public class EntityEnderSignal extends Entity {
@@ -52,7 +52,7 @@ index 08da58677a..3ff61434c3 100644
          if (true || itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { // CraftBukkit - always allow item changing
              this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
-index 9f5ce64a60..0bac6b0506 100644
+index 9f5ce64a6..0bac6b050 100644
 --- a/src/main/java/net/minecraft/server/IProjectile.java
 +++ b/src/main/java/net/minecraft/server/IProjectile.java
 @@ -18,6 +18,13 @@ public abstract class IProjectile extends Entity {
@@ -70,7 +70,7 @@ index 9f5ce64a60..0bac6b0506 100644
          if (entity != null) {
              this.shooter = entity.getUniqueID();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1f5c4f592a..aba2b63ecb 100644
+index adcd1779c..b5ae7c047 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -115,11 +115,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0077-Configurable-void-damage-height.patch b/patches/server/0076-Configurable-void-damage-height.patch
similarity index 97%
rename from patches/server/0077-Configurable-void-damage-height.patch
rename to patches/server/0076-Configurable-void-damage-height.patch
index 9b4ffd730..1693b0ff3 100644
--- a/patches/server/0077-Configurable-void-damage-height.patch
+++ b/patches/server/0076-Configurable-void-damage-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 73698ac51c..d862f88528 100644
+index 3f2adc228..4763dca41 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 73698ac51c..d862f88528 100644
              && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
              this.doVoidDamage();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aba2b63ecb..feb23696e0 100644
+index b5ae7c047..286a2a986 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -117,12 +117,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0078-Dispenser-curse-of-binding-protection.patch b/patches/server/0077-Dispenser-curse-of-binding-protection.patch
similarity index 96%
rename from patches/server/0078-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0077-Dispenser-curse-of-binding-protection.patch
index f3508efcb..10f641fe4 100644
--- a/patches/server/0078-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0077-Dispenser-curse-of-binding-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 84ac5112a2..202ccf2a7f 100644
+index 84ac5112a..202ccf2a7 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -992,6 +992,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -23,7 +23,7 @@ index 84ac5112a2..202ccf2a7f 100644
          Item item = itemstack.getItem();
  
 diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java
-index 669a504118..7cd2e871b5 100644
+index 669a50411..7cd2e871b 100644
 --- a/src/main/java/net/minecraft/server/ItemArmor.java
 +++ b/src/main/java/net/minecraft/server/ItemArmor.java
 @@ -35,7 +35,7 @@ public class ItemArmor extends Item implements ItemWearable {
@@ -44,7 +44,7 @@ index 669a504118..7cd2e871b5 100644
          return this.b;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 286a2a986b..cc78145aed 100644
+index 286a2a986..cc78145ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -164,6 +164,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0079-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0078-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 96%
rename from patches/server/0079-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0078-Add-option-for-boats-to-eject-players-on-land.patch
index 334b100cb..4e35113c9 100644
--- a/patches/server/0079-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0078-Add-option-for-boats-to-eject-players-on-land.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for boats to eject players on land
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 5d14c235b4..8d55946517 100644
+index 45fea3893..78428539f 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -440,6 +440,7 @@ public class EntityBoat extends Entity {
@@ -17,7 +17,7 @@ index 5d14c235b4..8d55946517 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 bb67d48e6c..899dc46636 100644
+index cc78145ae..c000d8775 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0080-Add-obfhelpers-for-plugin-use.patch b/patches/server/0079-Add-obfhelpers-for-plugin-use.patch
similarity index 100%
rename from patches/server/0080-Add-obfhelpers-for-plugin-use.patch
rename to patches/server/0079-Add-obfhelpers-for-plugin-use.patch
diff --git a/patches/server/0081-Mending-mends-most-damages-equipment-first.patch b/patches/server/0080-Mending-mends-most-damages-equipment-first.patch
similarity index 97%
rename from patches/server/0081-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0080-Mending-mends-most-damages-equipment-first.patch
index 3d3e2278b..85e05af89 100644
--- a/patches/server/0081-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0080-Mending-mends-most-damages-equipment-first.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mending mends most damages equipment first
 
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index b6b0460de9..2bf518f413 100644
+index 7b2635943..33e2dc3a1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -251,7 +251,30 @@ public class EnchantmentManager {
@@ -41,7 +41,7 @@ index b6b0460de9..2bf518f413 100644
          return a(enchantment, entityliving, (itemstack) -> {
              return true;
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index e33a42dcd5..e053f9c376 100644
+index c2be0c2bc..358d6d660 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -220,7 +220,7 @@ public class EntityExperienceOrb extends Entity {
@@ -54,7 +54,7 @@ index e33a42dcd5..e053f9c376 100644
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2c908a6040..6a9b7e6094 100644
+index 2c908a604..6a9b7e609 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -418,10 +418,19 @@ public final class ItemStack {
@@ -78,7 +78,7 @@ index 2c908a6040..6a9b7e6094 100644
          return this.tag == null ? 0 : this.tag.getInt("Damage");
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 899dc46636..5abbc03d87 100644
+index c000d8775..3e717cac2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0082-Implement-bamboo-growth-settings.patch b/patches/server/0081-Implement-bamboo-growth-settings.patch
similarity index 98%
rename from patches/server/0082-Implement-bamboo-growth-settings.patch
rename to patches/server/0081-Implement-bamboo-growth-settings.patch
index fd86d9e0c..fddc702d3 100644
--- a/patches/server/0082-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0081-Implement-bamboo-growth-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement bamboo growth settings
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index f208ab5098..ce56edb7c8 100644
+index f208ab509..ce56edb7c 100644
 --- a/src/main/java/net/minecraft/server/BlockBamboo.java
 +++ b/src/main/java/net/minecraft/server/BlockBamboo.java
 @@ -99,7 +99,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -63,7 +63,7 @@ index f208ab5098..ce56edb7c8 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5abbc03d87..c95040b1dd 100644
+index 3e717cac2..d795b8fce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -168,6 +168,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0083-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0082-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 95%
rename from patches/server/0083-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0082-Climbing-should-not-bypass-cramming-gamerule.patch
index 359ecf16d..4ff6515d9 100644
--- a/patches/server/0083-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0082-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca8ce07b7e..673e05627b 100644
+index 4763dca41..6a9318318 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1728,6 +1728,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index ca8ce07b7e..673e05627b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5cde0f0d3c..0b19859019 100644
+index 5cde0f0d3..0b1985901 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -320,7 +320,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -35,7 +35,7 @@ index 5cde0f0d3c..0b19859019 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 38ce356310..85371542e4 100644
+index 38ce35631..85371542e 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
@@ -48,7 +48,7 @@ index 38ce356310..85371542e4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 78428539f9..939a5fb880 100644
+index 78428539f..939a5fb88 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -106,7 +106,7 @@ public class EntityBoat extends Entity {
@@ -61,7 +61,7 @@ index 78428539f9..939a5fb880 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 345e1df09e..573d4a5c78 100644
+index 345e1df09..573d4a5c7 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -74,7 +74,7 @@ index 345e1df09e..573d4a5c78 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b30abd4c90..67543e3940 100644
+index b30abd4c9..67543e394 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2866,7 +2866,7 @@ public abstract class EntityLiving extends Entity {
@@ -103,7 +103,7 @@ index b30abd4c90..67543e3940 100644
  
      // CraftBukkit start - collidable API
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 28808712e2..b698ca7e47 100644
+index 28808712e..b698ca7e4 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -107,7 +107,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -116,7 +116,7 @@ index 28808712e2..b698ca7e47 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 1c682a62b8..f7b92078ea 100644
+index 1c682a62b..f7b92078e 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -131,7 +131,7 @@ index 1c682a62b8..f7b92078ea 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7902cc7f1a..a761bfea46 100644
+index 7902cc7f1..a761bfea4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1776,8 +1776,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -146,7 +146,7 @@ index 7902cc7f1a..a761bfea46 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 9f9d9b2de8..5a05f2abdd 100644
+index 9f9d9b2de..5a05f2abd 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -45,11 +45,17 @@ public final class IEntitySelector {
@@ -169,7 +169,7 @@ index 9f9d9b2de8..5a05f2abdd 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ez())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d795b8fced..521b4d4e1e 100644
+index d795b8fce..521b4d4e1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -116,6 +116,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0084-Add-5-second-tps-average-in-tps.patch b/patches/server/0083-Add-5-second-tps-average-in-tps.patch
similarity index 97%
rename from patches/server/0084-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0083-Add-5-second-tps-average-in-tps.patch
index 3e8c5cde1..7f4d05931 100644
--- a/patches/server/0084-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0083-Add-5-second-tps-average-in-tps.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 046d3dd838..39fc43e1c7 100644
+index 046d3dd83..39fc43e1c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -166,7 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -47,7 +47,7 @@ index 046d3dd838..39fc43e1c7 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 15abd94340..41f88479a6 100644
+index 15abd9434..41f88479a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2235,6 +2235,7 @@ public final class CraftServer implements Server {
@@ -59,7 +59,7 @@ index 15abd94340..41f88479a6 100644
                  net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index 7218f23df4..3c7b9a6d24 100644
+index 7218f23df..3c7b9a6d2 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command
diff --git a/patches/server/0085-Implement-elytra-settings.patch b/patches/server/0084-Implement-elytra-settings.patch
similarity index 97%
rename from patches/server/0085-Implement-elytra-settings.patch
rename to patches/server/0084-Implement-elytra-settings.patch
index 0f30a0eb7..e199a10cf 100644
--- a/patches/server/0085-Implement-elytra-settings.patch
+++ b/patches/server/0084-Implement-elytra-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8346d8f3dd..45a2979380 100644
+index 67543e394..07da2a4df 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2837,7 +2837,16 @@ public abstract class EntityLiving extends Entity {
@@ -27,7 +27,7 @@ index 8346d8f3dd..45a2979380 100644
                      });
                  }
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index e775fe69ee..990eb65669 100644
+index e775fe69e..990eb6566 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -43,6 +43,14 @@ public class ItemFireworks extends Item {
@@ -46,7 +46,7 @@ index e775fe69ee..990eb65669 100644
                          itemstack.subtract(1);
                      } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6a9b7e6094..40f553e395 100644
+index 6a9b7e609..40f553e39 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -450,7 +450,7 @@ public final class ItemStack {
@@ -72,7 +72,7 @@ index 6a9b7e6094..40f553e395 100644
                      if (this.count == 1 && t0 instanceof EntityHuman) {
                          org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
 diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
-index 3663b70173..18f767dc57 100644
+index 3663b7017..18f767dc5 100644
 --- a/src/main/java/net/minecraft/server/ItemTrident.java
 +++ b/src/main/java/net/minecraft/server/ItemTrident.java
 @@ -102,6 +102,16 @@ public class ItemTrident extends Item implements ItemVanishable {
@@ -93,7 +93,7 @@ index 3663b70173..18f767dc57 100644
                          entityhuman.r(20);
                          if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4670cf7909..d0e410ad53 100644
+index 521b4d4e1..998751ab8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -133,6 +133,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0086-Item-entity-immunities.patch b/patches/server/0085-Item-entity-immunities.patch
similarity index 100%
rename from patches/server/0086-Item-entity-immunities.patch
rename to patches/server/0085-Item-entity-immunities.patch
diff --git a/patches/server/0087-Add-ping-command.patch b/patches/server/0086-Add-ping-command.patch
similarity index 99%
rename from patches/server/0087-Add-ping-command.patch
rename to patches/server/0086-Add-ping-command.patch
index 7cf931345..26c9c23db 100644
--- a/patches/server/0087-Add-ping-command.patch
+++ b/patches/server/0086-Add-ping-command.patch
@@ -55,7 +55,7 @@ index cabce1a8b..0ad72570f 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
-index 90b0cf647..6f43dfc10 100644
+index 86f1cfe45..da53af61d 100644
 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 @@ -189,6 +189,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
diff --git a/patches/server/0088-Configurable-jockey-options.patch b/patches/server/0087-Configurable-jockey-options.patch
similarity index 98%
rename from patches/server/0088-Configurable-jockey-options.patch
rename to patches/server/0087-Configurable-jockey-options.patch
index e6608ecb6..3c741dfb6 100644
--- a/patches/server/0088-Configurable-jockey-options.patch
+++ b/patches/server/0087-Configurable-jockey-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 9ae0897bfd..1a10281692 100644
+index 9ae0897bf..1a1028169 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -21,6 +21,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -33,7 +33,7 @@ index 9ae0897bfd..1a10281692 100644
      protected void m() {
          this.goalSelector.a(1, new EntityDrowned.c(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 65bae8c9f2..32b75f710b 100644
+index 65bae8c9f..32b75f710 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -21,6 +21,23 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -61,7 +61,7 @@ index 65bae8c9f2..32b75f710b 100644
      public void setAngerTarget(@Nullable UUID uuid) {
          this.br = uuid;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index e3606722cb..b90ea31440 100644
+index e3606722c..b90ea3144 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -137,7 +137,7 @@ index e3606722cb..b90ea31440 100644
  
          public GroupDataZombie(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 2d2830adc5..ce6d797801 100644
+index 2d2830adc..ce6d79780 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie {
@@ -165,7 +165,7 @@ index 2d2830adc5..ce6d797801 100644
          return b(entitytypes, worldaccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || worldaccess.e(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index a5214914a1..b86816205c 100644
+index a5214914a..b86816205 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -28,6 +28,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -193,7 +193,7 @@ index a5214914a1..b86816205c 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bc7124b911..5969cbb052 100644
+index bc7124b91..5969cbb05 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -268,6 +268,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0089-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0088-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 98%
rename from patches/server/0089-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0088-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index ef5652808..7932a8cbd 100644
--- a/patches/server/0089-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0088-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
-index 6fe5678cff..bd0267ee4b 100644
+index 6fe5678cf..bd0267ee4 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -88,6 +88,7 @@ public class DamageSource {
@@ -17,7 +17,7 @@ index 6fe5678cff..bd0267ee4b 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ef65921659..b4b53f95d3 100644
+index e14aa4fd9..fb850c99c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2143,8 +2143,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index ef65921659..b4b53f95d3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index 362ca695d8..1942fae270 100644
+index 362ca695d..1942fae27 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -100,7 +100,7 @@ index 362ca695d8..1942fae270 100644
      @Override
      protected void saveData(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 3a70900c73..dfce36368d 100644
+index 3a70900c7..dfce36368 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -9,9 +9,10 @@ import javax.annotation.Nullable;
@@ -321,7 +321,7 @@ index 3a70900c73..dfce36368d 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5969cbb052..bb6c243473 100644
+index 5969cbb05..bb6c24347 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -334,6 +334,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0090-Customizable-EnderDragon-Health.patch b/patches/server/0089-Customizable-EnderDragon-Health.patch
similarity index 96%
rename from patches/server/0090-Customizable-EnderDragon-Health.patch
rename to patches/server/0089-Customizable-EnderDragon-Health.patch
index 176579ddd..74b29abc3 100644
--- a/patches/server/0090-Customizable-EnderDragon-Health.patch
+++ b/patches/server/0089-Customizable-EnderDragon-Health.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable EnderDragon Health
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index a5a2182455..d2fcd0bc16 100644
+index a5a218245..d2fcd0bc1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -62,6 +62,16 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -26,7 +26,7 @@ index a5a2182455..d2fcd0bc16 100644
          return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 200.0D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bb6c243473..32a233ceb5 100644
+index bb6c24347..32a233ceb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -279,9 +279,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0091-Add-phantom-spawning-options.patch b/patches/server/0090-Add-phantom-spawning-options.patch
similarity index 98%
rename from patches/server/0091-Add-phantom-spawning-options.patch
rename to patches/server/0090-Add-phantom-spawning-options.patch
index 54cab6a07..1d0c212a5 100644
--- a/patches/server/0091-Add-phantom-spawning-options.patch
+++ b/patches/server/0090-Add-phantom-spawning-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom spawning options
 
 
 diff --git a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
-index 75745af343..84c0ec1b50 100644
+index 75745af34..84c0ec1b5 100644
 --- a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
 +++ b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java
 @@ -13,6 +13,7 @@ public class DifficultyDamageScaler {
@@ -25,7 +25,7 @@ index 75745af343..84c0ec1b50 100644
          return this.b > f;
      }
 diff --git a/src/main/java/net/minecraft/server/EnumDifficulty.java b/src/main/java/net/minecraft/server/EnumDifficulty.java
-index e0e72779c0..386eae71a1 100644
+index e0e72779c..386eae71a 100644
 --- a/src/main/java/net/minecraft/server/EnumDifficulty.java
 +++ b/src/main/java/net/minecraft/server/EnumDifficulty.java
 @@ -19,6 +19,7 @@ public enum EnumDifficulty {
@@ -37,7 +37,7 @@ index e0e72779c0..386eae71a1 100644
          return this.f;
      }
 diff --git a/src/main/java/net/minecraft/server/IBlockLightAccess.java b/src/main/java/net/minecraft/server/IBlockLightAccess.java
-index 03a89301f2..fa5eb188da 100644
+index 03a89301f..fa5eb188d 100644
 --- a/src/main/java/net/minecraft/server/IBlockLightAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockLightAccess.java
 @@ -12,6 +12,7 @@ public interface IBlockLightAccess extends IBlockAccess {
@@ -49,7 +49,7 @@ index 03a89301f2..fa5eb188da 100644
          return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.K();
      }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 4e3f01bc79..ac1ea2f0c1 100644
+index 4e3f01bc7..ac1ea2f0c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -1,85 +1,99 @@
@@ -221,7 +221,7 @@ index 4e3f01bc79..ac1ea2f0c1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index beaea041dc..ce8834980f 100644
+index beaea041d..ce8834980 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -386,6 +386,7 @@ public final class SpawnerCreature {
@@ -233,7 +233,7 @@ index beaea041dc..ce8834980f 100644
          return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ab8fad689a..baa8d23a92 100644
+index ab8fad689..baa8d23a9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -245,7 +245,7 @@ index ab8fad689a..baa8d23a92 100644
      public int c() {
          return this.d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 32a233ceb5..01bc1a020d 100644
+index 32a233ceb..01bc1a020 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -339,10 +339,34 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0092-Implement-bed-explosion-options.patch b/patches/server/0091-Implement-bed-explosion-options.patch
similarity index 97%
rename from patches/server/0092-Implement-bed-explosion-options.patch
rename to patches/server/0091-Implement-bed-explosion-options.patch
index 293dd8662..13259ec78 100644
--- a/patches/server/0092-Implement-bed-explosion-options.patch
+++ b/patches/server/0091-Implement-bed-explosion-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement bed explosion options
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index d28c1a67ec..c37225202f 100644
+index 24a5c64b6..738535d01 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -88,7 +88,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -18,7 +18,7 @@ index d28c1a67ec..c37225202f 100644
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 43342fcc60..f69f38afdf 100644
+index 01bc1a020..2d11dd656 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2,6 +2,7 @@ package net.pl3x.purpur;
diff --git a/patches/server/0093-Implement-respawn-anchor-explosion-options.patch b/patches/server/0092-Implement-respawn-anchor-explosion-options.patch
similarity index 98%
rename from patches/server/0093-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0092-Implement-respawn-anchor-explosion-options.patch
index 20b465878..e51d2b166 100644
--- a/patches/server/0093-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0092-Implement-respawn-anchor-explosion-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement respawn anchor explosion options
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
-index 21c5ad83a9..521d161a3d 100644
+index 21c5ad83a..521d161a3 100644
 --- a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
 +++ b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java
 @@ -83,10 +83,7 @@ public class BlockRespawnAnchor extends Block {
@@ -30,7 +30,7 @@ index 21c5ad83a9..521d161a3d 100644
  
      public static boolean a(World world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f69f38afdf..294d8d6711 100644
+index 2d11dd656..5a4642f1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -244,6 +244,22 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0094-Add-allow-water-in-end-world-option.patch b/patches/server/0093-Add-allow-water-in-end-world-option.patch
similarity index 97%
rename from patches/server/0094-Add-allow-water-in-end-world-option.patch
rename to patches/server/0093-Add-allow-water-in-end-world-option.patch
index aaec927a7..4ff79110b 100644
--- a/patches/server/0094-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0093-Add-allow-water-in-end-world-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add allow water in end world option
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java
-index aba5c6b871..b75f6ded5d 100644
+index aba5c6b87..b75f6ded5 100644
 --- a/src/main/java/net/minecraft/server/BlockIce.java
 +++ b/src/main/java/net/minecraft/server/BlockIce.java
 @@ -13,7 +13,7 @@ public class BlockIce extends BlockHalfTransparent {
@@ -27,7 +27,7 @@ index aba5c6b871..b75f6ded5d 100644
          } else {
              world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData());
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 120bf8436f..848a185c04 100644
+index 120bf8436..848a185c0 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -122,7 +122,7 @@ public class ItemBucket extends Item {
@@ -49,7 +49,7 @@ index 120bf8436f..848a185c04 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index baa8d23a92..10a2d2a20c 100644
+index baa8d23a9..10a2d2a20 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1639,4 +1639,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -68,7 +68,7 @@ index baa8d23a92..10a2d2a20c 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 10fdbf4967..9d5246de95 100644
+index 10fdbf496..9d5246de9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@
diff --git a/patches/server/0095-Allow-color-codes-in-books.patch b/patches/server/0094-Allow-color-codes-in-books.patch
similarity index 98%
rename from patches/server/0095-Allow-color-codes-in-books.patch
rename to patches/server/0094-Allow-color-codes-in-books.patch
index 26b925c25..43c96ab36 100644
--- a/patches/server/0095-Allow-color-codes-in-books.patch
+++ b/patches/server/0094-Allow-color-codes-in-books.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1c98fb0c72..48a9ce8317 100644
+index 11ad2830f..b1b04ce85 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1004,7 +1004,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0096-Entity-lifespan.patch b/patches/server/0095-Entity-lifespan.patch
similarity index 97%
rename from patches/server/0096-Entity-lifespan.patch
rename to patches/server/0095-Entity-lifespan.patch
index e6e6ddcbb..cf8de7070 100644
--- a/patches/server/0096-Entity-lifespan.patch
+++ b/patches/server/0095-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 202ccf2a7f..2fcd7f461a 100644
+index 202ccf2a7..2fcd7f461 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -92,7 +92,7 @@ index 202ccf2a7f..2fcd7f461a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 48a9ce8317..6979590187 100644
+index b1b04ce85..9110a57cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2215,6 +2215,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -104,7 +104,7 @@ index 48a9ce8317..6979590187 100644
                          event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
                      } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5a4642f1cd..77bb46f911 100644
+index 5a4642f1c..77bb46f91 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,6 +103,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0096-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 96%
rename from patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0096-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 5ad56dc06..f28fa4f71 100644
--- a/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0096-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 45a2979380..ca70050ce0 100644
+index 07da2a4df..4847b52cb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -278,6 +278,13 @@ public abstract class EntityLiving extends Entity {
@@ -23,7 +23,7 @@ index 45a2979380..ca70050ce0 100644
                      }
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fca8ef39a9..92a2e907ca 100644
+index 77bb46f91..371addede 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -182,6 +182,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0098-Squid-EAR-immunity.patch b/patches/server/0097-Squid-EAR-immunity.patch
similarity index 95%
rename from patches/server/0098-Squid-EAR-immunity.patch
rename to patches/server/0097-Squid-EAR-immunity.patch
index 9299e1a58..26b1c4f42 100644
--- a/patches/server/0098-Squid-EAR-immunity.patch
+++ b/patches/server/0097-Squid-EAR-immunity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 371addede0..62b3d7ff0d 100644
+index 371addede..62b3d7ff0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -440,6 +440,11 @@ public class PurpurWorldConfig {
@@ -21,7 +21,7 @@ index 371addede0..62b3d7ff0d 100644
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerCanBeLeashed = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b47d6fa2de..ff0621e08a 100644
+index b47d6fa2d..ff0621e08 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -378,6 +378,7 @@ public class ActivationRange
diff --git a/patches/server/0099-Configurable-end-spike-seed.patch b/patches/server/0098-Configurable-end-spike-seed.patch
similarity index 97%
rename from patches/server/0099-Configurable-end-spike-seed.patch
rename to patches/server/0098-Configurable-end-spike-seed.patch
index 0e5da80f8..ded623eaf 100644
--- a/patches/server/0099-Configurable-end-spike-seed.patch
+++ b/patches/server/0098-Configurable-end-spike-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java
-index 00a1707209..5eb9b3d35e 100644
+index 00a170720..5eb9b3d35 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java
 @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator<WorldGenFeatureEndSpikeConfigu
@@ -25,7 +25,7 @@ index 00a1707209..5eb9b3d35e 100644
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9d5246de95..fa62987191 100644
+index 9d5246de9..fa6298719 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0100-Configurable-dungeon-seed.patch b/patches/server/0099-Configurable-dungeon-seed.patch
similarity index 97%
rename from patches/server/0100-Configurable-dungeon-seed.patch
rename to patches/server/0099-Configurable-dungeon-seed.patch
index 45144bf25..9787b7ed4 100644
--- a/patches/server/0100-Configurable-dungeon-seed.patch
+++ b/patches/server/0099-Configurable-dungeon-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable dungeon seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java
-index 07f7b69fef..6aa1626f38 100644
+index 07f7b69fe..6aa1626f3 100644
 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java
 +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java
 @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator<WorldGenFeatureEmptyConfigu
@@ -31,7 +31,7 @@ index 07f7b69fef..6aa1626f38 100644
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index fa62987191..60826d0d2d 100644
+index fa6298719..60826d0d2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,10 +141,13 @@ public class PurpurConfig {
diff --git a/patches/server/0101-Phantoms-burn-in-light.patch b/patches/server/0100-Phantoms-burn-in-light.patch
similarity index 98%
rename from patches/server/0101-Phantoms-burn-in-light.patch
rename to patches/server/0100-Phantoms-burn-in-light.patch
index 0a5c52be9..d31018102 100644
--- a/patches/server/0101-Phantoms-burn-in-light.patch
+++ b/patches/server/0100-Phantoms-burn-in-light.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 92704a0789..03c9a8d0c2 100644
+index dfce36368..bdfe073dc 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -13,6 +13,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index 92704a0789..03c9a8d0c2 100644
                  return false;
              } else {
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 4c379916d8..ea6b61c9b8 100644
+index 4c379916d..ea6b61c9b 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -173,7 +173,7 @@ public class Items {
@@ -70,7 +70,7 @@ index 4c379916d8..ea6b61c9b8 100644
      public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
      public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 62b3d7ff0d..3b8058890b 100644
+index 62b3d7ff0..3b8058890 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -395,6 +395,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0102-Configurable-villager-breeding.patch b/patches/server/0101-Configurable-villager-breeding.patch
similarity index 100%
rename from patches/server/0102-Configurable-villager-breeding.patch
rename to patches/server/0101-Configurable-villager-breeding.patch
diff --git a/patches/server/0103-Redstone-deactivates-spawners.patch b/patches/server/0102-Redstone-deactivates-spawners.patch
similarity index 96%
rename from patches/server/0103-Redstone-deactivates-spawners.patch
rename to patches/server/0102-Redstone-deactivates-spawners.patch
index 267f83372..524e717ce 100644
--- a/patches/server/0103-Redstone-deactivates-spawners.patch
+++ b/patches/server/0102-Redstone-deactivates-spawners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone deactivates spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c2e830db7a..3b4cc9871c 100644
+index c2e830db7..3b4cc9871 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -51,6 +51,7 @@ public abstract class MobSpawnerAbstract {
@@ -26,7 +26,7 @@ index c2e830db7a..3b4cc9871c 100644
      public abstract BlockPosition b();
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ce7b2b7ab9..1b5e14de89 100644
+index ce7b2b7ab..1b5e14de8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -277,6 +277,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0104-Totems-work-in-inventory.patch b/patches/server/0103-Totems-work-in-inventory.patch
similarity index 96%
rename from patches/server/0104-Totems-work-in-inventory.patch
rename to patches/server/0103-Totems-work-in-inventory.patch
index 4ba0a8785..f062eaa74 100644
--- a/patches/server/0104-Totems-work-in-inventory.patch
+++ b/patches/server/0103-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ca70050ce0..a2d50a1fef 100644
+index 4847b52cb..1e47a741c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1325,6 +1325,19 @@ public abstract class EntityLiving extends Entity {
@@ -29,7 +29,7 @@ index ca70050ce0..a2d50a1fef 100644
              event.setCancelled(itemstack == null);
              this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4c1e8559d9..6aab11afa2 100644
+index 1b5e14de8..5db43c331 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -187,6 +187,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0105-Fix-death-message-colors.patch b/patches/server/0104-Fix-death-message-colors.patch
similarity index 98%
rename from patches/server/0105-Fix-death-message-colors.patch
rename to patches/server/0104-Fix-death-message-colors.patch
index f46968fc8..ef04d8846 100644
--- a/patches/server/0105-Fix-death-message-colors.patch
+++ b/patches/server/0104-Fix-death-message-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f6d30a243b..faa59d3315 100644
+index a761bfea4..6a2f9d831 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -670,7 +670,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0105-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
similarity index 98%
rename from patches/server/0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
rename to patches/server/0105-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
index 687fe69bf..3d9ab4080 100644
--- a/patches/server/0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
+++ b/patches/server/0105-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6979590187..9d6ef83ef5 100644
+index 9110a57cc..a1eaf7bcb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1974,7 +1974,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0107-Populator-seed-controls.patch b/patches/server/0106-Populator-seed-controls.patch
similarity index 97%
rename from patches/server/0107-Populator-seed-controls.patch
rename to patches/server/0106-Populator-seed-controls.patch
index c07c1c79f..d54cc6517 100644
--- a/patches/server/0107-Populator-seed-controls.patch
+++ b/patches/server/0106-Populator-seed-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Populator seed controls
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index dae2e5d707..55b67f1057 100644
+index dae2e5d70..55b67f105 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -293,7 +293,7 @@ public class TimingsExport extends Thread {
@@ -18,7 +18,7 @@ index dae2e5d707..55b67f1057 100644
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 285534d2c9..0b6cbeeae9 100644
+index 048139d13..51a2ec468 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -1,5 +1,6 @@
@@ -50,7 +50,7 @@ index 285534d2c9..0b6cbeeae9 100644
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0854ac9ef5..df6874c1cf 100644
+index 0854ac9ef..df6874c1c 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -189,6 +189,10 @@ public final class BiomeBase {
diff --git a/patches/server/0108-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0107-Add-vindicator-johnny-spawn-chance.patch
similarity index 96%
rename from patches/server/0108-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0107-Add-vindicator-johnny-spawn-chance.patch
index 42fdd2845..59f29dcfe 100644
--- a/patches/server/0108-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0107-Add-vindicator-johnny-spawn-chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add vindicator johnny spawn chance
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index fd34d88c0b..a945a0a073 100644
+index c0d26aa9d..8f812aa91 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -81,6 +81,12 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -22,7 +22,7 @@ index fd34d88c0b..a945a0a073 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 751a937d04..bc3c96229f 100644
+index 5db43c331..0330ad619 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -40,6 +40,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0109-DragonEggPlaceEvent.patch b/patches/server/0108-DragonEggPlaceEvent.patch
similarity index 97%
rename from patches/server/0109-DragonEggPlaceEvent.patch
rename to patches/server/0108-DragonEggPlaceEvent.patch
index 035111e22..043d7e233 100644
--- a/patches/server/0109-DragonEggPlaceEvent.patch
+++ b/patches/server/0108-DragonEggPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 4f3f7cb421..f29edc4108 100644
+index f853f6c42..5199cba87 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -359,7 +359,13 @@ public class EnderDragonBattle {
diff --git a/patches/server/0110-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0109-Add-option-to-disable-mushroom-block-updates.patch
similarity index 99%
rename from patches/server/0110-Add-option-to-disable-mushroom-block-updates.patch
rename to patches/server/0109-Add-option-to-disable-mushroom-block-updates.patch
index 7e904a12b..6dd7bc23f 100644
--- a/patches/server/0110-Add-option-to-disable-mushroom-block-updates.patch
+++ b/patches/server/0109-Add-option-to-disable-mushroom-block-updates.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable mushroom block updates
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockHugeMushroom.java b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
-index e8f340b9f2..3490af6fe0 100644
+index e8f340b9f..3490af6fe 100644
 --- a/src/main/java/net/minecraft/server/BlockHugeMushroom.java
 +++ b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
 @@ -14,30 +14,57 @@ public class BlockHugeMushroom extends Block {
@@ -73,7 +73,7 @@ index e8f340b9f2..3490af6fe0 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 60826d0d2d..bef1379357 100644
+index 60826d0d2..bef137935 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -205,6 +205,11 @@ public class PurpurConfig {
diff --git a/patches/server/0111-Dispensers-place-anvils-option.patch b/patches/server/0110-Dispensers-place-anvils-option.patch
similarity index 97%
rename from patches/server/0111-Dispensers-place-anvils-option.patch
rename to patches/server/0110-Dispensers-place-anvils-option.patch
index 5dd50bb6b..44ec5bda5 100644
--- a/patches/server/0111-Dispensers-place-anvils-option.patch
+++ b/patches/server/0110-Dispensers-place-anvils-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 36aafc3b71..d439390777 100644
+index 36aafc3b7..d43939077 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -102,6 +102,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index 36aafc3b71..d439390777 100644
          return this.k;
      }
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 7b8a470d97..d1f9d2884d 100644
+index 7b8a470d9..d1f9d2884 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -915,6 +915,23 @@ public interface IDispenseBehavior {
@@ -61,7 +61,7 @@ index 7b8a470d97..d1f9d2884d 100644
  
      static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d2ed99e900..bdcb8d52d8 100644
+index 0330ad619..5fa74566f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -244,8 +244,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0112-Allow-anvil-colors.patch b/patches/server/0111-Allow-anvil-colors.patch
similarity index 97%
rename from patches/server/0112-Allow-anvil-colors.patch
rename to patches/server/0111-Allow-anvil-colors.patch
index dc765a50c..24bcae5c9 100644
--- a/patches/server/0112-Allow-anvil-colors.patch
+++ b/patches/server/0111-Allow-anvil-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 4aa6b035a6..5e4e59e5c8 100644
+index 4aa6b035a..5e4e59e5c 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -251,6 +251,25 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
@@ -35,7 +35,7 @@ index 4aa6b035a6..5e4e59e5c8 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bdcb8d52d8..4d54378aa5 100644
+index 5fa74566f..21b8e004c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -220,6 +220,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0113-Add-no-tick-block-list.patch b/patches/server/0112-Add-no-tick-block-list.patch
similarity index 97%
rename from patches/server/0113-Add-no-tick-block-list.patch
rename to patches/server/0112-Add-no-tick-block-list.patch
index fa655d692..c2b175ee0 100644
--- a/patches/server/0113-Add-no-tick-block-list.patch
+++ b/patches/server/0112-Add-no-tick-block-list.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-tick block list
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 2760b377d1..334b5e806b 100644
+index 2760b377d..334b5e806 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -576,10 +576,12 @@ public abstract class BlockBase {
@@ -22,7 +22,7 @@ index 2760b377d1..334b5e806b 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0b3a605a2f..51a25349c6 100644
+index 0b3a605a2..51a25349c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -313,14 +313,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -43,7 +43,7 @@ index 0b3a605a2f..51a25349c6 100644
              this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
                  return fluidtype == null || fluidtype == FluidTypes.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 21b8e004cd..f9df4c5aa3 100644
+index 21b8e004c..f9df4c5aa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;
diff --git a/patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0113-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 95%
rename from patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0113-Add-option-to-disable-dolphin-treasure-searching.patch
index 40b75c576..076cbdd3b 100644
--- a/patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0113-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 2916ee89ef..664f969336 100644
+index 2916ee89e..664f96933 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -329,6 +329,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -17,7 +17,7 @@ index 2916ee89ef..664f969336 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f9df4c5aa3..8496be8704 100644
+index f9df4c5aa..8496be870 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -346,6 +346,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch b/patches/server/0114-Add-option-to-reset-reputation-when-villager-is-cure.patch
similarity index 100%
rename from patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch
rename to patches/server/0114-Add-option-to-reset-reputation-when-villager-is-cure.patch
diff --git a/patches/server/0116-Short-enderman-height.patch b/patches/server/0115-Short-enderman-height.patch
similarity index 97%
rename from patches/server/0116-Short-enderman-height.patch
rename to patches/server/0115-Short-enderman-height.patch
index 7416f2cdf..b852c8c2e 100644
--- a/patches/server/0116-Short-enderman-height.patch
+++ b/patches/server/0115-Short-enderman-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index b45a75a451..fde60d6c89 100644
+index 7b175240e..e33640326 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -321,6 +321,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -17,7 +17,7 @@ index b45a75a451..fde60d6c89 100644
              if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index b089c8a3f1..7e55134410 100644
+index cb26017ff..49bb97f0b 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -34,7 +34,7 @@ public class EntityTypes<T extends Entity> {
@@ -30,7 +30,7 @@ index b089c8a3f1..7e55134410 100644
      public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
      public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bef1379357..8714d1574d 100644
+index bef137935..8714d1574 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -190,6 +190,11 @@ public class PurpurConfig {
diff --git a/patches/server/0117-Stop-squids-floating-on-top-of-water.patch b/patches/server/0116-Stop-squids-floating-on-top-of-water.patch
similarity index 95%
rename from patches/server/0117-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0116-Stop-squids-floating-on-top-of-water.patch
index 01d0c77cc..4d56d1ad5 100644
--- a/patches/server/0117-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0116-Stop-squids-floating-on-top-of-water.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b4b53f95d3..41dcd97f9c 100644
+index fb850c99c..ed7a66c03 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -3446,8 +3446,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -24,7 +24,7 @@ index b4b53f95d3..41dcd97f9c 100644
          int j = MathHelper.f(axisalignedbb.maxX);
          int k = MathHelper.floor(axisalignedbb.minY);
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index b21605a623..148e4b1587 100644
+index b21605a62..148e4b158 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -25,6 +25,14 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -43,7 +43,7 @@ index b21605a623..148e4b1587 100644
      protected void initPathfinder() {
          this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 806ef0bb48..6ee0a3179b 100644
+index 806ef0bb4..6ee0a3179 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -486,8 +486,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0118-Ridables.patch b/patches/server/0117-Ridables.patch
similarity index 98%
rename from patches/server/0118-Ridables.patch
rename to patches/server/0117-Ridables.patch
index a3e2b6422..9795ba3cc 100644
--- a/patches/server/0118-Ridables.patch
+++ b/patches/server/0117-Ridables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/server/AttributeDefaults.java b/src/main/java/net/minecraft/server/AttributeDefaults.java
-index 8f95a4e497..ab05b5e403 100644
+index 8f95a4e49..ab05b5e40 100644
 --- a/src/main/java/net/minecraft/server/AttributeDefaults.java
 +++ b/src/main/java/net/minecraft/server/AttributeDefaults.java
 @@ -9,7 +9,80 @@ import org.apache.logging.log4j.Logger;
@@ -91,7 +91,7 @@ index 8f95a4e497..ab05b5e403 100644
      public static AttributeProvider a(EntityTypes<? extends EntityLiving> entitytypes) {
          return (AttributeProvider) AttributeDefaults.b.get(entitytypes);
 diff --git a/src/main/java/net/minecraft/server/AttributeProvider.java b/src/main/java/net/minecraft/server/AttributeProvider.java
-index dd235a6fc4..ac902c614d 100644
+index dd235a6fc..ac902c614 100644
 --- a/src/main/java/net/minecraft/server/AttributeProvider.java
 +++ b/src/main/java/net/minecraft/server/AttributeProvider.java
 @@ -101,6 +101,7 @@ public class AttributeProvider {
@@ -103,7 +103,7 @@ index dd235a6fc4..ac902c614d 100644
              this.b = true;
              return new AttributeProvider(this.a);
 diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
-index e5bdddfc14..8200ba60b7 100644
+index e5bdddfc1..8200ba60b 100644
 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 @@ -1,6 +1,6 @@
@@ -124,7 +124,7 @@ index e5bdddfc14..8200ba60b7 100644
              this.d = false;
              this.a.aC = this.a(this.a.aC, this.h() + 20.0F, this.b);
 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
-index 8f9fb058c1..eaf4469468 100644
+index 8f9fb058c..eaf446946 100644
 --- a/src/main/java/net/minecraft/server/ControllerMove.java
 +++ b/src/main/java/net/minecraft/server/ControllerMove.java
 @@ -6,9 +6,9 @@ public class ControllerMove {
@@ -141,7 +141,7 @@ index 8f9fb058c1..eaf4469468 100644
  
      public ControllerMove(EntityInsentient entityinsentient) {
 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
-index bd0267ee4b..8b36ac2b09 100644
+index bd0267ee4..8b36ac2b0 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -56,6 +56,7 @@ public class DamageSource {
@@ -161,7 +161,7 @@ index bd0267ee4b..8b36ac2b09 100644
          this.B = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 41dcd97f9c..22009f8cdf 100644
+index ed7a66c03..4f16bfc7d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -327,7 +327,7 @@ index 41dcd97f9c..22009f8cdf 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 85371542e4..a031f8778c 100644
+index 85371542e..a031f8778 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -14,9 +14,48 @@ public class EntityBat extends EntityAmbient {
@@ -403,7 +403,7 @@ index 85371542e4..a031f8778c 100644
          BlockPosition blockposition = this.getChunkCoordinates();
          BlockPosition blockposition1 = blockposition.up();
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index f73641ddb3..d8354ec4d1 100644
+index f73641ddb..d8354ec4d 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -37,6 +37,7 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB
@@ -534,7 +534,7 @@ index f73641ddb3..d8354ec4d1 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 74082136b3..dcfad16e06 100644
+index 74082136b..dcfad16e0 100644
 --- a/src/main/java/net/minecraft/server/EntityBlaze.java
 +++ b/src/main/java/net/minecraft/server/EntityBlaze.java
 @@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster {
@@ -614,7 +614,7 @@ index 74082136b3..dcfad16e06 100644
          if (this.c <= 0) {
              this.c = 100;
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 57166a543a..05929d5c53 100644
+index 57166a543..05929d5c5 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal {
@@ -694,7 +694,7 @@ index 57166a543a..05929d5c53 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 776f3d25a6..2e1f2dec17 100644
+index 776f3d25a..2e1f2dec1 100644
 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
 +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
 @@ -8,6 +8,18 @@ public class EntityCaveSpider extends EntitySpider {
@@ -717,7 +717,7 @@ index 776f3d25a6..2e1f2dec17 100644
          return EntitySpider.eK().a(GenericAttributes.MAX_HEALTH, 12.0D);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 11a612fa39..a16ecd7edc 100644
+index 11a612fa3..a16ecd7ed 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -18,6 +18,16 @@ public class EntityChicken extends EntityAnimal {
@@ -754,7 +754,7 @@ index 11a612fa39..a16ecd7edc 100644
          } else {
              this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D));
 diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
-index 9a99af6e9c..039fae4c29 100644
+index 9a99af6e9..039fae4c2 100644
 --- a/src/main/java/net/minecraft/server/EntityCod.java
 +++ b/src/main/java/net/minecraft/server/EntityCod.java
 @@ -6,6 +6,18 @@ public class EntityCod extends EntityFishSchool {
@@ -777,7 +777,7 @@ index 9a99af6e9c..039fae4c29 100644
      protected ItemStack eK() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java
-index c1b1bd123e..26ff230ef7 100644
+index c1b1bd123..26ff230ef 100644
 --- a/src/main/java/net/minecraft/server/EntityComplexPart.java
 +++ b/src/main/java/net/minecraft/server/EntityComplexPart.java
 @@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity {
@@ -793,7 +793,7 @@ index c1b1bd123e..26ff230ef7 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index cfb009c811..1219b0aa9c 100644
+index cfb009c81..1219b0aa9 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -11,9 +11,22 @@ public class EntityCow extends EntityAnimal {
@@ -877,7 +877,7 @@ index cfb009c811..1219b0aa9c 100644
          this.world.addEntity(mooshroom);
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 2256b81624..d186f257fa 100644
+index 2256b8162..d186f257f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -18,12 +18,27 @@ public class EntityCreeper extends EntityMonster {
@@ -995,7 +995,7 @@ index 2256b81624..d186f257fa 100644
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index 664f969336..9d5d143a99 100644
+index 664f96933..9d5d143a9 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -17,6 +17,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -1128,7 +1128,7 @@ index 664f969336..9d5d143a99 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 1a10281692..125eab60f2 100644
+index 1a1028169..125eab60f 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -22,6 +22,16 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -1184,7 +1184,7 @@ index 1a10281692..125eab60f2 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d2fcd0bc16..fd1e966d1a 100644
+index d2fcd0bc1..fd1e966d1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -1334,7 +1334,7 @@ index d2fcd0bc16..fd1e966d1a 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index e336403266..995849212c 100644
+index e33640326..995849212 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -30,9 +30,22 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -1402,7 +1402,7 @@ index e336403266..995849212c 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index fcebf36312..7eef7f523a 100644
+index fcebf3631..7eef7f523 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -12,14 +12,28 @@ public class EntityEndermite extends EntityMonster {
@@ -1436,7 +1436,7 @@ index fcebf36312..7eef7f523a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index f40fbef32f..c75dc75611 100644
+index f40fbef32..c75dc7561 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -12,10 +12,23 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1496,7 +1496,7 @@ index f40fbef32f..c75dc75611 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index 9b84564401..668f9d61b7 100644
+index 9b8456440..668f9d61b 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -70,13 +70,12 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1558,7 +1558,7 @@ index 9b84564401..668f9d61b7 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFishSchool.java b/src/main/java/net/minecraft/server/EntityFishSchool.java
-index 08372b7226..6a8e15f016 100644
+index 08372b722..6a8e15f01 100644
 --- a/src/main/java/net/minecraft/server/EntityFishSchool.java
 +++ b/src/main/java/net/minecraft/server/EntityFishSchool.java
 @@ -16,7 +16,7 @@ public abstract class EntityFishSchool extends EntityFish {
@@ -1571,7 +1571,7 @@ index 08372b7226..6a8e15f016 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 8845afd83d..f5defe4713 100644
+index 8845afd83..f5defe471 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -55,6 +55,39 @@ public class EntityFox extends EntityAnimal {
@@ -1695,7 +1695,7 @@ index 8845afd83d..f5defe4713 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
-index a67611c4f9..216506a7b1 100644
+index a67611c4f..216506a7b 100644
 --- a/src/main/java/net/minecraft/server/EntityGhast.java
 +++ b/src/main/java/net/minecraft/server/EntityGhast.java
 @@ -14,11 +14,42 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -1769,7 +1769,7 @@ index a67611c4f9..216506a7b1 100644
                  if (this.j-- <= 0) {
                      this.j += this.i.getRandom().nextInt(5) + 2;
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index 8dce2aad77..2c0a696b8d 100644
+index 8dce2aad7..2c0a696b8 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -11,16 +11,28 @@ public class EntityGiantZombie extends EntityMonster {
@@ -1802,7 +1802,7 @@ index 8dce2aad77..2c0a696b8d 100644
                  this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
                  this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
-index 27ec46c0b2..0a7f51a2a1 100644
+index 27ec46c0b..0a7f51a2a 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardian.java
 @@ -24,15 +24,36 @@ public class EntityGuardian extends EntityMonster {
@@ -1898,7 +1898,7 @@ index 27ec46c0b2..0a7f51a2a1 100644
                  Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ());
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
-index b691e84495..f6f8827469 100644
+index b691e8449..f6f882746 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java
 @@ -16,6 +16,18 @@ public class EntityGuardianElder extends EntityGuardian {
@@ -1921,7 +1921,7 @@ index b691e84495..f6f8827469 100644
          return EntityGuardian.eM().a(GenericAttributes.MOVEMENT_SPEED, 0.30000001192092896D).a(GenericAttributes.ATTACK_DAMAGE, 8.0D).a(GenericAttributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java
-index f679792536..548ff4449f 100644
+index f67979253..548ff4449 100644
 --- a/src/main/java/net/minecraft/server/EntityHoglin.java
 +++ b/src/main/java/net/minecraft/server/EntityHoglin.java
 @@ -13,13 +13,25 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin {
@@ -1978,7 +1978,7 @@ index f679792536..548ff4449f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index e0e60bb6d8..0415a4d1f3 100644
+index e0e60bb6d..0415a4d1f 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -12,6 +12,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -1996,7 +1996,7 @@ index e0e60bb6d8..0415a4d1f3 100644
      protected void eK() {
          this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue((double) this.fp());
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 573d4a5c78..4b41a58833 100644
+index 573d4a5c7..4b41a5883 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -39,12 +39,27 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2036,7 +2036,7 @@ index 573d4a5c78..4b41a58833 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 767d18d5a0..cb8aee5691 100644
+index 767d18d5a..cb8aee569 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -8,6 +8,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -2054,7 +2054,7 @@ index 767d18d5a0..cb8aee5691 100644
      protected SoundEffect getSoundAmbient() {
          super.getSoundAmbient();
 diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
-index 3dd4d4f0f3..243aeb736e 100644
+index 3dd4d4f0f..243aeb736 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
 @@ -8,6 +8,12 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -2071,7 +2071,7 @@ index 3dd4d4f0f3..243aeb736e 100644
      protected SoundEffect getSoundAmbient() {
          super.getSoundAmbient();
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index a53d335f3a..e2c6a5807a 100644
+index a53d335f3..e2c6a5807 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -2112,7 +2112,7 @@ index a53d335f3a..e2c6a5807a 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 0e98173607..559ba50977 100644
+index 0e9817360..559ba5097 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -2142,7 +2142,7 @@ index 0e98173607..559ba50977 100644
 +    protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 75f9874115..deb6c93426 100644
+index 75f987411..deb6c9342 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2148,4 +2148,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2162,7 +2162,7 @@ index 75f9874115..deb6c93426 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index b6c6b4d54e..f5b6d83f87 100644
+index b6c6b4d54..f5b6d83f8 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -20,6 +20,16 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -2199,7 +2199,7 @@ index b6c6b4d54e..f5b6d83f87 100644
          this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2fcd7f461a..6952832458 100644
+index 2fcd7f461..695283245 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2320,7 +2320,7 @@ index 2fcd7f461a..6952832458 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index bdff236883..9ee03b233b 100644
+index bdff23688..9ee03b233 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -22,9 +22,22 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable {
@@ -2371,7 +2371,7 @@ index bdff236883..9ee03b233b 100644
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1e47a741cf..c33909e20a 100644
+index 1e47a741c..c33909e20 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -466,7 +466,7 @@ public abstract class EntityLiving extends Entity {
@@ -2406,7 +2406,7 @@ index 1e47a741cf..c33909e20a 100644
          this.bu = f;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index e61f53816c..1099277868 100644
+index e61f53816..109927786 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -18,7 +18,46 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -2482,7 +2482,7 @@ index e61f53816c..1099277868 100644
  
          return i == -1 ? null : EnumColor.fromColorIndex(i);
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
-index 7d30e5c237..b6aae5cdee 100644
+index 7d30e5c23..b6aae5cde 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 @@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -2510,7 +2510,7 @@ index 7d30e5c237..b6aae5cdee 100644
      protected EntityLlama fz() {
          return (EntityLlama) EntityTypes.TRADER_LLAMA.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
-index 874dd39825..cd28463e2b 100644
+index 874dd3982..cd28463e2 100644
 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java
 +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java
 @@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime {
@@ -2552,7 +2552,7 @@ index 874dd39825..cd28463e2b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 38df17bd20..7966b34f8d 100644
+index 38df17bd2..7966b34f8 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -20,6 +20,18 @@ public class EntityMushroomCow extends EntityCow implements IShearable {
@@ -2593,7 +2593,7 @@ index 38df17bd20..7966b34f8d 100644
  
                  Pair<MobEffectList, Integer> pair = (Pair) optional.get();
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 7bd3fea6e0..2f8275cd6b 100644
+index 7bd3fea6e..2f8275cd6 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -16,6 +16,18 @@ public class EntityOcelot extends EntityAnimal {
@@ -2631,7 +2631,7 @@ index 7bd3fea6e0..2f8275cd6b 100644
          this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index b36cc95168..eafae5516b 100644
+index b36cc9516..eafae5516 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -46,6 +46,27 @@ public class EntityPanda extends EntityAnimal {
@@ -2767,7 +2767,7 @@ index b36cc95168..eafae5516b 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index f7b92078ea..66c1d666cd 100644
+index f7b92078e..66c1d666c 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -65,12 +65,58 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -2843,7 +2843,7 @@ index f7b92078ea..66c1d666cd 100644
          this.goalSelector.a(2, new PathfinderGoalSit(this));
          this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index bdfe073dcd..f8c3480045 100644
+index bdfe073dc..f8c348004 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -25,6 +25,58 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -3014,7 +3014,7 @@ index bdfe073dcd..f8c3480045 100644
                  EntityPhantom.this.yaw += 180.0F;
                  this.j = 0.1F;
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 7f52c39234..dade0bb294 100644
+index 7f52c3923..dade0bb29 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -19,9 +19,22 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -3041,7 +3041,7 @@ index 7f52c39234..dade0bb294 100644
          this.goalSelector.a(3, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(4, new PathfinderGoalTempt(this, 1.2D, RecipeItemStack.a(Items.CARROT_ON_A_STICK), false));
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 32b75f710b..3327dbbf87 100644
+index 32b75f710..3327dbbf8 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -22,6 +22,16 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -3062,7 +3062,7 @@ index 32b75f710b..3327dbbf87 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.zombifiedPiglinJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java
-index ca7f9dc54e..334e0f73e6 100644
+index ca7f9dc54..334e0f73e 100644
 --- a/src/main/java/net/minecraft/server/EntityPiglin.java
 +++ b/src/main/java/net/minecraft/server/EntityPiglin.java
 @@ -25,6 +25,18 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow {
@@ -3113,7 +3113,7 @@ index ca7f9dc54e..334e0f73e6 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPiglinBrute.java b/src/main/java/net/minecraft/server/EntityPiglinBrute.java
-index 3e9a4af09d..f6b1708111 100644
+index 3e9a4af09..f6b170811 100644
 --- a/src/main/java/net/minecraft/server/EntityPiglinBrute.java
 +++ b/src/main/java/net/minecraft/server/EntityPiglinBrute.java
 @@ -15,6 +15,18 @@ public class EntityPiglinBrute extends EntityPiglinAbstract {
@@ -3155,7 +3155,7 @@ index 3e9a4af09d..f6b1708111 100644
          PiglinBruteAI.b(this);
          PiglinBruteAI.c(this);
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index a3a428da99..cf7de01271 100644
+index a3a428da9..cf7de0127 100644
 --- a/src/main/java/net/minecraft/server/EntityPillager.java
 +++ b/src/main/java/net/minecraft/server/EntityPillager.java
 @@ -13,15 +13,29 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow {
@@ -3189,7 +3189,7 @@ index a3a428da99..cf7de01271 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6a2f9d831b..51736dfdee 100644
+index 6a2f9d831..51736dfde 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -505,6 +505,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -3209,7 +3209,7 @@ index 6a2f9d831b..51736dfdee 100644
  
      public void playerTick() {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 99f0bd8f82..3d649843f5 100644
+index 99f0bd8f8..3d649843f 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -18,12 +18,34 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
@@ -3284,7 +3284,7 @@ index 99f0bd8f82..3d649843f5 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
-index 330ec38d09..16a4df27c5 100644
+index 330ec38d0..16a4df27c 100644
 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java
 +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java
 @@ -17,6 +17,18 @@ public class EntityPufferFish extends EntityFish {
@@ -3316,7 +3316,7 @@ index 330ec38d09..16a4df27c5 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 25a9b7906b..b766a27e98 100644
+index 25a9b7906..b766a27e9 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -20,6 +20,18 @@ public class EntityRabbit extends EntityAnimal {
@@ -3481,7 +3481,7 @@ index 25a9b7906b..b766a27e98 100644
              this.d = flag;
          }
 diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
-index fd1ac7df68..a902145881 100644
+index fd1ac7df6..a90214588 100644
 --- a/src/main/java/net/minecraft/server/EntityRavager.java
 +++ b/src/main/java/net/minecraft/server/EntityRavager.java
 @@ -20,14 +20,37 @@ public class EntityRavager extends EntityRaider {
@@ -3532,7 +3532,7 @@ index fd1ac7df68..a902145881 100644
                  this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.0D);
              } else {
 diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
-index 51ec634133..6dfcee2c9b 100644
+index 51ec63413..6dfcee2c9 100644
 --- a/src/main/java/net/minecraft/server/EntitySalmon.java
 +++ b/src/main/java/net/minecraft/server/EntitySalmon.java
 @@ -6,6 +6,18 @@ public class EntitySalmon extends EntityFishSchool {
@@ -3555,7 +3555,7 @@ index 51ec634133..6dfcee2c9b 100644
      public int eN() {
          return 5;
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index 2908e9cc47..a151d4295c 100644
+index 2908e9cc4..a151d4295 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -56,10 +56,23 @@ public class EntitySheep extends EntityAnimal implements IShearable {
@@ -3583,7 +3583,7 @@ index 2908e9cc47..a151d4295c 100644
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false));
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 7bedaf02c4..30e0e14162 100644
+index 7bedaf02c..30e0e1416 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -29,12 +29,26 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -3623,7 +3623,7 @@ index 7bedaf02c4..30e0e14162 100644
          @Override
          public boolean a() {
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 28b490cc14..ad428e0900 100644
+index 28b490cc1..ad428e090 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -11,13 +11,27 @@ public class EntitySilverfish extends EntityMonster {
@@ -3663,7 +3663,7 @@ index 28b490cc14..ad428e0900 100644
  
          public void g() {
 diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
-index 7c39bec831..3f130e03bf 100644
+index 7c39bec83..3f130e03b 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
 @@ -6,6 +6,18 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -3686,7 +3686,7 @@ index 7c39bec831..3f130e03bf 100644
      protected SoundEffect getSoundAmbient() {
          return SoundEffects.ENTITY_SKELETON_AMBIENT;
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index ced89af70c..4d5af11734 100644
+index ced89af70..4d5af1173 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -3705,7 +3705,7 @@ index ced89af70c..4d5af11734 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
-index f985caada0..d123fb82b6 100644
+index f985caada..d123fb82b 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 @@ -8,6 +8,18 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -3728,7 +3728,7 @@ index f985caada0..d123fb82b6 100644
          return b(entitytypes, worldaccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || worldaccess.e(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index c872be77a6..96cb080d94 100644
+index c872be77a..96cb080d9 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -9,6 +9,18 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -3751,7 +3751,7 @@ index c872be77a6..96cb080d94 100644
      protected void initPathfinder() {
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityPiglinAbstract.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index e99fd88118..4602636298 100644
+index e99fd8811..460263629 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -34,12 +34,45 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -3867,7 +3867,7 @@ index e99fd88118..4602636298 100644
  
              }
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 95ee716fc9..e980da14cf 100644
+index 95ee716fc..e980da14c 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -14,12 +14,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -3924,7 +3924,7 @@ index 95ee716fc9..e980da14cf 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index bf68efd52f..92d7413787 100644
+index bf68efd52..92d741378 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -11,14 +11,28 @@ public class EntitySpider extends EntityMonster {
@@ -3957,7 +3957,7 @@ index bf68efd52f..92d7413787 100644
          this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class));
          this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class));
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 148e4b1587..70b952f10a 100644
+index 148e4b158..70b952f10 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -26,17 +26,38 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -4057,7 +4057,7 @@ index 148e4b1587..70b952f10a 100644
  
              if (i > 100) {
 diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java
-index 6d4c6a8f1c..172867f50d 100644
+index 6d4c6a8f1..172867f50 100644
 --- a/src/main/java/net/minecraft/server/EntityStrider.java
 +++ b/src/main/java/net/minecraft/server/EntityStrider.java
 @@ -28,6 +28,18 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab
@@ -4097,7 +4097,7 @@ index 6d4c6a8f1c..172867f50d 100644
                  if (flag && !this.isSilent()) {
                      this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_STRIDER_EAT, this.getSoundCategory(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 9e008d56bb..8f227678dc 100644
+index 9e008d56b..8f227678d 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -130,6 +130,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -4109,7 +4109,7 @@ index 9e008d56bb..8f227678dc 100644
          return entityliving == this.getOwner();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java
-index 495c28ccb8..2c9df356e6 100644
+index 495c28ccb..2c9df356e 100644
 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java
 +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java
 @@ -19,6 +19,18 @@ public class EntityTropicalFish extends EntityFishSchool {
@@ -4132,7 +4132,7 @@ index 495c28ccb8..2c9df356e6 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 4ad393bc99..2b34e6cf3b 100644
+index 4ad393bc9..2b34e6cf3 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,6 +27,18 @@ public class EntityTurtle extends EntityAnimal {
@@ -4214,7 +4214,7 @@ index 4ad393bc99..2b34e6cf3b 100644
              if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
                  double d0 = this.b - this.i.locX();
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index ed6a47ad2f..ac75ed3e2e 100644
+index ed6a47ad2..ac75ed3e2 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -19,6 +19,45 @@ public class EntityVex extends EntityMonster {
@@ -4311,7 +4311,7 @@ index ed6a47ad2f..ac75ed3e2e 100644
                  Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ());
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a95bf56823..cead15b075 100644
+index 5dd9e3bb2..823155821 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -4355,7 +4355,7 @@ index a95bf56823..cead15b075 100644
                          this.h(entityhuman);
                      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 96dda6a14f..3ea66955df 100644
+index 96dda6a14..3ea66955d 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -23,6 +23,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -4395,7 +4395,7 @@ index 96dda6a14f..3ea66955df 100644
                      this.setTradingPlayer(entityhuman);
                      this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 8f812aa913..9950bda50f 100644
+index 8f812aa91..9950bda50 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -17,14 +17,28 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -4428,7 +4428,7 @@ index 8f812aa913..9950bda50f 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ca3c5150bc..323d79a994 100644
+index ca3c5150b..323d79a99 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -24,6 +24,18 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -4464,7 +4464,7 @@ index ca3c5150bc..323d79a994 100644
          this.targetSelector.a(2, this.br);
          this.targetSelector.a(3, this.bs);
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 53482a420c..f68cf834aa 100644
+index 53482a420..f68cf834a 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4672,7 +4672,7 @@ index 53482a420c..f68cf834aa 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index dcbb34313f..9ae7168595 100644
+index dcbb34313..9ae716859 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -33,9 +33,27 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -4712,7 +4712,7 @@ index dcbb34313f..9ae7168595 100644
          this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this));
          this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityZoglin.java b/src/main/java/net/minecraft/server/EntityZoglin.java
-index e76e6ebde7..d92fe8013f 100644
+index e76e6ebde..d92fe8013 100644
 --- a/src/main/java/net/minecraft/server/EntityZoglin.java
 +++ b/src/main/java/net/minecraft/server/EntityZoglin.java
 @@ -21,6 +21,18 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin {
@@ -4776,7 +4776,7 @@ index e76e6ebde7..d92fe8013f 100644
          this.eL();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index b90ea31440..e2f68d843c 100644
+index b90ea3144..e2f68d843 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster {
@@ -4809,7 +4809,7 @@ index b90ea31440..e2f68d843c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index ce6d797801..02b0ae550a 100644
+index ce6d79780..02b0ae550 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -9,6 +9,16 @@ public class EntityZombieHusk extends EntityZombie {
@@ -4830,7 +4830,7 @@ index ce6d797801..02b0ae550a 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.huskJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index b86816205c..7db942c659 100644
+index b86816205..7db942c65 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -29,6 +29,16 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -4851,7 +4851,7 @@ index b86816205c..7db942c659 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.zombieVillagerJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
-index cbc0b8bc85..89d64ea0d1 100644
+index cbc0b8bc8..89d64ea0d 100644
 --- a/src/main/java/net/minecraft/server/GeneratorAccess.java
 +++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
 @@ -37,6 +37,7 @@ public interface GeneratorAccess extends ICombinedAccess, IWorldTime {
@@ -4863,7 +4863,7 @@ index cbc0b8bc85..89d64ea0d1 100644
  
      default int getHeight() {
 diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
-index 0bac6b0506..9a17eb6066 100644
+index 0bac6b050..9a17eb606 100644
 --- a/src/main/java/net/minecraft/server/IProjectile.java
 +++ b/src/main/java/net/minecraft/server/IProjectile.java
 @@ -12,7 +12,7 @@ public abstract class IProjectile extends Entity {
@@ -4894,7 +4894,7 @@ index 0bac6b0506..9a17eb6066 100644
              // Paper start - Cancel hit for vanished players
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java b/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java
 new file mode 100644
-index 0000000000..da18e1235e
+index 000000000..da18e1235
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHasRider.java
 @@ -0,0 +1,18 @@
@@ -4918,7 +4918,7 @@ index 0000000000..da18e1235e
 +}
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java
 new file mode 100644
-index 0000000000..44929182df
+index 000000000..44929182d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseHasRider.java
 @@ -0,0 +1,16 @@
@@ -4939,7 +4939,7 @@ index 0000000000..44929182df
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9d6ef83ef5..d47902ac6c 100644
+index a1eaf7bcb..69a612b35 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2232,6 +2232,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4952,7 +4952,7 @@ index 9d6ef83ef5..d47902ac6c 100644
                      if ((entity instanceof EntityFish && origItem != null && origItem.getItem() == Items.WATER_BUCKET) && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) {
                          this.sendPacket(new PacketPlayOutSpawnEntityLiving((EntityFish) entity));
 diff --git a/src/main/java/net/minecraft/server/ProjectileHelper.java b/src/main/java/net/minecraft/server/ProjectileHelper.java
-index b2c64b3144..515ba50aec 100644
+index b2c64b314..515ba50ae 100644
 --- a/src/main/java/net/minecraft/server/ProjectileHelper.java
 +++ b/src/main/java/net/minecraft/server/ProjectileHelper.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -4964,7 +4964,7 @@ index b2c64b3144..515ba50aec 100644
          Vec3D vec3d = entity.getMot();
          World world = entity.world;
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index 5af554870b..c59305ef7d 100644
+index 5af554870..c59305ef7 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -39,6 +39,7 @@ public class Vec3D implements IPosition {
@@ -4992,7 +4992,7 @@ index 5af554870b..c59305ef7d 100644
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 10a2d2a20c..64824e708a 100644
+index 10a2d2a20..64824e708 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1648,5 +1648,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -5007,7 +5007,7 @@ index 10a2d2a20c..64824e708a 100644
      // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8714d1574d..af3739c79a 100644
+index 8714d1574..af3739c79 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -134,11 +134,13 @@ public class PurpurConfig {
@@ -5025,7 +5025,7 @@ index 8714d1574d..af3739c79a 100644
  
      public static int dungeonSeed = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6ee0a3179b..1a606b426b 100644
+index 6ee0a3179..1a606b426 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -5678,7 +5678,7 @@ index 6ee0a3179b..1a606b426b 100644
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 new file mode 100644
-index 0000000000..0b16a7b634
+index 000000000..0b16a7b63
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,76 @@
@@ -5760,7 +5760,7 @@ index 0000000000..0b16a7b634
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 new file mode 100644
-index 0000000000..426688b3a6
+index 000000000..426688b3a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,92 @@
@@ -5858,7 +5858,7 @@ index 0000000000..426688b3a6
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 new file mode 100644
-index 0000000000..33c51460ab
+index 000000000..33c51460a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 @@ -0,0 +1,61 @@
@@ -5925,7 +5925,7 @@ index 0000000000..33c51460ab
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 new file mode 100644
-index 0000000000..f753759361
+index 000000000..f75375936
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 @@ -0,0 +1,61 @@
@@ -5992,7 +5992,7 @@ index 0000000000..f753759361
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 new file mode 100644
-index 0000000000..1b08a0905b
+index 000000000..1b08a0905
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 @@ -0,0 +1,50 @@
@@ -6048,7 +6048,7 @@ index 0000000000..1b08a0905b
 +}
 diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java
 new file mode 100644
-index 0000000000..3b777c54f9
+index 000000000..3b777c54f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java
 @@ -0,0 +1,115 @@
@@ -6169,7 +6169,7 @@ index 0000000000..3b777c54f9
 +}
 diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java
 new file mode 100644
-index 0000000000..f5da00b100
+index 000000000..f5da00b10
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java
 @@ -0,0 +1,120 @@
@@ -6294,7 +6294,7 @@ index 0000000000..f5da00b100
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1fe253bc72..bf387664c2 100644
+index 1fe253bc7..bf387664c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1159,4 +1159,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -6325,7 +6325,7 @@ index 1fe253bc72..bf387664c2 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 90d8631ddd..8bb9449a69 100644
+index 90d8631dd..8bb9449a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -502,6 +502,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0118-Use-configured-height-for-nether-surface-builders.patch
similarity index 97%
rename from patches/server/0119-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0118-Use-configured-height-for-nether-surface-builders.patch
index e384c6093..3557fecd5 100644
--- a/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch
+++ b/patches/server/0118-Use-configured-height-for-nether-surface-builders.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
-index 462f0b2bae..f418a71ca8 100644
+index 462f0b2ba..f418a71ca 100644
 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
 +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
 @@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface<Worl
diff --git a/patches/server/0120-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0119-Crying-obsidian-valid-for-portal-frames.patch
similarity index 95%
rename from patches/server/0120-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0119-Crying-obsidian-valid-for-portal-frames.patch
index 8f4def821..9070a8c39 100644
--- a/patches/server/0120-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0119-Crying-obsidian-valid-for-portal-frames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Crying obsidian valid for portal frames
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 372ee6adce..4aa2b38f18 100644
+index 372ee6adc..4aa2b38f1 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -100,6 +100,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -17,7 +17,7 @@ index 372ee6adce..4aa2b38f18 100644
          return this == block;
      }
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 334b5e806b..0e16fba766 100644
+index 334b5e806..0e16fba76 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -646,6 +646,7 @@ public abstract class BlockBase {
@@ -29,7 +29,7 @@ index 334b5e806b..0e16fba766 100644
              return this.getBlock().a(block);
          }
 diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java
-index 6ef81aeb4c..9ea3c30b67 100644
+index 6ef81aeb4..9ea3c30b6 100644
 --- a/src/main/java/net/minecraft/server/BlockPortalShape.java
 +++ b/src/main/java/net/minecraft/server/BlockPortalShape.java
 @@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent;
@@ -42,7 +42,7 @@ index 6ef81aeb4c..9ea3c30b67 100644
      private final GeneratorAccess b;
      private final EnumDirection.EnumAxis c;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index af3739c79a..d33d24af65 100644
+index af3739c79..d33d24af6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -176,6 +176,7 @@ public class PurpurConfig {
diff --git a/patches/server/0121-Entities-can-use-portals-configuration.patch b/patches/server/0120-Entities-can-use-portals-configuration.patch
similarity index 97%
rename from patches/server/0121-Entities-can-use-portals-configuration.patch
rename to patches/server/0120-Entities-can-use-portals-configuration.patch
index b57969003..99bcf394e 100644
--- a/patches/server/0121-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0120-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 22009f8cdf..88f525f43b 100644
+index 4f16bfc7d..f65bb0276 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2419,7 +2419,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,7 +27,7 @@ index 22009f8cdf..88f525f43b 100644
  
      public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1a606b426b..f80f115690 100644
+index 1a606b426..f80f11569 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -140,6 +140,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0122-LivingEntity-broadcastItemBreak.patch b/patches/server/0121-LivingEntity-broadcastItemBreak.patch
similarity index 96%
rename from patches/server/0122-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0121-LivingEntity-broadcastItemBreak.patch
index b09180ec2..93d6c0466 100644
--- a/patches/server/0122-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0121-LivingEntity-broadcastItemBreak.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2fd4bc818a..9f765ecd7c 100644
+index 2fd4bc818..9f765ecd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -820,5 +820,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch b/patches/server/0122-Customizable-WitherBoss-Health-and-Healing.patch
similarity index 98%
rename from patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
rename to patches/server/0122-Customizable-WitherBoss-Health-and-Healing.patch
index 7aed2763c..eeeefcae0 100644
--- a/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
+++ b/patches/server/0122-Customizable-WitherBoss-Health-and-Healing.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Customizable WitherBoss Health and Healing
 Adds the ability to customize the health of the Wither Boss, as well as the amount that it heals, and how often in the PurpurWorldConfig.
 
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index f68cf834aa..4cac2bd091 100644
+index f68cf834a..4cac2bd09 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -145,6 +145,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -53,7 +53,7 @@ index f68cf834aa..4cac2bd091 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f80f115690..0d4d9ce345 100644
+index f80f11569..0d4d9ce34 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -906,10 +906,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0124-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0123-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 98%
rename from patches/server/0124-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0123-Allow-toggling-special-MobSpawners-per-world.patch
index ff3b1b8bc..407de5f5a 100644
--- a/patches/server/0124-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0123-Allow-toggling-special-MobSpawners-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
-index 502cb0ea40..f88c7b5480 100644
+index 502cb0ea4..f88c7b548 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
 @@ -122,7 +122,17 @@ public class MobSpawnerTrader implements MobSpawner {
@@ -29,7 +29,7 @@ index 502cb0ea40..f88c7b5480 100644
              if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 64824e708a..20ebdf7275 100644
+index 64824e708..20ebdf727 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -42,7 +42,7 @@ index 64824e708a..20ebdf7275 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 51a25349c6..32d0854749 100644
+index 51a25349c..32d085474 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -330,7 +330,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -72,7 +72,7 @@ index 51a25349c6..32d0854749 100644
          this.worldDataServer = (WorldDataServer) iworlddataserver;
          worldDataServer.world = this;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0d4d9ce345..3c91ab0a58 100644
+index 0d4d9ce34..3c91ab0a5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;
diff --git a/patches/server/0125-Raid-cooldown-setting.patch b/patches/server/0124-Raid-cooldown-setting.patch
similarity index 98%
rename from patches/server/0125-Raid-cooldown-setting.patch
rename to patches/server/0124-Raid-cooldown-setting.patch
index 82aafd29d..6bf4aa4de 100644
--- a/patches/server/0125-Raid-cooldown-setting.patch
+++ b/patches/server/0124-Raid-cooldown-setting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Raid cooldown setting
 
 
 diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java
-index 2193fecab4..515026198c 100644
+index 826dcf9f7..807910c60 100644
 --- a/src/main/java/net/minecraft/server/PersistentRaid.java
 +++ b/src/main/java/net/minecraft/server/PersistentRaid.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -52,7 +52,7 @@ index 2193fecab4..515026198c 100644
                      if (!this.raids.containsKey(raid.getId())) {
                          this.raids.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b360186b3a..9e03fd5d89 100644
+index 3c91ab0a5..5386affba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -157,6 +157,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0125-Despawn-rate-config-options-per-projectile-type.patch
similarity index 96%
rename from patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0125-Despawn-rate-config-options-per-projectile-type.patch
index 6d76d72bd..c723f78d2 100644
--- a/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0125-Despawn-rate-config-options-per-projectile-type.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
 Default values of -1 respect vanilla behaviour.
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 1e7f5957d8..7f89b269e3 100644
+index 1e7f5957d..7f89b269e 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -23,7 +23,7 @@ public abstract class EntityArrow extends IProjectile {
@@ -48,7 +48,7 @@ index 1e7f5957d8..7f89b269e3 100644
  
      private void A() {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 27032abad4..9d2d5be5ee 100644
+index 27032abad..9d2d5be5e 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -75,4 +75,11 @@ public class EntityDragonFireball extends EntityFireball {
@@ -64,7 +64,7 @@ index 27032abad4..9d2d5be5ee 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
-index edce89169b..4951abdfa1 100644
+index edce89169..4951abdfa 100644
 --- a/src/main/java/net/minecraft/server/EntityEgg.java
 +++ b/src/main/java/net/minecraft/server/EntityEgg.java
 @@ -87,4 +87,11 @@ public class EntityEgg extends EntityProjectileThrowable {
@@ -80,7 +80,7 @@ index edce89169b..4951abdfa1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 63b4a449b5..e8650c1bfa 100644
+index 63b4a449b..e8650c1bf 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -106,4 +106,11 @@ public class EntityEnderPearl extends EntityProjectileThrowable {
@@ -96,7 +96,7 @@ index 63b4a449b5..e8650c1bfa 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index a646dc9f03..9789d480ad 100644
+index a646dc9f0..9789d480a 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -298,4 +298,11 @@ public class EntityFireworks extends IProjectile {
@@ -112,7 +112,7 @@ index a646dc9f03..9789d480ad 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 519df0002b..6891e61bcf 100644
+index 519df0002..6891e61bc 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -576,4 +576,11 @@ public class EntityFishingHook extends IProjectile {
@@ -128,7 +128,7 @@ index 519df0002b..6891e61bcf 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java
-index b4b0dfbc70..d12de20cf4 100644
+index b4b0dfbc7..d12de20cf 100644
 --- a/src/main/java/net/minecraft/server/EntityLargeFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java
 @@ -66,4 +66,11 @@ public class EntityLargeFireball extends EntityFireballFireball {
@@ -144,7 +144,7 @@ index b4b0dfbc70..d12de20cf4 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
-index 7636a51a7e..3e6438c977 100644
+index 7636a51a7..3e6438c97 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 @@ -71,4 +71,11 @@ public class EntityLlamaSpit extends IProjectile {
@@ -160,7 +160,7 @@ index 7636a51a7e..3e6438c977 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
-index d57da221c1..6d4b1e58df 100644
+index d57da221c..6d4b1e58d 100644
 --- a/src/main/java/net/minecraft/server/EntityPotion.java
 +++ b/src/main/java/net/minecraft/server/EntityPotion.java
 @@ -240,4 +240,11 @@ public class EntityPotion extends EntityProjectileThrowable {
@@ -176,7 +176,7 @@ index d57da221c1..6d4b1e58df 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityShulkerBullet.java b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
-index 23017b5486..0b16473aed 100644
+index 23017b548..0b16473ae 100644
 --- a/src/main/java/net/minecraft/server/EntityShulkerBullet.java
 +++ b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
 @@ -313,4 +313,11 @@ public class EntityShulkerBullet extends IProjectile {
@@ -192,7 +192,7 @@ index 23017b5486..0b16473aed 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java
-index 350e92ac99..4ed7a20bfe 100644
+index 350e92ac9..4ed7a20bf 100644
 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java
 +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java
 @@ -86,4 +86,11 @@ public class EntitySmallFireball extends EntityFireballFireball {
@@ -208,7 +208,7 @@ index 350e92ac99..4ed7a20bfe 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java
-index e44249f59b..34a5f481e6 100644
+index e44249f59..34a5f481e 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowball.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowball.java
 @@ -14,6 +14,12 @@ public class EntitySnowball extends EntityProjectileThrowable {
@@ -225,7 +225,7 @@ index e44249f59b..34a5f481e6 100644
      protected Item getDefaultItem() {
          return Items.SNOWBALL;
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 2d3ca8c424..1d32518bd7 100644
+index 2d3ca8c42..1d32518bd 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -51,4 +51,11 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -241,7 +241,7 @@ index 2d3ca8c424..1d32518bd7 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
-index 2c02e114cc..4a97a7517d 100644
+index 2c02e114c..4a97a7517 100644
 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
 @@ -116,4 +116,11 @@ public class EntityWitherSkull extends EntityFireball {
@@ -257,7 +257,7 @@ index 2c02e114cc..4a97a7517d 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
-index 9a17eb6066..f0b8982893 100644
+index 9a17eb606..f0b898289 100644
 --- a/src/main/java/net/minecraft/server/IProjectile.java
 +++ b/src/main/java/net/minecraft/server/IProjectile.java
 @@ -13,6 +13,7 @@ public abstract class IProjectile extends Entity {
@@ -300,7 +300,7 @@ index 9a17eb6066..f0b8982893 100644
  
      public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5386affbae..21ac732313 100644
+index 5386affba..21ac73231 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -147,6 +147,35 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch b/patches/server/0126-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
similarity index 99%
rename from patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
rename to patches/server/0126-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
index a1eefe5dd..b9211ee46 100644
--- a/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
+++ b/patches/server/0126-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 64c2d0b7c..6b2cbdd84 100644
+index 9a0ade587..1ed0ca9ee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -680,4 +680,17 @@ public class PaperWorldConfig {
diff --git a/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0127-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
similarity index 98%
rename from patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
rename to patches/server/0127-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
index 236347407..2bcf253d1 100644
--- a/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
+++ b/patches/server/0127-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Add hex color code support for console logging
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 685deaa0e5..af8bf0fe23 100644
+index 685deaa0e..af8bf0fe2 100644
 --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -1,17 +1,52 @@
diff --git a/patches/server/0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0128-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 97%
rename from patches/server/0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0128-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index 5072f3b66..361415acd 100644
--- a/patches/server/0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0128-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index 89b56de756..ded483ace0 100644
+index 89b56de75..ded483ace 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 @@ -131,6 +131,10 @@ public class MobGoalHelper {
@@ -21,7 +21,7 @@ index 89b56de756..ded483ace0 100644
          ignored.add("selector_1");
          ignored.add("selector_2");
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 125eab60f2..638efc67d6 100644
+index 125eab60f..638efc67d 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -58,7 +58,18 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -45,7 +45,7 @@ index 125eab60f2..638efc67d6 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index e2f68d843c..3ad8bd0847 100644
+index e2f68d843..3ad8bd084 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -85,7 +85,18 @@ public class EntityZombie extends EntityMonster {
@@ -69,7 +69,7 @@ index e2f68d843c..3ad8bd0847 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 21ac732313..2c1ef95e8d 100644
+index 21ac73231..2c1ef95e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1003,12 +1003,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0129-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0129-Persistent-TileEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0130-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0130-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0132-Flying-squids-Oh-my.patch b/patches/server/0131-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server/0132-Flying-squids-Oh-my.patch
rename to patches/server/0131-Flying-squids-Oh-my.patch
diff --git a/patches/server/0133-Infinity-bow-settings.patch b/patches/server/0132-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server/0133-Infinity-bow-settings.patch
rename to patches/server/0132-Infinity-bow-settings.patch
diff --git a/patches/server/0134-Stonecutter-damage.patch b/patches/server/0133-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0134-Stonecutter-damage.patch
rename to patches/server/0133-Stonecutter-damage.patch
diff --git a/patches/server/0135-Configurable-daylight-cycle.patch b/patches/server/0134-Configurable-daylight-cycle.patch
similarity index 100%
rename from patches/server/0135-Configurable-daylight-cycle.patch
rename to patches/server/0134-Configurable-daylight-cycle.patch
diff --git a/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0135-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0135-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0137-Infinite-fuel-furnace.patch b/patches/server/0136-Infinite-fuel-furnace.patch
similarity index 100%
rename from patches/server/0137-Infinite-fuel-furnace.patch
rename to patches/server/0136-Infinite-fuel-furnace.patch
diff --git a/patches/server/0138-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0137-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0138-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0137-Arrows-should-not-reset-despawn-counter.patch