From 8ec7d99ec04e95a9811ddd063be5c56a9a584c90 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 25 Apr 2020 15:48:09 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ac47e5 Fix numerous item duplication issues and teleport issues
b7402f11 Add phantom creative and insomniac controls (#3222)
75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
---
 Paper                                         |   2 +-
 current-paper                                 |   2 +-
 patches/server/0007-Ridables.patch            | 222 +++++++++---------
 patches/server/0019-Cows-eat-mushrooms.patch  |  12 +-
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  26 +-
 ...oms-do-not-spawn-on-creative-players.patch |  46 ----
 ...0023-Phantoms-only-attack-insomniacs.patch |  58 -----
 ...3-Snowman-drop-and-put-back-pumpkin.patch} |   8 +-
 ...> 0024-Ender-dragon-always-drop-egg.patch} |   6 +-
 ...5-Ender-dragon-always-drop-full-exp.patch} |   6 +-
 ... 0026-Signs-editable-on-right-click.patch} |   8 +-
 ...er-showing-in-ping-before-server-fu.patch} |   4 +-
 ...patch => 0028-Make-Iron-Golems-Swim.patch} |   6 +-
 ...oisten-from-water-directly-under-it.patch} |   6 +-
 ...atch => 0030-Controllable-Minecarts.patch} |   8 +-
 ...tch => 0031-Signs-allow-color-codes.patch} |  10 +-
 ...=> 0032-Campfires-have-regen-effect.patch} |   6 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |   6 +-
 ... => 0034-Campfires-burn-out-in-rain.patch} |   8 +-
 ...-Campfires-should-fall-with-gravity.patch} |   6 +-
 ...36-Dont-send-useless-entity-packets.patch} |   8 +-
 ...API.patch => 0037-Implement-AFK-API.patch} |  26 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |   6 +-
 ...-mends-most-damages-equipment-first.patch} |  10 +-
 ...atch => 0040-Tulips-change-fox-type.patch} |   8 +-
 ...-Pillager-limits-and-leaders-chance.patch} |  10 +-
 ...r.patch => 0042-Make-the-GUI-better.patch} |  38 +--
 ...43-Players-should-not-cram-to-death.patch} |   4 +-
 ... => 0044-Add-EntityPortalReadyEvent.patch} |  12 +-
 ...h => 0045-Implement-elytra-settings.patch} |  14 +-
 ...Add-blacklist-option-for-grindstone.patch} |   8 +-
 ...=> 0047-Implement-lagging-threshold.patch} |   8 +-
 ...t-configurable-villager-brain-ticks.patch} |   8 +-
 ...-for-zombies-targetting-turtle-eggs.patch} |   8 +-
 ...50-Implement-bamboo-growth-settings.patch} |   6 +-
 ...should-not-bypass-cramming-gamerule.patch} |  12 +-
 ...0052-Option-for-slimes-not-pushable.patch} |   8 +-
 ...atch => 0053-Bring-back-server-name.patch} |   6 +-
 ...spenser-curse-of-binding-protection.patch} |   8 +-
 ...ement-LivingEntity-safeFallDistance.patch} |  10 +-
 ...-for-boats-to-eject-players-on-land.patch} |   6 +-
 ...h => 0057-Advancement-API-Additions.patch} |  14 +-
 ...ption-to-set-armorstand-step-height.patch} |   6 +-
 ...Implement-ItemFactory-getMonsterEgg.patch} |   6 +-
 ...0060-Alternative-Keepalive-Handling.patch} |   8 +-
 ...nt-PlayerSetSpawnerTypeWithEggEvent.patch} |   4 +-
 ...PI.patch => 0062-Add-moon-phase-API.patch} |   4 +-
 ...-Add-getPlacementBlockData-to-World.patch} |  10 +-
 ...s.patch => 0064-Barrels-have-6-rows.patch} |   8 +-
 ...-Enderchest-6-rows-plus-permissions.patch} |  14 +-
 ...066-Add-5-second-tps-average-in-tps.patch} |   8 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   4 +-
 ...I.patch => 0068-Add-more-evoker-API.patch} |   6 +-
 ...69-Add-API-for-Villager-resetOffers.patch} |   6 +-
 ...PI.patch => 0070-Add-more-llama-API.patch} |   8 +-
 ...speed-multiplier-using-values-betwe.patch} |   4 +-
 ...tch => 0072-Implement-infinite-lava.patch} |  10 +-
 ...073-Expose-getItemStack-for-Trident.patch} |   6 +-
 ...=> 0074-Despawn-egg-hatches-chicken.patch} |   6 +-
 ...eEvent-not-firing-for-all-use-cases.patch} |   6 +-
 ...ons.patch => 0076-Add-sleep-options.patch} |   6 +-
 ...77-Option-for-hay-block-fall-damage.patch} |   6 +-
 ...getPlayer-to-SkeletonHorseTrapEvent.patch} |   4 +-
 ...Add-LootableInventoryFirstFillEvent.patch} |   6 +-
 ...080-Villagers-follow-emerald-blocks.patch} |  12 +-
 ...dd-player-death-exp-control-options.patch} |   6 +-
 ... 0082-Add-permission-for-F3-N-debug.patch} |   4 +-
 ...ch => 0083-Allow-leashing-villagers.patch} |  14 +-
 ...rable-search-radius-for-villagers-t.patch} |  10 +-
 ...5-Make-lava-flow-speed-configurable.patch} |   8 +-
 ...skeleton-takes-wither-damage-option.patch} |   8 +-
 ...> 0087-UPnP-Port-Forwarding-Service.patch} |  14 +-
 ...h => 0088-Implement-EntityMoveEvent.patch} |   4 +-
 ...-disable-saving-projectiles-to-disk.patch} |   8 +-
 ...090-Implement-bed-explosion-options.patch} |   6 +-
 ...tch => 0091-Add-item-entity-options.patch} |   8 +-
 ...tural-spawns-per-biome-configurable.patch} | 158 ++++++-------
 ...093-Configurable-void-damage-height.patch} |   8 +-
 ...094-Fix-the-dead-lagging-the-server.patch} |   6 +-
 ...to-entity-activation-range-settings.patch} |   6 +-
 ...mand.patch => 0096-Add-ping-command.patch} |  12 +-
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |   6 +-
 ...> 0098-Configurable-server-mod-name.patch} |   6 +-
 ...ould-check-if-entity-can-use-portal.patch} |   4 +-
 ...ch => 0100-Configurable-TPS-Catchup.patch} |   6 +-
 ...patch => 0101-Breedable-Polar-Bears.patch} |   8 +-
 ...=> 0102-Configurable-jockey-options.patch} |  18 +-
 ...-Configurable-enchantment-max-level.patch} |  66 +++---
 ....patch => 0104-Optimize-Chunk-Ticks.patch} |   8 +-
 ...figurable-beehive-generation-chance.patch} |   8 +-
 ...tch => 0106-Add-more-timings-timers.patch} |  12 +-
 ...Skip-events-if-there-s-no-listeners.patch} |   4 +-
 ...g-stick-should-not-update-neighbors.patch} |   4 +-
 ...atch => 0109-Chickens-can-retaliate.patch} |   6 +-
 ...ays-increment-arrow-despawn-counter.patch} |   4 +-
 ...72-Fix-Add-turtle-egg-block-options.patch} |   6 +-
 ... 0112-MC-4-Fix-Item-position-desync.patch} |   8 +-
 ...0113-MC-56653-Fix-pig-zombies-aggro.patch} |  10 +-
 ...h => 0114-EMC-MonsterEggSpawn-Event.patch} |   4 +-
 ...h => 0115-PaperPR-Add-BellRingEvent.patch} |   4 +-
 ...0116-PaperPR-Per-World-Spawn-limits.patch} |   6 +-
 ...=> 0117-Tuinity-Delay-chunk-unloads.patch} |  14 +-
 ...le-to-execute-tasks-on-the-main-ser.patch} |   4 +-
 ... 0119-YAPFA-Disable-mojang-profiler.patch} |  12 +-
 ...s.patch => 0120-More-anvil-controls.patch} |   6 +-
 ...tch => 0121-PlayerItemCooldownEvent.patch} |   6 +-
 ...p-loot-bypass-mob-griefing-gamerule.patch} |   6 +-
 ...ng-can-bypass-mob-griefing-gamerule.patch} |  10 +-
 108 files changed, 642 insertions(+), 746 deletions(-)
 rename patches/server/{0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (96%)
 delete mode 100644 patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch
 delete mode 100644 patches/server/0023-Phantoms-only-attack-insomniacs.patch
 rename patches/server/{0025-Snowman-drop-and-put-back-pumpkin.patch => 0023-Snowman-drop-and-put-back-pumpkin.patch} (94%)
 rename patches/server/{0026-Ender-dragon-always-drop-egg.patch => 0024-Ender-dragon-always-drop-egg.patch} (95%)
 rename patches/server/{0027-Ender-dragon-always-drop-full-exp.patch => 0025-Ender-dragon-always-drop-full-exp.patch} (94%)
 rename patches/server/{0028-Signs-editable-on-right-click.patch => 0026-Signs-editable-on-right-click.patch} (94%)
 rename patches/server/{0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (91%)
 rename patches/server/{0030-Make-Iron-Golems-Swim.patch => 0028-Make-Iron-Golems-Swim.patch} (93%)
 rename patches/server/{0031-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0029-Allow-soil-to-moisten-from-water-directly-under-it.patch} (95%)
 rename patches/server/{0032-Controllable-Minecarts.patch => 0030-Controllable-Minecarts.patch} (98%)
 rename patches/server/{0033-Signs-allow-color-codes.patch => 0031-Signs-allow-color-codes.patch} (95%)
 rename patches/server/{0034-Campfires-have-regen-effect.patch => 0032-Campfires-have-regen-effect.patch} (98%)
 rename patches/server/{0035-Disable-loot-drops-on-death-by-cramming.patch => 0033-Disable-loot-drops-on-death-by-cramming.patch} (95%)
 rename patches/server/{0036-Campfires-burn-out-in-rain.patch => 0034-Campfires-burn-out-in-rain.patch} (96%)
 rename patches/server/{0037-Campfires-should-fall-with-gravity.patch => 0035-Campfires-should-fall-with-gravity.patch} (97%)
 rename patches/server/{0038-Dont-send-useless-entity-packets.patch => 0036-Dont-send-useless-entity-packets.patch} (96%)
 rename patches/server/{0039-Implement-AFK-API.patch => 0037-Implement-AFK-API.patch} (96%)
 rename patches/server/{0040-Option-to-toggle-milk-curing-bad-omen.patch => 0038-Option-to-toggle-milk-curing-bad-omen.patch} (94%)
 rename patches/server/{0041-Mending-mends-most-damages-equipment-first.patch => 0039-Mending-mends-most-damages-equipment-first.patch} (96%)
 rename patches/server/{0042-Tulips-change-fox-type.patch => 0040-Tulips-change-fox-type.patch} (96%)
 rename patches/server/{0043-Pillager-limits-and-leaders-chance.patch => 0041-Pillager-limits-and-leaders-chance.patch} (94%)
 rename patches/server/{0044-Make-the-GUI-better.patch => 0042-Make-the-GUI-better.patch} (98%)
 rename patches/server/{0045-Players-should-not-cram-to-death.patch => 0043-Players-should-not-cram-to-death.patch} (91%)
 rename patches/server/{0046-Add-EntityPortalReadyEvent.patch => 0044-Add-EntityPortalReadyEvent.patch} (96%)
 rename patches/server/{0047-Implement-elytra-settings.patch => 0045-Implement-elytra-settings.patch} (96%)
 rename patches/server/{0048-Add-blacklist-option-for-grindstone.patch => 0046-Add-blacklist-option-for-grindstone.patch} (96%)
 rename patches/server/{0049-Implement-lagging-threshold.patch => 0047-Implement-lagging-threshold.patch} (94%)
 rename patches/server/{0050-Implement-configurable-villager-brain-ticks.patch => 0048-Implement-configurable-villager-brain-ticks.patch} (94%)
 rename patches/server/{0051-Add-option-for-zombies-targetting-turtle-eggs.patch => 0049-Add-option-for-zombies-targetting-turtle-eggs.patch} (92%)
 rename patches/server/{0052-Implement-bamboo-growth-settings.patch => 0050-Implement-bamboo-growth-settings.patch} (97%)
 rename patches/server/{0053-Climbing-should-not-bypass-cramming-gamerule.patch => 0051-Climbing-should-not-bypass-cramming-gamerule.patch} (97%)
 rename patches/server/{0054-Option-for-slimes-not-pushable.patch => 0052-Option-for-slimes-not-pushable.patch} (94%)
 rename patches/server/{0055-Bring-back-server-name.patch => 0053-Bring-back-server-name.patch} (93%)
 rename patches/server/{0056-Dispenser-curse-of-binding-protection.patch => 0054-Dispenser-curse-of-binding-protection.patch} (94%)
 rename patches/server/{0057-Implement-LivingEntity-safeFallDistance.patch => 0055-Implement-LivingEntity-safeFallDistance.patch} (94%)
 rename patches/server/{0058-Add-option-for-boats-to-eject-players-on-land.patch => 0056-Add-option-for-boats-to-eject-players-on-land.patch} (94%)
 rename patches/server/{0059-Advancement-API-Additions.patch => 0057-Advancement-API-Additions.patch} (96%)
 rename patches/server/{0060-Add-option-to-set-armorstand-step-height.patch => 0058-Add-option-to-set-armorstand-step-height.patch} (95%)
 rename patches/server/{0061-Implement-ItemFactory-getMonsterEgg.patch => 0059-Implement-ItemFactory-getMonsterEgg.patch} (94%)
 rename patches/server/{0062-Alternative-Keepalive-Handling.patch => 0060-Alternative-Keepalive-Handling.patch} (97%)
 rename patches/server/{0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch => 0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch} (95%)
 rename patches/server/{0064-Add-moon-phase-API.patch => 0062-Add-moon-phase-API.patch} (90%)
 rename patches/server/{0065-Add-getPlacementBlockData-to-World.patch => 0063-Add-getPlacementBlockData-to-World.patch} (95%)
 rename patches/server/{0066-Barrels-have-6-rows.patch => 0064-Barrels-have-6-rows.patch} (95%)
 rename patches/server/{0067-Enderchest-6-rows-plus-permissions.patch => 0065-Enderchest-6-rows-plus-permissions.patch} (96%)
 rename patches/server/{0068-Add-5-second-tps-average-in-tps.patch => 0066-Add-5-second-tps-average-in-tps.patch} (96%)
 rename patches/server/{0069-Add-playPickupItemAnimation-to-LivingEntity.patch => 0067-Add-playPickupItemAnimation-to-LivingEntity.patch} (90%)
 rename patches/server/{0070-Add-more-evoker-API.patch => 0068-Add-more-evoker-API.patch} (94%)
 rename patches/server/{0071-Add-API-for-Villager-resetOffers.patch => 0069-Add-API-for-Villager-resetOffers.patch} (93%)
 rename patches/server/{0072-Add-more-llama-API.patch => 0070-Add-more-llama-API.patch} (97%)
 rename patches/server/{0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch => 0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch} (93%)
 rename patches/server/{0074-Implement-infinite-lava.patch => 0072-Implement-infinite-lava.patch} (94%)
 rename patches/server/{0075-Expose-getItemStack-for-Trident.patch => 0073-Expose-getItemStack-for-Trident.patch} (91%)
 rename patches/server/{0076-Despawn-egg-hatches-chicken.patch => 0074-Despawn-egg-hatches-chicken.patch} (95%)
 rename patches/server/{0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (94%)
 rename patches/server/{0078-Add-sleep-options.patch => 0076-Add-sleep-options.patch} (96%)
 rename patches/server/{0079-Option-for-hay-block-fall-damage.patch => 0077-Option-for-hay-block-fall-damage.patch} (91%)
 rename patches/server/{0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (95%)
 rename patches/server/{0081-Add-LootableInventoryFirstFillEvent.patch => 0079-Add-LootableInventoryFirstFillEvent.patch} (94%)
 rename patches/server/{0082-Villagers-follow-emerald-blocks.patch => 0080-Villagers-follow-emerald-blocks.patch} (94%)
 rename patches/server/{0083-Add-player-death-exp-control-options.patch => 0081-Add-player-death-exp-control-options.patch} (96%)
 rename patches/server/{0084-Add-permission-for-F3-N-debug.patch => 0082-Add-permission-for-F3-N-debug.patch} (89%)
 rename patches/server/{0085-Allow-leashing-villagers.patch => 0083-Allow-leashing-villagers.patch} (94%)
 rename patches/server/{0086-Implement-configurable-search-radius-for-villagers-t.patch => 0084-Implement-configurable-search-radius-for-villagers-t.patch} (91%)
 rename patches/server/{0087-Make-lava-flow-speed-configurable.patch => 0085-Make-lava-flow-speed-configurable.patch} (93%)
 rename patches/server/{0088-Add-wither-skeleton-takes-wither-damage-option.patch => 0086-Add-wither-skeleton-takes-wither-damage-option.patch} (91%)
 rename patches/server/{0089-UPnP-Port-Forwarding-Service.patch => 0087-UPnP-Port-Forwarding-Service.patch} (96%)
 rename patches/server/{0090-Implement-EntityMoveEvent.patch => 0088-Implement-EntityMoveEvent.patch} (94%)
 rename patches/server/{0091-Add-option-to-disable-saving-projectiles-to-disk.patch => 0089-Add-option-to-disable-saving-projectiles-to-disk.patch} (98%)
 rename patches/server/{0092-Implement-bed-explosion-options.patch => 0090-Implement-bed-explosion-options.patch} (96%)
 rename patches/server/{0093-Add-item-entity-options.patch => 0091-Add-item-entity-options.patch} (97%)
 rename patches/server/{0094-Make-natural-spawns-per-biome-configurable.patch => 0092-Make-natural-spawns-per-biome-configurable.patch} (98%)
 rename patches/server/{0095-Configurable-void-damage-height.patch => 0093-Configurable-void-damage-height.patch} (93%)
 rename patches/server/{0096-Fix-the-dead-lagging-the-server.patch => 0094-Fix-the-dead-lagging-the-server.patch} (92%)
 rename patches/server/{0097-Add-flying-mobs-to-entity-activation-range-settings.patch => 0095-Add-flying-mobs-to-entity-activation-range-settings.patch} (97%)
 rename patches/server/{0098-Add-ping-command.patch => 0096-Add-ping-command.patch} (96%)
 rename patches/server/{0099-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (94%)
 rename patches/server/{0100-Configurable-server-mod-name.patch => 0098-Configurable-server-mod-name.patch} (92%)
 rename patches/server/{0101-End-gateway-should-check-if-entity-can-use-portal.patch => 0099-End-gateway-should-check-if-entity-can-use-portal.patch} (90%)
 rename patches/server/{0102-Configurable-TPS-Catchup.patch => 0100-Configurable-TPS-Catchup.patch} (94%)
 rename patches/server/{0103-Breedable-Polar-Bears.patch => 0101-Breedable-Polar-Bears.patch} (95%)
 rename patches/server/{0104-Configurable-jockey-options.patch => 0102-Configurable-jockey-options.patch} (97%)
 rename patches/server/{0105-Configurable-enchantment-max-level.patch => 0103-Configurable-enchantment-max-level.patch} (96%)
 rename patches/server/{0106-Optimize-Chunk-Ticks.patch => 0104-Optimize-Chunk-Ticks.patch} (98%)
 rename patches/server/{0107-Add-configurable-beehive-generation-chance.patch => 0105-Add-configurable-beehive-generation-chance.patch} (97%)
 rename patches/server/{0108-Add-more-timings-timers.patch => 0106-Add-more-timings-timers.patch} (97%)
 rename patches/server/{0109-Skip-events-if-there-s-no-listeners.patch => 0107-Skip-events-if-there-s-no-listeners.patch} (93%)
 rename patches/server/{0110-Debug-stick-should-not-update-neighbors.patch => 0108-Debug-stick-should-not-update-neighbors.patch} (91%)
 rename patches/server/{0111-Chickens-can-retaliate.patch => 0109-Chickens-can-retaliate.patch} (96%)
 rename patches/server/{0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch => 0110-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch} (95%)
 rename patches/server/{0113-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0111-MC-168772-Fix-Add-turtle-egg-block-options.patch} (95%)
 rename patches/server/{0114-MC-4-Fix-Item-position-desync.patch => 0112-MC-4-Fix-Item-position-desync.patch} (94%)
 rename patches/server/{0115-MC-56653-Fix-pig-zombies-aggro.patch => 0113-MC-56653-Fix-pig-zombies-aggro.patch} (93%)
 rename patches/server/{0116-EMC-MonsterEggSpawn-Event.patch => 0114-EMC-MonsterEggSpawn-Event.patch} (97%)
 rename patches/server/{0117-PaperPR-Add-BellRingEvent.patch => 0115-PaperPR-Add-BellRingEvent.patch} (96%)
 rename patches/server/{0118-PaperPR-Per-World-Spawn-limits.patch => 0116-PaperPR-Per-World-Spawn-limits.patch} (93%)
 rename patches/server/{0119-Tuinity-Delay-chunk-unloads.patch => 0117-Tuinity-Delay-chunk-unloads.patch} (97%)
 rename patches/server/{0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch => 0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch} (91%)
 rename patches/server/{0121-YAPFA-Disable-mojang-profiler.patch => 0119-YAPFA-Disable-mojang-profiler.patch} (96%)
 rename patches/server/{0122-More-anvil-controls.patch => 0120-More-anvil-controls.patch} (97%)
 rename patches/server/{0123-PlayerItemCooldownEvent.patch => 0121-PlayerItemCooldownEvent.patch} (92%)
 rename patches/server/{0124-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0122-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (95%)
 rename patches/server/{0125-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0123-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (90%)

diff --git a/Paper b/Paper
index cb15cfa4f..a6ac47e50 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit cb15cfa4f8ffc67d918f97224ee4ce5ed97fecc8
+Subproject commit a6ac47e502d4cadef0c2c289956971739076c49c
diff --git a/current-paper b/current-paper
index 8525fc6ce..6eab82aeb 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--a7c28f72fefc928e28132ad32a50dfe316123df8
+1.15.2--167bedd58018498c1428e97ea328d4d61f5e7e7a
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 186586578..400ba9d98 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -1,4 +1,4 @@
-From f28759eebeaaab8c588d7ff5ede57a1a84330cfd Mon Sep 17 00:00:00 2001
+From 316bdb85e6f5f5596abc3d5cd031d2f307b83871 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -115,7 +115,7 @@ Subject: [PATCH] Ridables
  create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 3fdb5200..7e67292c 100644
+index 3fdb52007..7e67292c2 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -104,6 +104,7 @@ public class AxisAlignedBB {
@@ -135,7 +135,7 @@ index 3fdb5200..7e67292c 100644
          return this.grow(d0, d0, d0);
      }
 diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
-index 1d9ba04d..2bade947 100644
+index 1d9ba04da..2bade947e 100644
 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 @@ -1,6 +1,6 @@
@@ -156,7 +156,7 @@ index 1d9ba04d..2bade947 100644
              this.d = false;
              this.a.aK = this.a(this.a.aK, 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 a5c4cbb6..efe6afde 100644
+index a5c4cbb67..efe6afde9 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 {
@@ -173,7 +173,7 @@ index a5c4cbb6..efe6afde 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 816d301f..f7344d3a 100644
+index 816d301f1..f7344d3ae 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -57,6 +57,7 @@ public class DamageSource {
@@ -198,7 +198,7 @@ index 816d301f..f7344d3a 100644
          this.C = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f973466b..e368fbc5 100644
+index a69969f46..46d802a2f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -272,7 +272,7 @@ index f973466b..e368fbc5 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2161,7 +2165,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2162,7 +2166,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -287,7 +287,7 @@ index f973466b..e368fbc5 100644
          }
          return true; // CraftBukkit
      }
-@@ -2196,6 +2206,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2197,6 +2207,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -300,7 +300,7 @@ index f973466b..e368fbc5 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2364,6 +2380,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2365,6 +2381,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -308,7 +308,7 @@ index f973466b..e368fbc5 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2582,6 +2599,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2583,6 +2600,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -316,7 +316,7 @@ index f973466b..e368fbc5 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3428,4 +3446,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3435,4 +3453,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -361,7 +361,7 @@ index f973466b..e368fbc5 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 3d27f096..822316a6 100644
+index 3d27f0964..822316a65 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -374,7 +374,7 @@ index 3d27f096..822316a6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 34239160..592408ba 100644
+index 34239160b..592408bac 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -14,9 +14,44 @@ public class EntityBat extends EntityAmbient {
@@ -465,7 +465,7 @@ index 34239160..592408ba 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index dd1d246a..f0f83baa 100644
+index dd1d246ae..f0f83baac 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -646,7 +646,7 @@ index dd1d246a..f0f83baa 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index da6a3fa2..d02130e0 100644
+index da6a3fa2c..d02130e0d 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 {
@@ -736,7 +736,7 @@ index da6a3fa2..d02130e0 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 b3bdc194..8b9222d7 100644
+index b3bdc194a..8b9222d77 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -42,6 +42,23 @@ public class EntityCat extends EntityTameableAnimal {
@@ -830,7 +830,7 @@ index b3bdc194..8b9222d7 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 23ced2c7..5b86b36f 100644
+index 23ced2c7b..5b86b36f6 100644
 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
 +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
 @@ -8,6 +8,23 @@ public class EntityCaveSpider extends EntitySpider {
@@ -858,7 +858,7 @@ index 23ced2c7..5b86b36f 100644
      protected void initAttributes() {
          super.initAttributes();
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 65795fc8..5505b7ee 100644
+index 65795fc89..5505b7ee9 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -17,9 +17,27 @@ public class EntityChicken extends EntityAnimal {
@@ -898,7 +898,7 @@ index 65795fc8..5505b7ee 100644
              this.forceDrops = true; // CraftBukkit
              this.a((IMaterial) Items.EGG);
 diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
-index 1e378212..0153a821 100644
+index 1e3782122..0153a821e 100644
 --- a/src/main/java/net/minecraft/server/EntityCod.java
 +++ b/src/main/java/net/minecraft/server/EntityCod.java
 @@ -6,6 +6,23 @@ public class EntityCod extends EntityFishSchool {
@@ -926,7 +926,7 @@ index 1e378212..0153a821 100644
      protected ItemStack l() {
          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 a0b35c86..144e89f2 100644
+index a0b35c869..144e89f22 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 {
@@ -942,7 +942,7 @@ index a0b35c86..144e89f2 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 2c8bbf20..723a9fa1 100644
+index 2c8bbf20a..723a9fa1e 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -11,9 +11,27 @@ public class EntityCow extends EntityAnimal {
@@ -974,7 +974,7 @@ index 2c8bbf20..723a9fa1 100644
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false));
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 45dfc810..48fd8e71 100644
+index 45dfc8104..48fd8e716 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -23,16 +23,35 @@ public class EntityCreeper extends EntityMonster {
@@ -1090,7 +1090,7 @@ index 45dfc810..48fd8e71 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
-index ce78586e..81570b37 100644
+index ce78586ea..81570b37b 100644
 --- a/src/main/java/net/minecraft/server/EntityDolphin.java
 +++ b/src/main/java/net/minecraft/server/EntityDolphin.java
 @@ -1,5 +1,12 @@
@@ -1241,7 +1241,7 @@ index ce78586e..81570b37 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 77885f67..63f5969b 100644
+index 77885f67f..63f5969b1 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -1304,7 +1304,7 @@ index 77885f67..63f5969b 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 2887cb14..a6a79f5e 100644
+index 2887cb14e..a6a79f5e9 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 {
@@ -1461,7 +1461,7 @@ index 2887cb14..a6a79f5e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 212636dc..de30ce48 100644
+index 212636dcb..de30ce483 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -27,9 +27,27 @@ public class EntityEnderman extends EntityMonster {
@@ -1560,7 +1560,7 @@ index 212636dc..de30ce48 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
                  // CraftBukkit start - Place event
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index e4bd2796..5eaf1920 100644
+index e4bd2796a..5eaf1920b 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -12,13 +12,32 @@ public class EntityEndermite extends EntityMonster {
@@ -1597,7 +1597,7 @@ index e4bd2796..5eaf1920 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index b030fe95..179a2612 100644
+index b030fe957..179a26129 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -12,10 +12,28 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1662,7 +1662,7 @@ index b030fe95..179a2612 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index b853fd0d..b8d786fa 100644
+index b853fd0d9..b8d786fad 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -72,9 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1716,7 +1716,7 @@ index b853fd0d..b8d786fa 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 82a32d5d..4f53090d 100644
+index 82a32d5db..4f53090d3 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -55,6 +55,23 @@ public class EntityFox extends EntityAnimal {
@@ -1854,7 +1854,7 @@ index 82a32d5d..4f53090d 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
-index e1c2540d..46841df7 100644
+index e1c2540d1..46841df71 100644
 --- a/src/main/java/net/minecraft/server/EntityGhast.java
 +++ b/src/main/java/net/minecraft/server/EntityGhast.java
 @@ -14,11 +14,47 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -1937,7 +1937,7 @@ index e1c2540d..46841df7 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 d9e5eaad..ff8a41a5 100644
+index d9e5eaad1..ff8a41a53 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -4,8 +4,33 @@ public class EntityGiantZombie extends EntityMonster {
@@ -1975,7 +1975,7 @@ index d9e5eaad..ff8a41a5 100644
      protected float b(EntityPose entitypose, EntitySize entitysize) {
          return 10.440001F;
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
-index e69cb334..97040872 100644
+index e69cb334f..97040872b 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardian.java
 @@ -24,15 +24,39 @@ public class EntityGuardian extends EntityMonster {
@@ -2076,7 +2076,7 @@ index e69cb334..97040872 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 7484bfee..f231340d 100644
+index 7484bfeea..f231340d9 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java
 +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java
 @@ -16,6 +16,23 @@ public class EntityGuardianElder extends EntityGuardian {
@@ -2104,7 +2104,7 @@ index 7484bfee..f231340d 100644
      public void initAttributes() {
          super.initAttributes();
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index a6fb4ba5..98b1e937 100644
+index a6fb4ba5b..98b1e9375 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -19,6 +19,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -2122,7 +2122,7 @@ index a6fb4ba5..98b1e937 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index c56efe03..e7ba83f3 100644
+index c56efe035..e7ba83f32 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -38,12 +38,39 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2175,7 +2175,7 @@ index c56efe03..e7ba83f3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 9a52decd..64d80081 100644
+index 9a52decdc..64d80081f 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -6,6 +6,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -2193,7 +2193,7 @@ index 9a52decd..64d80081 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 4dd4d91e..a9f26efe 100644
+index 4dd4d91eb..a9f26efe6 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
 @@ -6,6 +6,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -2211,7 +2211,7 @@ index 4dd4d91e..a9f26efe 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 290cb933..7bf76e5a 100644
+index 290cb9337..7bf76e5a0 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 {
@@ -2252,7 +2252,7 @@ index 290cb933..7bf76e5a 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 5782a25e..c87fc523 100644
+index 5782a25ec..c87fc523f 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 {
@@ -2282,7 +2282,7 @@ index 5782a25e..c87fc523 100644
 +    protected void ez() { 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 2e186134..16ccabfd 100644
+index 2e186134e..16ccabfd5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2309,7 +2309,7 @@ index 2e186134..16ccabfd 100644
              this.setSneaking(false);
          } else {
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 81b7cd06..3e6722cf 100644
+index 81b7cd06f..3e6722cfc 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -19,10 +19,28 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -2350,7 +2350,7 @@ index 81b7cd06..3e6722cf 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 1991cee4..d0a5687f 100644
+index 1991cee43..d0a5687f0 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2442,7 +2442,7 @@ index 1991cee4..d0a5687f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 7f6a5677..288a043f 100644
+index 7f6a56776..288a043fb 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -17,8 +17,26 @@ public class EntityIronGolem extends EntityGolem {
@@ -2497,7 +2497,7 @@ index 7f6a5677..288a043f 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 dfb9421a..53925d52 100644
+index dfb9421a1..53925d526 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -75,7 +75,7 @@ public abstract class EntityLiving extends Entity {
@@ -2570,7 +2570,7 @@ index dfb9421a..53925d52 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 193dbfc5..7a4e64a3 100644
+index 193dbfc5f..7a4e64a3d 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -16,8 +16,47 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -2675,7 +2675,7 @@ index 193dbfc5..7a4e64a3 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 4cebd67e..08c4ca3f 100644
+index 4cebd67e8..08c4ca3f3 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 {
@@ -2716,7 +2716,7 @@ index 4cebd67e..08c4ca3f 100644
      @Override
      public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
-index 1fdc248b..a5a36af2 100644
+index 1fdc248ba..a5a36af21 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 {
@@ -2744,7 +2744,7 @@ index 1fdc248b..a5a36af2 100644
      protected void initAttributes() {
          super.initAttributes();
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 3706c31a..b20f4afd 100644
+index 3706c31aa..b20f4afd3 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -20,6 +20,23 @@ public class EntityMushroomCow extends EntityCow {
@@ -2772,7 +2772,7 @@ index 3706c31a..b20f4afd 100644
      public float a(BlockPosition blockposition, IWorldReader iworldreader) {
          return iworldreader.getType(blockposition.down()).getBlock() == Blocks.MYCELIUM ? 10.0F : iworldreader.w(blockposition) - 0.5F;
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index d9a7b8ac..8fdf3485 100644
+index d9a7b8ac1..8fdf34857 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -16,6 +16,23 @@ public class EntityOcelot extends EntityAnimal {
@@ -2815,7 +2815,7 @@ index d9a7b8ac..8fdf3485 100644
          this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bw));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index f50ed190..87ed9a8c 100644
+index f50ed1908..87ed9a8ca 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -46,6 +46,23 @@ public class EntityPanda extends EntityAnimal {
@@ -2961,7 +2961,7 @@ index f50ed190..87ed9a8c 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 94e57a2d..7ba2f3a3 100644
+index 94e57a2d8..7ba2f3a35 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -62,12 +62,83 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -3062,7 +3062,7 @@ index 94e57a2d..7ba2f3a3 100644
          this.goalSelector.a(2, this.goalSit);
          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 90eeddb1..c392085d 100644
+index 96b4912c4..777bc95ee 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -22,6 +22,40 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -3176,7 +3176,7 @@ index 90eeddb1..c392085d 100644
              if (this.c > 0) {
                  --this.c;
                  return false;
-@@ -244,6 +308,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -245,6 +309,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
  
          @Override
          public boolean b() {
@@ -3184,7 +3184,7 @@ index 90eeddb1..c392085d 100644
              EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
  
              return entityliving != null ? EntityPhantom.this.a(entityliving, PathfinderTargetCondition.a) : false;
-@@ -258,6 +323,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -259,6 +324,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
  
          @Override
          public boolean a() {
@@ -3192,7 +3192,7 @@ index 90eeddb1..c392085d 100644
              EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
-@@ -447,14 +513,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -448,14 +514,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
          }
      }
  
@@ -3218,7 +3218,7 @@ index 90eeddb1..c392085d 100644
      }
  
      class d extends EntityAIBodyControl {
-@@ -470,7 +545,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -471,7 +546,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
          }
      }
  
@@ -3227,7 +3227,7 @@ index 90eeddb1..c392085d 100644
  
          private float j = 0.1F;
  
-@@ -479,7 +554,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -480,7 +555,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
          }
  
          @Override
@@ -3249,7 +3249,7 @@ index 90eeddb1..c392085d 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 8d277566..e6a7f8ef 100644
+index 8d277566e..e6a7f8ef3 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -19,9 +19,27 @@ public class EntityPig extends EntityAnimal {
@@ -3320,7 +3320,7 @@ index 8d277566..e6a7f8ef 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 9dd028b5..fb9ef88e 100644
+index 9dd028b55..fb9ef88ea 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -17,6 +17,23 @@ public class EntityPigZombie extends EntityZombie {
@@ -3348,7 +3348,7 @@ index 9dd028b5..fb9ef88e 100644
      public void setLastDamager(@Nullable EntityLiving entityliving) {
          super.setLastDamager(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index 0357c9da..98a657ce 100644
+index 0357c9da9..98a657cec 100644
 --- a/src/main/java/net/minecraft/server/EntityPillager.java
 +++ b/src/main/java/net/minecraft/server/EntityPillager.java
 @@ -13,15 +13,34 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -3387,7 +3387,7 @@ index 0357c9da..98a657ce 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 1d921212..8404fc4e 100644
+index 1d921212c..8404fc4e3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1289,6 +1289,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -3407,7 +3407,7 @@ index 1d921212..8404fc4e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index f8e29a02..0a3906bd 100644
+index f8e29a02d..0a3906bde 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -17,6 +17,23 @@ public class EntityPolarBear extends EntityAnimal {
@@ -3499,7 +3499,7 @@ index f8e29a02..0a3906bd 100644
  
          public d() {
 diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
-index 98af9a22..d0e3e251 100644
+index 98af9a223..d0e3e251e 100644
 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java
 +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java
 @@ -17,6 +17,23 @@ public class EntityPufferFish extends EntityFish {
@@ -3536,7 +3536,7 @@ index 98af9a22..d0e3e251 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 2ed2d0b6..9040ab1c 100644
+index 2ed2d0b6b..9040ab1c5 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -26,9 +26,27 @@ public class EntityRabbit extends EntityAnimal {
@@ -3691,7 +3691,7 @@ index 2ed2d0b6..9040ab1c 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 fd25ce10..98d182a4 100644
+index fd25ce102..98d182a4c 100644
 --- a/src/main/java/net/minecraft/server/EntityRavager.java
 +++ b/src/main/java/net/minecraft/server/EntityRavager.java
 @@ -20,14 +20,33 @@ public class EntityRavager extends EntityRaider {
@@ -3729,7 +3729,7 @@ index fd25ce10..98d182a4 100644
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
-index 6be29f30..189515b0 100644
+index 6be29f307..189515b0f 100644
 --- a/src/main/java/net/minecraft/server/EntitySalmon.java
 +++ b/src/main/java/net/minecraft/server/EntitySalmon.java
 @@ -6,6 +6,23 @@ public class EntitySalmon extends EntityFishSchool {
@@ -3757,7 +3757,7 @@ index 6be29f30..189515b0 100644
      public int es() {
          return 5;
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index d5ffdc11..d4f2642d 100644
+index d5ffdc110..d4f2642d3 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -55,10 +55,28 @@ public class EntitySheep extends EntityAnimal {
@@ -3790,7 +3790,7 @@ index d5ffdc11..d4f2642d 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 0d2ceff6..46379588 100644
+index 0d2ceff6f..46379588c 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -32,6 +32,23 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -3840,7 +3840,7 @@ index 0d2ceff6..46379588 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 08c2a22f..dff20567 100644
+index 08c2a22f7..dff20567b 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -11,13 +11,32 @@ public class EntitySilverfish extends EntityMonster {
@@ -3885,7 +3885,7 @@ index 08c2a22f..dff20567 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 0e78d5c6..8e6efeb7 100644
+index 0e78d5c62..8e6efeb7b 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
 @@ -6,6 +6,23 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -3913,7 +3913,7 @@ index 0e78d5c6..8e6efeb7 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 3c95c042..8bc4e851 100644
+index 3c95c0428..8bc4e8515 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
@@ -3932,7 +3932,7 @@ index 3c95c042..8bc4e851 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 2eb53864..a930fb84 100644
+index 2eb53864f..a930fb840 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 @@ -8,6 +8,23 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -3960,7 +3960,7 @@ index 2eb53864..a930fb84 100644
          return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 98e04242..8aa0a669 100644
+index 98e042424..8aa0a6699 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -9,6 +9,23 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -3988,7 +3988,7 @@ index 98e04242..8aa0a669 100644
      protected SoundEffect getSoundAmbient() {
          return SoundEffects.ENTITY_WITHER_SKELETON_AMBIENT;
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 2efc18df..1469e3b2 100644
+index 2efc18df9..1469e3b23 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -32,12 +32,31 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -4065,7 +4065,7 @@ index 2efc18df..1469e3b2 100644
              } else {
                  this.h = ControllerMove.Operation.WAIT;
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 07ca1a49..94187351 100644
+index 07ca1a498..941873513 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -14,12 +14,31 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -4127,7 +4127,7 @@ index 07ca1a49..94187351 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index d02db565..d3708a7b 100644
+index d02db5659..d3708a7b0 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -11,14 +11,33 @@ public class EntitySpider extends EntityMonster {
@@ -4165,7 +4165,7 @@ index d02db565..d3708a7b 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 92efe4e7..b967135a 100644
+index 92efe4e7f..b967135ac 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -4274,7 +4274,7 @@ index 92efe4e7..b967135a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 9b2eea71..d55c6cb3 100644
+index 9b2eea71c..d55c6cb33 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -135,6 +135,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -4286,7 +4286,7 @@ index 9b2eea71..d55c6cb3 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 ef8f373b..99297846 100644
+index ef8f373be..992978463 100644
 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java
 +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java
 @@ -19,6 +19,23 @@ public class EntityTropicalFish extends EntityFishSchool {
@@ -4314,7 +4314,7 @@ index ef8f373b..99297846 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 b24a5100..46954920 100644
+index b24a5100b..469549206 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal {
@@ -4462,7 +4462,7 @@ index b24a5100..46954920 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/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 0f04bcc8..5a749494 100644
+index 0f04bcc8b..5a7494947 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -259,6 +259,12 @@ public class EntityTypes<T extends Entity> {
@@ -4479,7 +4479,7 @@ index 0f04bcc8..5a749494 100644
          if (this.bg == null) {
              this.bg = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index cf274666..d919f44a 100644
+index cf274666c..d919f44ab 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -19,6 +19,50 @@ public class EntityVex extends EntityMonster {
@@ -4593,7 +4593,7 @@ index cf274666..d919f44a 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 6e0020ae..3eaac031 100644
+index 6e0020ae0..3eaac031f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -68,6 +68,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -4626,7 +4626,7 @@ index 6e0020ae..3eaac031 100644
      public BehaviorController<EntityVillager> getBehaviorController() {
          return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 2ad8dba5..4e9c5e84 100644
+index 2ad8dba5c..4e9c5e84a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -20,6 +20,23 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -4662,7 +4662,7 @@ index 2ad8dba5..4e9c5e84 100644
          this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D));
          this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index c974c02e..6ba92013 100644
+index c974c02e9..6ba920134 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -17,14 +17,33 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -4700,7 +4700,7 @@ index c974c02e..6ba92013 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 1432d3f6..447387bd 100644
+index 1432d3f6b..447387bd7 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -24,6 +24,23 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -4743,7 +4743,7 @@ index 1432d3f6..447387bd 100644
          this.targetSelector.a(2, this.bz);
          this.targetSelector.a(3, this.bA);
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 8977c351..ad97fe7e 100644
+index 8977c3516..ad97fe7ea 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4876,7 +4876,7 @@ index 8977c351..ad97fe7e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index eec1e26b..47f0b2df 100644
+index eec1e26b6..47f0b2df6 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -5050,7 +5050,7 @@ index eec1e26b..47f0b2df 100644
  
          private final EntityWolf j;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 07ebc1d8..8d1f0441 100644
+index 07ebc1d81..8d1f04415 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster {
@@ -5085,7 +5085,7 @@ index 07ebc1d8..8d1f0441 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index da8446d0..db252ba4 100644
+index da8446d05..db252ba4e 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 {
@@ -5113,7 +5113,7 @@ index da8446d0..db252ba4 100644
          return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 8082fa61..ebbfcb75 100644
+index 8082fa617..ebbfcb75a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -25,6 +25,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -5141,7 +5141,7 @@ index 8082fa61..ebbfcb75 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/minecraft/server/FoodInfo.java b/src/main/java/net/minecraft/server/FoodInfo.java
-index b35fe21a..5b0f35c7 100644
+index b35fe21a6..5b0f35c73 100644
 --- a/src/main/java/net/minecraft/server/FoodInfo.java
 +++ b/src/main/java/net/minecraft/server/FoodInfo.java
 @@ -30,6 +30,7 @@ public class FoodInfo {
@@ -5153,7 +5153,7 @@ index b35fe21a..5b0f35c7 100644
          return this.c;
      }
 diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
-index da49f6e5..7b5d6026 100644
+index da49f6e5a..7b5d60264 100644
 --- a/src/main/java/net/minecraft/server/ItemDye.java
 +++ b/src/main/java/net/minecraft/server/ItemDye.java
 @@ -42,6 +42,7 @@ public class ItemDye extends Item {
@@ -5165,7 +5165,7 @@ index da49f6e5..7b5d6026 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index c4aa38dd..3d52a396 100644
+index c4aa38ddf..3d52a396e 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -263,6 +263,7 @@ public class MathHelper {
@@ -5185,7 +5185,7 @@ index c4aa38dd..3d52a396 100644
          return f1 + f * (f2 - f1);
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 134f7d00..d6597967 100644
+index 134f7d001..d65979673 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
@@ -5197,7 +5197,7 @@ index 134f7d00..d6597967 100644
          // Paper start - remove streams from pathfindergoalselector
          this.goalTypes.clear();
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
-index e07c7674..3c077b68 100644
+index e07c7674a..3c077b687 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
 @@ -4,8 +4,8 @@ import java.util.EnumSet;
@@ -5220,7 +5220,7 @@ index e07c7674..3c077b68 100644
              this.a.a(-1);
          } else if (this.a.h((Entity) this.b) > 49.0D) {
 diff --git a/src/main/java/net/minecraft/server/ProjectileHelper.java b/src/main/java/net/minecraft/server/ProjectileHelper.java
-index 1b796ba5..7dbe3500 100644
+index 1b796ba5b..7dbe3500e 100644
 --- a/src/main/java/net/minecraft/server/ProjectileHelper.java
 +++ b/src/main/java/net/minecraft/server/ProjectileHelper.java
 @@ -15,6 +15,7 @@ public final class ProjectileHelper {
@@ -5232,7 +5232,7 @@ index 1b796ba5..7dbe3500 100644
          return a(entity, flag, false, (Entity) null, raytrace_blockcollisionoption, false, predicate, axisalignedbb);
      }
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index 0c7f094e..62a08100 100644
+index 0c7f094e5..62a081006 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -27,6 +27,7 @@ public class Vec3D implements IPosition {
@@ -5260,7 +5260,7 @@ index 0c7f094e..62a08100 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 5a8271e3..2735b525 100644
+index 5a8271e31..2735b5252 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -977,6 +977,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -5283,7 +5283,7 @@ index 5a8271e3..2735b525 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index eda37fa4..69f99a99 100644
+index eda37fa43..69f99a993 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -64,4 +64,603 @@ public class PurpurWorldConfig {
@@ -5892,7 +5892,7 @@ index eda37fa4..69f99a99 100644
  }
 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 00000000..828e1b87
+index 000000000..828e1b873
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,75 @@
@@ -5973,7 +5973,7 @@ index 00000000..828e1b87
 +}
 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 00000000..0a5d6d46
+index 000000000..0a5d6d46c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,86 @@
@@ -6065,7 +6065,7 @@ index 00000000..0a5d6d46
 +}
 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 00000000..34912507
+index 000000000..349125070
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
 @@ -0,0 +1,53 @@
@@ -6124,7 +6124,7 @@ index 00000000..34912507
 +}
 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 00000000..f7537593
+index 000000000..f75375936
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
 @@ -0,0 +1,61 @@
@@ -6191,7 +6191,7 @@ index 00000000..f7537593
 +}
 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 00000000..e75e5806
+index 000000000..e75e58067
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 @@ -0,0 +1,43 @@
@@ -6240,7 +6240,7 @@ index 00000000..e75e5806
 +}
 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 00000000..7189cc56
+index 000000000..7189cc569
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java
 @@ -0,0 +1,119 @@
@@ -6365,7 +6365,7 @@ index 00000000..7189cc56
 +}
 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 00000000..f9e680ef
+index 000000000..f9e680efd
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java
 @@ -0,0 +1,126 @@
@@ -6497,7 +6497,7 @@ index 00000000..f9e680ef
 +}
 diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 new file mode 100644
-index 00000000..6e50344c
+index 000000000..6e50344c0
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 @@ -0,0 +1,21 @@
@@ -6523,7 +6523,7 @@ index 00000000..6e50344c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dfa15372..350aa675 100644
+index dfa15372b..350aa6754 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1057,4 +1057,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -6559,7 +6559,7 @@ index dfa15372..350aa675 100644
 +    // Purpur end
  }
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 0967ef42..7125c047 100644
+index 0967ef424..7125c0477 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1 +1,3 @@
diff --git a/patches/server/0019-Cows-eat-mushrooms.patch b/patches/server/0019-Cows-eat-mushrooms.patch
index 29c9449c6..eedf554d5 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0019-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 707495df9c96f138d460f413d17bf17916d02d8b Mon Sep 17 00:00:00 2001
+From 59166b4adddd81bd0000487ca5d07c6f360a8c90 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,7 +11,7 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e368fbc5..585ebc37 100644
+index 46d802a2f..d91c54fa9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1081,6 +1081,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index e368fbc5..585ebc37 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2626,6 +2627,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2627,6 +2628,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -31,7 +31,7 @@ index e368fbc5..585ebc37 100644
          this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 723a9fa1..f56fd7c0 100644
+index 723a9fa1e..f56fd7c01 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,7 +124,7 @@ index 723a9fa1..f56fd7c0 100644
      public EntityCow createChild(EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53925d52..01c0919f 100644
+index 53925d526..01c0919f6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2818,8 +2818,9 @@ public abstract class EntityLiving extends Entity {
@@ -140,7 +140,7 @@ index 53925d52..01c0919f 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 12fbdf65..091f3072 100644
+index 12fbdf65c..091f30727 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -145,10 +145,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 96%
rename from patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 3fcb247dc..80d566ba3 100644
--- a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From 6e163b10eb444f0fc0573636727586bf44298e98 Mon Sep 17 00:00:00 2001
+From 7eb5dc2697e63f21e355f411c5299e8427608824 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -13,7 +13,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
  6 files changed, 226 insertions(+), 11 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
-index f7344d3a..f6c0165f 100644
+index f7344d3ae..f6c0165f9 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -82,6 +82,7 @@ public class DamageSource {
@@ -25,7 +25,7 @@ index f7344d3a..f6c0165f 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 585ebc37..217ab1be 100644
+index d91c54fa9..0d5e942a0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1427,6 +1427,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 585ebc37..217ab1be 100644
              return null;
          } else if (this.world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index a57d0089..02952c3a 100644
+index a57d0089d..02952c3af 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 {
@@ -123,7 +123,7 @@ index a57d0089..02952c3a 100644
      @Override
      protected void b(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 9d331f9a..77b69cd3 100644
+index 777bc95ee..265077048 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -350,7 +350,7 @@ index 9d331f9a..77b69cd3 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 5135308f..89961900 100644
+index 5135308fb..899619009 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -34,6 +34,7 @@ public interface IEntityAccess {
@@ -362,23 +362,23 @@ index 5135308f..89961900 100644
          return this.a(oclass, axisalignedbb, IEntitySelector.f);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 12cd8196..e341c492 100644
+index 85692500b..c9b41cebd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -404,6 +404,9 @@ public class PurpurWorldConfig {
+@@ -402,6 +402,9 @@ public class PurpurWorldConfig {
+     public double phantomMaxY = 256D;
+     public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
-     public boolean phantomIgnoreCreative = false;
-     public boolean phantomOnlyAttackInsomniacs = false;
 +    public double phantomAttackedByCrystalRadius = 0.0D;
 +    public float phantomAttackedByCrystalDamage = 1.0F;
 +    public double phantomOrbitCrystalRadius = 0.0D;
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -413,6 +416,9 @@ public class PurpurWorldConfig {
+@@ -409,6 +412,9 @@ public class PurpurWorldConfig {
+         phantomMaxY = getDouble("mobs.phantom.ridable-max-y", phantomMaxY);
+         phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
-         phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative);
-         phantomOnlyAttackInsomniacs = getBoolean("mobs.phantom.only-attack-insomniacs", phantomOnlyAttackInsomniacs);
 +        phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
 +        phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
 +        phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
diff --git a/patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch b/patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch
deleted file mode 100644
index e7779fecf..000000000
--- a/patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 87ba5377e08f10cf3874e4acecbd7ead49386c53 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 18 May 2019 16:59:52 -0500
-Subject: [PATCH] Phantoms do not spawn on creative players
-
----
- src/main/java/net/minecraft/server/MobSpawnerPhantom.java | 2 +-
- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java      | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index f488c22ed6..748983da29 100644
---- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-@@ -31,7 +31,7 @@ public class MobSpawnerPhantom {
-                     while (iterator.hasNext()) {
-                         EntityHuman entityhuman = (EntityHuman) iterator.next();
- 
--                        if (!entityhuman.isSpectator()) {
-+                        if (!entityhuman.isSpectator() && (!worldserver.purpurConfig.phantomIgnoreCreative || !entityhuman.isCreative())) { // Purpur
-                             BlockPosition blockposition = new BlockPosition(entityhuman);
- 
-                             if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) {
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 85692500b4..451cc18b9a 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -402,6 +402,7 @@ public class PurpurWorldConfig {
-     public double phantomMaxY = 256D;
-     public float phantomFlameDamage = 1.0F;
-     public int phantomFlameFireTime = 8;
-+    public boolean phantomIgnoreCreative = false;
-     private void phantomSettings() {
-         phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
-         phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -409,6 +410,7 @@ public class PurpurWorldConfig {
-         phantomMaxY = getDouble("mobs.phantom.ridable-max-y", phantomMaxY);
-         phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
-         phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
-+        phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative);
-     }
- 
-     public boolean pigRidable = false;
--- 
-2.24.0
-
diff --git a/patches/server/0023-Phantoms-only-attack-insomniacs.patch b/patches/server/0023-Phantoms-only-attack-insomniacs.patch
deleted file mode 100644
index 13325fef0..000000000
--- a/patches/server/0023-Phantoms-only-attack-insomniacs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 8c7730ed54e2578797421ec8818d507e7f353bb8 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 29 Nov 2019 20:33:41 -0600
-Subject: [PATCH] Phantoms only attack insomniacs
-
----
- src/main/java/net/minecraft/server/EntityPhantom.java   | 1 +
- src/main/java/net/minecraft/server/IEntitySelector.java | 1 +
- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java    | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index c392085d0b..9d331f9ad6 100644
---- a/src/main/java/net/minecraft/server/EntityPhantom.java
-+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
-@@ -296,6 +296,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
-                         EntityHuman entityhuman = (EntityHuman) iterator.next();
- 
-                         if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {
-+                            if (!world.purpurConfig.phantomOnlyAttackInsomniacs || IEntitySelector.isInsomniac.test(entityhuman)) // Purpur
-                             EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
-                             return true;
-                         }
-diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index a2d1ef3602..e1fdee2794 100644
---- a/src/main/java/net/minecraft/server/IEntitySelector.java
-+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
-@@ -23,6 +23,7 @@ public final class IEntitySelector {
-     public static final Predicate<Entity> f = (entity) -> {
-         return !entity.isSpectator();
-     };
-+    public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.b(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Purpur
- 
-     public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
-         double d4 = d3 * d3;
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 451cc18b9a..12cd819635 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -403,6 +403,7 @@ public class PurpurWorldConfig {
-     public float phantomFlameDamage = 1.0F;
-     public int phantomFlameFireTime = 8;
-     public boolean phantomIgnoreCreative = false;
-+    public boolean phantomOnlyAttackInsomniacs = false;
-     private void phantomSettings() {
-         phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
-         phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -411,6 +412,7 @@ public class PurpurWorldConfig {
-         phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
-         phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
-         phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative);
-+        phantomOnlyAttackInsomniacs = getBoolean("mobs.phantom.only-attack-insomniacs", phantomOnlyAttackInsomniacs);
-     }
- 
-     public boolean pigRidable = false;
--- 
-2.24.0
-
diff --git a/patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch
similarity index 94%
rename from patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch
index 1caee0aa9..3cc369ba1 100644
--- a/patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch
@@ -1,4 +1,4 @@
-From 05b163485832610a992b81a1a7589887ac6eebbe Mon Sep 17 00:00:00 2001
+From d661297b2f62eea8c5b474b4ded7973ec8e026fd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman drop and put back pumpkin
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
  2 files changed, 21 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 941873513f..efc2205f7c 100644
+index 941873513..efc2205f7 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -47,10 +47,10 @@ index 941873513f..efc2205f7c 100644
              return tryRide(entityhuman, enumhand); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e341c492ed..0223c5de9a 100644
+index c9b41cebd..56b67c408 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -544,11 +544,15 @@ public class PurpurWorldConfig {
+@@ -540,11 +540,15 @@ public class PurpurWorldConfig {
      public boolean snowGolemRidableInWater = false;
      public boolean snowGolemRequireShiftToMount = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;
diff --git a/patches/server/0026-Ender-dragon-always-drop-egg.patch b/patches/server/0024-Ender-dragon-always-drop-egg.patch
similarity index 95%
rename from patches/server/0026-Ender-dragon-always-drop-egg.patch
rename to patches/server/0024-Ender-dragon-always-drop-egg.patch
index b4c03d3b3..3bf3602e4 100644
--- a/patches/server/0026-Ender-dragon-always-drop-egg.patch
+++ b/patches/server/0024-Ender-dragon-always-drop-egg.patch
@@ -1,4 +1,4 @@
-From dd9bb64c5e39f499d8016f1804c5f58dedc5e1a9 Mon Sep 17 00:00:00 2001
+From 902c04b41327f7db8aa12a85bae347e1969e2cf9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 04:42:57 -0600
 Subject: [PATCH] Ender dragon always drop egg
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop egg
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 687efa022d..ead3346072 100644
+index 687efa022..ead334607 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -21,7 +21,7 @@ public class EnderDragonBattle {
@@ -39,7 +39,7 @@ index 687efa022d..ead3346072 100644
          return this.l;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5744a65cce..abbbc0db59 100644
+index 56b67c408..cc6f8563b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -206,11 +206,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0027-Ender-dragon-always-drop-full-exp.patch b/patches/server/0025-Ender-dragon-always-drop-full-exp.patch
similarity index 94%
rename from patches/server/0027-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0025-Ender-dragon-always-drop-full-exp.patch
index 133f2f8b7..0b8efd8e6 100644
--- a/patches/server/0027-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0025-Ender-dragon-always-drop-full-exp.patch
@@ -1,4 +1,4 @@
-From 5a776e9ce515dbe009d4062eb92937946b9e8568 Mon Sep 17 00:00:00 2001
+From ec4c2b7e0bc52fbd36bbe6a011a5dbd0c6149d51 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender dragon always drop full exp
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop full exp
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e08b731d2c..baab056eff 100644
+index a6a79f5e9..336cf7da2 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -641,7 +641,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -22,7 +22,7 @@ index e08b731d2c..baab056eff 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index abbbc0db59..bc2f7c0846 100644
+index cc6f8563b..426e6f18b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -207,12 +207,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0028-Signs-editable-on-right-click.patch b/patches/server/0026-Signs-editable-on-right-click.patch
similarity index 94%
rename from patches/server/0028-Signs-editable-on-right-click.patch
rename to patches/server/0026-Signs-editable-on-right-click.patch
index e05a118d9..a8d405392 100644
--- a/patches/server/0028-Signs-editable-on-right-click.patch
+++ b/patches/server/0026-Signs-editable-on-right-click.patch
@@ -1,4 +1,4 @@
-From b5bc02a86c0e0a6e888e3a65ef1559a1d94c82a5 Mon Sep 17 00:00:00 2001
+From 4e4a23e39281ccb5cc11de0010520655acabd6ec Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 24 May 2019 02:39:25 -0500
 Subject: [PATCH] Signs editable on right click
@@ -10,7 +10,7 @@ Subject: [PATCH] Signs editable on right click
  3 files changed, 17 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
-index 8a31054a1d..d20849ce2b 100644
+index 8a31054a1..d20849ce2 100644
 --- a/src/main/java/net/minecraft/server/BlockSign.java
 +++ b/src/main/java/net/minecraft/server/BlockSign.java
 @@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
@@ -32,7 +32,7 @@ index 8a31054a1d..d20849ce2b 100644
              } else {
                  return EnumInteractionResult.PASS;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 0e9a90b70f..099d98e04c 100644
+index 0e9a90b70..099d98e04 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -109,6 +109,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -44,7 +44,7 @@ index 0e9a90b70f..099d98e04c 100644
          // Paper start
          //this.c = entityhuman;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bc2f7c0846..82b58225bd 100644
+index 426e6f18b..f098a36b5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -65,6 +65,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 91%
rename from patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index 00eaaf61f..f9fd128f6 100644
--- a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -1,4 +1,4 @@
-From 531799a2a2ac9ac2e708c1036ca2ea2f28de89f2 Mon Sep 17 00:00:00 2001
+From a0e02325c7e83ed45be41dee9d2d987e1f25f16d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 4 Jun 2019 15:50:08 -0500
 Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 4bb21c48bd..30f16db02c 100644
+index 4bb21c48b..30f16db02 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener {
diff --git a/patches/server/0030-Make-Iron-Golems-Swim.patch b/patches/server/0028-Make-Iron-Golems-Swim.patch
similarity index 93%
rename from patches/server/0030-Make-Iron-Golems-Swim.patch
rename to patches/server/0028-Make-Iron-Golems-Swim.patch
index 0f10a83cc..ed652c427 100644
--- a/patches/server/0030-Make-Iron-Golems-Swim.patch
+++ b/patches/server/0028-Make-Iron-Golems-Swim.patch
@@ -1,4 +1,4 @@
-From 7ef961aff34ea9ce4aa25a14c904582636207e8d Mon Sep 17 00:00:00 2001
+From 45691659f26a3ab5b01aad9dd042a01f425313c0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
  2 files changed, 3 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 288a043fbd..0cc3b8eb01 100644
+index 288a043fb..0cc3b8eb0 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -36,6 +36,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,7 +21,7 @@ index 288a043fbd..0cc3b8eb01 100644
          this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3b6ace7856..8810a596fb 100644
+index f098a36b5..a07781929 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -333,10 +333,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 95%
rename from patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch
index 275a19821..c872690a2 100644
--- a/patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -1,4 +1,4 @@
-From e23c594e222b52481a4e661bf8c5ac89a6f26755 Mon Sep 17 00:00:00 2001
+From 1bfeca54570f6b815f10b6b266761cb8c6a18ccc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 21 Jun 2019 14:37:10 -0500
 Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
  2 files changed, 12 insertions(+), 13 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
-index b6561f2c79..f2ab3ee011 100644
+index b6561f2c7..f2ab3ee01 100644
 --- a/src/main/java/net/minecraft/server/BlockSoil.java
 +++ b/src/main/java/net/minecraft/server/BlockSoil.java
 @@ -1,6 +1,5 @@
@@ -47,7 +47,7 @@ index b6561f2c79..f2ab3ee011 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8810a596fb..ecaa388a29 100644
+index a07781929..e2bda806e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -65,6 +65,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0032-Controllable-Minecarts.patch b/patches/server/0030-Controllable-Minecarts.patch
similarity index 98%
rename from patches/server/0032-Controllable-Minecarts.patch
rename to patches/server/0030-Controllable-Minecarts.patch
index fa661af10..3efaec9a0 100644
--- a/patches/server/0032-Controllable-Minecarts.patch
+++ b/patches/server/0030-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From 63787e2f49d0fa28e9c3b61034124abe70125732 Mon Sep 17 00:00:00 2001
+From df00076495ac61bf6978a5d5d1d66146d06ad231 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c730974ee..3bc4327a1 100644
+index 0d5e942a0..478ddf34e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1328,6 +1328,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -103,7 +103,7 @@ index b73e317fb..e1337a9c0 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ecaa388a2..0894523d7 100644
+index e2bda806e..f8992136a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,10 +1,16 @@
@@ -157,5 +157,5 @@ index ecaa388a2..0894523d7 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0033-Signs-allow-color-codes.patch b/patches/server/0031-Signs-allow-color-codes.patch
similarity index 95%
rename from patches/server/0033-Signs-allow-color-codes.patch
rename to patches/server/0031-Signs-allow-color-codes.patch
index 476dfe87a..10c318911 100644
--- a/patches/server/0033-Signs-allow-color-codes.patch
+++ b/patches/server/0031-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 5bb0a2beb7da572024b6526ed816483b03d0a8f1 Mon Sep 17 00:00:00 2001
+From e54170b6d577a2181df7e086192d6ce36f2b2e1e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Signs allow color codes
@@ -11,7 +11,7 @@ Subject: [PATCH] Signs allow color codes
  4 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8404fc4e..51933a49 100644
+index 8404fc4e3..51933a490 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1129,6 +1129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,7 +23,7 @@ index 8404fc4e..51933a49 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b62535ba..3c37d032 100644
+index b62535ba0..3c37d032c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2581,6 +2581,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index b62535ba..3c37d032 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 099d98e0..19d76c8c 100644
+index 099d98e04..19d76c8cc 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e0..19d76c8c 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0894523d..3c7f545e 100644
+index f8992136a..94744c78b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -76,8 +76,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0034-Campfires-have-regen-effect.patch b/patches/server/0032-Campfires-have-regen-effect.patch
similarity index 98%
rename from patches/server/0034-Campfires-have-regen-effect.patch
rename to patches/server/0032-Campfires-have-regen-effect.patch
index b3a472718..8f67e38d3 100644
--- a/patches/server/0034-Campfires-have-regen-effect.patch
+++ b/patches/server/0032-Campfires-have-regen-effect.patch
@@ -1,4 +1,4 @@
-From a8a28fa403a52296f962ecd52aed54289ec3c6a9 Mon Sep 17 00:00:00 2001
+From d4b3b26b599b3d303639c11b0acde523a9c518b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Campfires have regen effect
@@ -165,7 +165,7 @@ index a1580b8c6..618ca2d76 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3c7f545e2..3aa2da98b 100644
+index 94744c78b..d8d95d787 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -71,6 +71,29 @@ public class PurpurWorldConfig {
@@ -199,5 +199,5 @@ index 3c7f545e2..3aa2da98b 100644
      private void farmlandSettings() {
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch
similarity index 95%
rename from patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch
index 779de229a..1253b7a90 100644
--- a/patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch
@@ -1,4 +1,4 @@
-From 161985c2f3d69f5a509003d22dd54fd8a7ba0c8f Mon Sep 17 00:00:00 2001
+From f38570aa3c24eec676986a9ee59d73cf8da88bd1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 106fb5c027..0310e4ddd1 100644
+index fdc32d986..cf222a9a1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,7 +24,7 @@ index 106fb5c027..0310e4ddd1 100644
              deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3aa2da98b8..1072aa2e58 100644
+index d8d95d787..8c84431e5 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/0036-Campfires-burn-out-in-rain.patch b/patches/server/0034-Campfires-burn-out-in-rain.patch
similarity index 96%
rename from patches/server/0036-Campfires-burn-out-in-rain.patch
rename to patches/server/0034-Campfires-burn-out-in-rain.patch
index d69d7a6fc..b6beeb6d7 100644
--- a/patches/server/0036-Campfires-burn-out-in-rain.patch
+++ b/patches/server/0034-Campfires-burn-out-in-rain.patch
@@ -1,4 +1,4 @@
-From f0185947ca1047079b3b7e96d04a6747b4d2d795 Mon Sep 17 00:00:00 2001
+From 250c9ee434a431d4ca5623c9e68a19313647a657 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 21:30:49 -0500
 Subject: [PATCH] Campfires burn out in rain
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires burn out in rain
  3 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index b29ed1cfa7..d7911c3421 100644
+index b29ed1cfa..d7911c342 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -387,7 +387,7 @@ public class Block implements IMaterial {
@@ -23,7 +23,7 @@ index b29ed1cfa7..d7911c3421 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index 65f8d803b8..3b95dfaaae 100644
+index 65f8d803b..3b95dfaaa 100644
 --- a/src/main/java/net/minecraft/server/BlockCampfire.java
 +++ b/src/main/java/net/minecraft/server/BlockCampfire.java
 @@ -7,7 +7,7 @@ import javax.annotation.Nullable;
@@ -58,7 +58,7 @@ index 65f8d803b8..3b95dfaaae 100644
      public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
          if ((Boolean) iblockdata.get(BlockCampfire.d)) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1072aa2e58..6aa26a1974 100644
+index 8c84431e5..a761b2c73 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -81,6 +81,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0037-Campfires-should-fall-with-gravity.patch b/patches/server/0035-Campfires-should-fall-with-gravity.patch
similarity index 97%
rename from patches/server/0037-Campfires-should-fall-with-gravity.patch
rename to patches/server/0035-Campfires-should-fall-with-gravity.patch
index 49bc06c45..13b9e8673 100644
--- a/patches/server/0037-Campfires-should-fall-with-gravity.patch
+++ b/patches/server/0035-Campfires-should-fall-with-gravity.patch
@@ -1,4 +1,4 @@
-From c4efe79678a5f66e299642543477e7536add03bc Mon Sep 17 00:00:00 2001
+From 4d2fbaefcc562726397224c34fe477dfb4e0f640 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 16:20:21 -0500
 Subject: [PATCH] Campfires should fall with gravity
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires should fall with gravity
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index 3b95dfaaae..418fa6d1fe 100644
+index 3b95dfaaa..418fa6d1f 100644
 --- a/src/main/java/net/minecraft/server/BlockCampfire.java
 +++ b/src/main/java/net/minecraft/server/BlockCampfire.java
 @@ -9,7 +9,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -59,7 +59,7 @@ index 3b95dfaaae..418fa6d1fe 100644
  
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6aa26a1974..c6bf9395c1 100644
+index a761b2c73..d6405b2ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -82,6 +82,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0038-Dont-send-useless-entity-packets.patch b/patches/server/0036-Dont-send-useless-entity-packets.patch
similarity index 96%
rename from patches/server/0038-Dont-send-useless-entity-packets.patch
rename to patches/server/0036-Dont-send-useless-entity-packets.patch
index 2fa703a2d..c3425c2a8 100644
--- a/patches/server/0038-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0036-Dont-send-useless-entity-packets.patch
@@ -1,4 +1,4 @@
-From d3b9c34a0236d4c693f4917b495674f77d66700a Mon Sep 17 00:00:00 2001
+From c40b22f93084636469edffdd4fd697c371d85e6a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -10,7 +10,7 @@ Subject: [PATCH] Dont send useless entity packets
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 3a88c9a670..1f7c8f7da0 100644
+index 3a88c9a67..1f7c8f7da 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -162,6 +162,7 @@ public class EntityTrackerEntry {
@@ -45,7 +45,7 @@ index 3a88c9a670..1f7c8f7da0 100644
          this.tracker.c(entityplayer);
          entityplayer.c(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index e5da2b19c1..5b1d959354 100644
+index e5da2b19c..5b1d95935 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -5,11 +5,11 @@ import java.io.IOException;
@@ -66,7 +66,7 @@ index e5da2b19c1..5b1d959354 100644
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3ddd11219d..c8940f52b4 100644
+index 3ddd11219..c8940f52b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -143,6 +143,11 @@ public class PurpurConfig {
diff --git a/patches/server/0039-Implement-AFK-API.patch b/patches/server/0037-Implement-AFK-API.patch
similarity index 96%
rename from patches/server/0039-Implement-AFK-API.patch
rename to patches/server/0037-Implement-AFK-API.patch
index 5d0a58e31..c19adcc86 100644
--- a/patches/server/0039-Implement-AFK-API.patch
+++ b/patches/server/0037-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From abb33f41016157ea033dade6e81f3e7a87afe74e Mon Sep 17 00:00:00 2001
+From e1030e6d994303fd20f00b1729315ed0246d0985 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -18,7 +18,7 @@ Subject: [PATCH] Implement AFK API
  11 files changed, 111 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c211073e..9ff3e68e 100644
+index 478ddf34e..7658d257d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1420,6 +1420,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,7 +30,7 @@ index c211073e..9ff3e68e 100644
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 16ccabfd..5ac3c464 100644
+index 16ccabfd5..5ac3c4641 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -50,7 +50,7 @@ index 16ccabfd..5ac3c464 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 51933a49..a021c111 100644
+index 51933a490..a021c111c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -106,7 +106,7 @@ index 51933a49..a021c111 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 89961900..d9f246b8 100644
+index 899619009..d9f246b87 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -125,28 +125,18 @@ public interface IEntityAccess {
@@ -151,7 +151,7 @@ index 89961900..d9f246b8 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index e1fdee27..4665671e 100644
+index 1398c47a2..0bf1a14b7 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -165,13 +165,13 @@ index e1fdee27..4665671e 100644
 @@ -24,6 +25,7 @@ public final class IEntitySelector {
          return !entity.isSpectator();
      };
-     public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.b(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Purpur
+     public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.get(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
 +    public static Predicate<EntityHuman> notAfk = (player) -> !player.isAfk(); // Purpur
  
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3c37d032..c1a4697a 100644
+index 3c37d032c..c1a4697ae 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -224,6 +224,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -206,7 +206,7 @@ index 3c37d032..c1a4697a 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fe81529a..9b873948 100644
+index fe81529a9..9b8739485 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -393,7 +393,7 @@ public class WorldServer extends World {
@@ -228,7 +228,7 @@ index fe81529a..9b873948 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c6bf9395..76f8c8fe 100644
+index d6405b2ec..41dd1b861 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -138,6 +138,17 @@ public class PurpurWorldConfig {
@@ -250,7 +250,7 @@ index c6bf9395..76f8c8fe 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b76379a1..b7571d08 100644
+index b76379a17..b7571d086 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2079,4 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -276,7 +276,7 @@ index b76379a1..b7571d08 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 79581717..17c4d7ec 100644
+index 795817177..17c4d7ec9 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -146,6 +146,7 @@ public class ActivationRange
@@ -288,7 +288,7 @@ index 79581717..17c4d7ec 100644
              ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
              ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 7125c047..e925e137 100644
+index 7125c0477..e925e1374 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,3 +1,5 @@
diff --git a/patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 94%
rename from patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
index 3d24fe7b4..2cbc9e326 100644
--- a/patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,4 +1,4 @@
-From 778a063ca719b2f12b3072e0df639ad2222dbd71 Mon Sep 17 00:00:00 2001
+From cf80360efb42add4ff869ded9a9020bb15078434 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
  2 files changed, 5 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
-index 6b255e09ac..e1d3894ab7 100644
+index 6b255e09a..e1d3894ab 100644
 --- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 @@ -20,7 +20,10 @@ public class ItemMilkBucket extends Item {
@@ -24,7 +24,7 @@ index 6b255e09ac..e1d3894ab7 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 76f8c8fed1..8efb7a4e05 100644
+index 41dd1b861..7cbb1df7a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0041-Mending-mends-most-damages-equipment-first.patch b/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
similarity index 96%
rename from patches/server/0041-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0039-Mending-mends-most-damages-equipment-first.patch
index 60ff5963c..08102977a 100644
--- a/patches/server/0041-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
@@ -1,4 +1,4 @@
-From 78cc6fb2ce8d6f1d4087d72e19a7f4c8df1f3ca9 Mon Sep 17 00:00:00 2001
+From 7e6b03c7abf04a8166bff6569bcdf9e1cc760472 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
  4 files changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index d96c03a1a1..da1cfc1d3f 100644
+index d96c03a1a..da1cfc1d3 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,9 +246,32 @@ public class EnchantmentManager {
@@ -49,7 +49,7 @@ index d96c03a1a1..da1cfc1d3f 100644
      }
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 53c6c33892..0fae3693c9 100644
+index 53c6c3389..0fae3693c 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
@@ -62,7 +62,7 @@ index 53c6c33892..0fae3693c9 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 4730c2beb7..4fe5038083 100644
+index 4730c2beb..4fe503808 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -369,10 +369,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 4730c2beb7..4fe5038083 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 8efb7a4e05..0c70093483 100644
+index 7cbb1df7a..b76a8c5be 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -118,6 +118,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0042-Tulips-change-fox-type.patch b/patches/server/0040-Tulips-change-fox-type.patch
similarity index 96%
rename from patches/server/0042-Tulips-change-fox-type.patch
rename to patches/server/0040-Tulips-change-fox-type.patch
index feb2cf821..b1965d4db 100644
--- a/patches/server/0042-Tulips-change-fox-type.patch
+++ b/patches/server/0040-Tulips-change-fox-type.patch
@@ -1,4 +1,4 @@
-From 87309ca0a55c7724e2025a677f516340db6eca98 Mon Sep 17 00:00:00 2001
+From 901aac97fe69e840c4f2008dc91cdeb3fef88da3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -10,7 +10,7 @@ Subject: [PATCH] Tulips change fox type
  3 files changed, 34 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 4f53090d3d..13afd7bcde 100644
+index 4f53090d3..13afd7bcd 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal {
@@ -75,7 +75,7 @@ index 4f53090d3d..13afd7bcde 100644
      public void onMount(EntityHuman entityhuman) {
          super.onMount(entityhuman);
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 54670f64cf..9c9b93f280 100644
+index 54670f64c..9c9b93f28 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -106,8 +106,8 @@ public class Items {
@@ -90,7 +90,7 @@ index 54670f64cf..9c9b93f280 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c70093483..9579b477e6 100644
+index b76a8c5be..a2fce0c63 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -335,10 +335,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0043-Pillager-limits-and-leaders-chance.patch b/patches/server/0041-Pillager-limits-and-leaders-chance.patch
similarity index 94%
rename from patches/server/0043-Pillager-limits-and-leaders-chance.patch
rename to patches/server/0041-Pillager-limits-and-leaders-chance.patch
index 04a66e53b..a6ace00fa 100644
--- a/patches/server/0043-Pillager-limits-and-leaders-chance.patch
+++ b/patches/server/0041-Pillager-limits-and-leaders-chance.patch
@@ -1,4 +1,4 @@
-From 501c98000608351a241ef325d4c3ede31634ae33 Mon Sep 17 00:00:00 2001
+From 491effa3370a085885f8d7a3032af41df7da454c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Pillager limits and leaders chance
@@ -10,7 +10,7 @@ Subject: [PATCH] Pillager limits and leaders chance
  3 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index 70f43c5159..fa08b8e1ab 100644
+index 70f43c515..fa08b8e1a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -143,6 +143,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -22,7 +22,7 @@ index 70f43c5159..fa08b8e1ab 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
-index f44334b9e1..70559714ac 100644
+index f44334b9e..70559714a 100644
 --- a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
 +++ b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
 @@ -49,6 +49,7 @@ public abstract class EntityMonsterPatrolling extends EntityMonster {
@@ -47,10 +47,10 @@ index f44334b9e1..70559714ac 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9579b477e6..ee20c67b47 100644
+index a2fce0c63..299b080c8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -529,10 +529,16 @@ public class PurpurWorldConfig {
+@@ -525,10 +525,16 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public boolean pillagerRequireShiftToMount = true;
diff --git a/patches/server/0044-Make-the-GUI-better.patch b/patches/server/0042-Make-the-GUI-better.patch
similarity index 98%
rename from patches/server/0044-Make-the-GUI-better.patch
rename to patches/server/0042-Make-the-GUI-better.patch
index 5102438b6..0a5e99e5c 100644
--- a/patches/server/0044-Make-the-GUI-better.patch
+++ b/patches/server/0042-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From 03e79b62ec17cbe47c25460050c1921bc401f1d7 Mon Sep 17 00:00:00 2001
+From ef4c4982128b5370f583b664de07687d5bf73530 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 018def64..fe474e4e 100644
+index 018def64a..fe474e4eb 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -88,7 +88,7 @@ index 018def64..fe474e4e 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fc5ded95..bf8461ea 100644
+index fc5ded953..bf8461ea6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1339,6 +1339,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -101,7 +101,7 @@ index fc5ded95..bf8461ea 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 new file mode 100644
-index 00000000..973b5efe
+index 000000000..973b5efef
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 @@ -0,0 +1,123 @@
@@ -230,7 +230,7 @@ index 00000000..973b5efe
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
 new file mode 100644
-index 00000000..55feec81
+index 000000000..55feec811
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
 @@ -0,0 +1,81 @@
@@ -317,7 +317,7 @@ index 00000000..55feec81
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
 new file mode 100644
-index 00000000..fb017a07
+index 000000000..fb017a070
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
 @@ -0,0 +1,128 @@
@@ -451,7 +451,7 @@ index 00000000..fb017a07
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
 new file mode 100644
-index 00000000..4e0b80fd
+index 000000000..4e0b80fdd
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
 @@ -0,0 +1,21 @@
@@ -478,7 +478,7 @@ index 00000000..4e0b80fd
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 new file mode 100644
-index 00000000..c4903c7d
+index 000000000..c4903c7db
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 @@ -0,0 +1,42 @@
@@ -526,7 +526,7 @@ index 00000000..c4903c7d
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 new file mode 100644
-index 00000000..1e049d57
+index 000000000..1e049d575
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 @@ -0,0 +1,59 @@
@@ -591,7 +591,7 @@ index 00000000..1e049d57
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
 new file mode 100644
-index 00000000..2fdb9bdd
+index 000000000..2fdb9bdd0
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
 @@ -0,0 +1,44 @@
@@ -641,7 +641,7 @@ index 00000000..2fdb9bdd
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
 new file mode 100644
-index 00000000..85babad9
+index 000000000..85babad9c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
 @@ -0,0 +1,47 @@
@@ -694,7 +694,7 @@ index 00000000..85babad9
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
 new file mode 100644
-index 00000000..0c0c73be
+index 000000000..0c0c73bee
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
 @@ -0,0 +1,144 @@
@@ -844,7 +844,7 @@ index 00000000..0c0c73be
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
 new file mode 100644
-index 00000000..17e75a20
+index 000000000..17e75a207
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
 @@ -0,0 +1,57 @@
@@ -907,7 +907,7 @@ index 00000000..17e75a20
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
 new file mode 100644
-index 00000000..2f02e9ad
+index 000000000..2f02e9adc
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
 @@ -0,0 +1,22 @@
@@ -935,7 +935,7 @@ index 00000000..2f02e9ad
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
 new file mode 100644
-index 00000000..edbf4541
+index 000000000..edbf45416
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
 @@ -0,0 +1,47 @@
@@ -988,7 +988,7 @@ index 00000000..edbf4541
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
 new file mode 100644
-index 00000000..13a5eb3a
+index 000000000..13a5eb3ad
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
 @@ -0,0 +1,32 @@
@@ -1026,7 +1026,7 @@ index 00000000..13a5eb3a
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
 new file mode 100644
-index 00000000..973c8ddf
+index 000000000..973c8ddf9
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
 @@ -0,0 +1,54 @@
@@ -1086,7 +1086,7 @@ index 00000000..973c8ddf
 +}
 diff --git a/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 new file mode 100644
-index 00000000..4b340b88
+index 000000000..4b340b88a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 @@ -0,0 +1,86 @@
@@ -1177,7 +1177,7 @@ index 00000000..4b340b88
 +
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a9bb9876..4be7613d 100644
+index a9bb98765..4be7613d0 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,8 +1,17 @@
diff --git a/patches/server/0045-Players-should-not-cram-to-death.patch b/patches/server/0043-Players-should-not-cram-to-death.patch
similarity index 91%
rename from patches/server/0045-Players-should-not-cram-to-death.patch
rename to patches/server/0043-Players-should-not-cram-to-death.patch
index b59c7ecbd..991b1fb18 100644
--- a/patches/server/0045-Players-should-not-cram-to-death.patch
+++ b/patches/server/0043-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From 9fd719981b32ad81017b22ff1f3d3991b4ef27df Mon Sep 17 00:00:00 2001
+From b2e5b630186b78d553acbafa04382372ab65536d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,7 +8,7 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a021c111..28bbed56 100644
+index a021c111c..28bbed560 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1102,7 +1102,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0046-Add-EntityPortalReadyEvent.patch b/patches/server/0044-Add-EntityPortalReadyEvent.patch
similarity index 96%
rename from patches/server/0046-Add-EntityPortalReadyEvent.patch
rename to patches/server/0044-Add-EntityPortalReadyEvent.patch
index a543eb2ac..106e67c2e 100644
--- a/patches/server/0046-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0044-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 23c78ca9813b04abf15dc7020eb3ace7e1245505 Mon Sep 17 00:00:00 2001
+From 9789cabef2b4c2a0913ff7881b5d582f1eee1a44 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
  4 files changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index 09c7c131..6880cdd7 100644
+index 09c7c1318..6880cdd7f 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
 @@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 09c7c131..6880cdd7 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9ff3e68e..1f48643e 100644
+index 7658d257d..ac814f4ab 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 9ff3e68e..1f48643e 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2267,6 +2267,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2268,6 +2268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();
@@ -111,7 +111,7 @@ index 9ff3e68e..1f48643e 100644
                      if (this instanceof EntityPlayer) {
                          ((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index f84dd6d9..f50e9670 100644
+index f84dd6d9b..f50e9670b 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -141,7 +141,7 @@ index f84dd6d9..f50e9670 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9b873948..e1387ddc 100644
+index 9b8739485..e1387ddce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -75,7 +75,7 @@ public class WorldServer extends World {
diff --git a/patches/server/0047-Implement-elytra-settings.patch b/patches/server/0045-Implement-elytra-settings.patch
similarity index 96%
rename from patches/server/0047-Implement-elytra-settings.patch
rename to patches/server/0045-Implement-elytra-settings.patch
index adf29544c..d554ee5ff 100644
--- a/patches/server/0047-Implement-elytra-settings.patch
+++ b/patches/server/0045-Implement-elytra-settings.patch
@@ -1,4 +1,4 @@
-From 4506bcccff567bea72a7d6ce3ce1f9d69d74466c Mon Sep 17 00:00:00 2001
+From 8e2baf041cd18abd2f9179aea815ebd782ba3b45 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
  6 files changed, 49 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0310e4ddd1..e85a7526a2 100644
+index cf222a9a1..53f018232 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2645,9 +2645,16 @@ public abstract class EntityLiving extends Entity {
@@ -37,7 +37,7 @@ index 0310e4ddd1..e85a7526a2 100644
              } else {
                  flag = false;
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index bd524a35bb..c0e8cd0cdc 100644
+index bd524a35b..c0e8cd0cd 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -39,6 +39,14 @@ public class ItemFireworks extends Item {
@@ -56,7 +56,7 @@ index bd524a35bb..c0e8cd0cdc 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 4fe5038083..7b7a0a7cb1 100644
+index 4fe503808..7b7a0a7cb 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -401,7 +401,7 @@ public final class ItemStack {
@@ -82,7 +82,7 @@ index 4fe5038083..7b7a0a7cb1 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 f571a1586d..c26300eacd 100644
+index f571a1586..c26300eac 100644
 --- a/src/main/java/net/minecraft/server/ItemTrident.java
 +++ b/src/main/java/net/minecraft/server/ItemTrident.java
 @@ -100,6 +100,16 @@ public class ItemTrident extends Item {
@@ -103,7 +103,7 @@ index f571a1586d..c26300eacd 100644
                          entityhuman.r(20);
                          if (entityhuman.onGround) {
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index 62a0810062..53e7e82688 100644
+index 62a081006..53e7e8268 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -100,6 +100,7 @@ public class Vec3D implements IPosition {
@@ -115,7 +115,7 @@ index 62a0810062..53e7e82688 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0bfafa054d..0f0975e730 100644
+index 299b080c8..5318a8e32 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -142,6 +142,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0048-Add-blacklist-option-for-grindstone.patch b/patches/server/0046-Add-blacklist-option-for-grindstone.patch
similarity index 96%
rename from patches/server/0048-Add-blacklist-option-for-grindstone.patch
rename to patches/server/0046-Add-blacklist-option-for-grindstone.patch
index 52ee81f78..95387a6b7 100644
--- a/patches/server/0048-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0046-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From 7f2bd93c89a9c0a1465a0b794b35309e48bd95d1 Mon Sep 17 00:00:00 2001
+From d0c16f5f7ea30d85027a2613635851dd2a260e5e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone
@@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone
  3 files changed, 35 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index ed88e208d0..fcfb4abdc2 100644
+index ed88e208d..fcfb4abdc 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container {
@@ -51,7 +51,7 @@ index ed88e208d0..fcfb4abdc2 100644
                  Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
                  Iterator iterator = map.entrySet().iterator();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 7b7a0a7cb1..6b45bc17cf 100644
+index 7b7a0a7cb..6b45bc17c 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -541,6 +541,12 @@ public final class ItemStack {
@@ -68,7 +68,7 @@ index 7b7a0a7cb1..6b45bc17cf 100644
          return this.getItem().f(this);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 15f6113762..03c10d778e 100644
+index 5318a8e32..9c60855d6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;
diff --git a/patches/server/0049-Implement-lagging-threshold.patch b/patches/server/0047-Implement-lagging-threshold.patch
similarity index 94%
rename from patches/server/0049-Implement-lagging-threshold.patch
rename to patches/server/0047-Implement-lagging-threshold.patch
index 3ce314018..029cb6c91 100644
--- a/patches/server/0049-Implement-lagging-threshold.patch
+++ b/patches/server/0047-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From a56c11461734193592270049a9f3fa7ffcbfd6de Mon Sep 17 00:00:00 2001
+From 3d7ae0d5593860d30ebac5bae03d62286e808ed8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 14 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6c99c328b3..e620f7a74c 100644
+index bf8461ea6..8e46749e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index 6c99c328b3..e620f7a74c 100644
                      }
                      chunksTasksRan = 0; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c8940f52b4..d3729c0896 100644
+index c8940f52b..d3729c089 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -143,6 +143,11 @@ public class PurpurConfig {
@@ -46,7 +46,7 @@ index c8940f52b4..d3729c0896 100644
      private static void dontSendUselessEntityPackets() {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9cb6587489..5884816887 100644
+index 9cb658748..588481688 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2238,4 +2238,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0050-Implement-configurable-villager-brain-ticks.patch b/patches/server/0048-Implement-configurable-villager-brain-ticks.patch
similarity index 94%
rename from patches/server/0050-Implement-configurable-villager-brain-ticks.patch
rename to patches/server/0048-Implement-configurable-villager-brain-ticks.patch
index 059e7ea60..72fe29a26 100644
--- a/patches/server/0050-Implement-configurable-villager-brain-ticks.patch
+++ b/patches/server/0048-Implement-configurable-villager-brain-ticks.patch
@@ -1,4 +1,4 @@
-From 0a9ca74c6ac418b7a763f1f1782353b5468a513b Mon Sep 17 00:00:00 2001
+From 08f168160b083510875cc5185945570fc706ada7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
  2 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3eaac031fb..65cd5f53c1 100644
+index 3eaac031f..65cd5f53c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -40,10 +40,10 @@ index 3eaac031fb..65cd5f53c1 100644
          this.world.getMethodProfiler().exit();
          if (!this.et() && this.bB > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 03c10d778e..67e4cdfd21 100644
+index 9c60855d6..f1ed653b3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -741,10 +741,14 @@ public class PurpurWorldConfig {
+@@ -737,10 +737,14 @@ public class PurpurWorldConfig {
      public boolean villagerRidable = false;
      public boolean villagerRidableInWater = false;
      public boolean villagerRequireShiftToMount = true;
diff --git a/patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch
similarity index 92%
rename from patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
rename to patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch
index 93db440cd..14a43dd66 100644
--- a/patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
+++ b/patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch
@@ -1,4 +1,4 @@
-From a7cde93d882393149203f5a959a2ebc10f1b84c6 Mon Sep 17 00:00:00 2001
+From 9fff2923f2cbf3a4d1dc4a5a798fb64955352e1f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 8d1f04415e..95ae6f3494 100644
+index 8d1f04415..95ae6f349 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -64,7 +64,7 @@ public class EntityZombie extends EntityMonster {
@@ -22,10 +22,10 @@ index 8d1f04415e..95ae6f3494 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 67e4cdfd21..da12d94601 100644
+index f1ed653b3..114cd3f80 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -810,10 +810,12 @@ public class PurpurWorldConfig {
+@@ -806,10 +806,12 @@ public class PurpurWorldConfig {
      public boolean zombieRidable = false;
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;
diff --git a/patches/server/0052-Implement-bamboo-growth-settings.patch b/patches/server/0050-Implement-bamboo-growth-settings.patch
similarity index 97%
rename from patches/server/0052-Implement-bamboo-growth-settings.patch
rename to patches/server/0050-Implement-bamboo-growth-settings.patch
index a8227aa58..fd4696528 100644
--- a/patches/server/0052-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0050-Implement-bamboo-growth-settings.patch
@@ -1,4 +1,4 @@
-From e763204c910ac50b29391bcdd9f0310d903621a0 Mon Sep 17 00:00:00 2001
+From 5b9bc011ab97ef7aa3239b6d6bfc6bf078348768 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings
  2 files changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index 02c548dd9c..016ceebb9d 100644
+index 02c548dd9..016ceebb9 100644
 --- a/src/main/java/net/minecraft/server/BlockBamboo.java
 +++ b/src/main/java/net/minecraft/server/BlockBamboo.java
 @@ -10,7 +10,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -76,7 +76,7 @@ index 02c548dd9c..016ceebb9d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index da12d94601..829ab945fa 100644
+index 114cd3f80..61c19661c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -72,6 +72,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
index 168fd9a02..778116d37 100644
--- a/patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 2e3dcf0e698715fc0be5ae200482a177f8d81aac Mon Sep 17 00:00:00 2001
+From be6b447ecf903d1dddac136fdcdfb5de06a5c475 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1aadd8802..aefae74ec 100644
+index ac814f4ab..8304b42cc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1555,6 +1555,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +34,7 @@ index 1aadd8802..aefae74ec 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8ad131e4f..dfe8c57ce 100644
+index d35a0b2d9..d4aa9b24f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -138,7 +138,7 @@ index 7ba2f3a35..dd2cd7b21 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 4665671ef..fbf2a50f0 100644
+index 0bf1a14b7..9f5860ca8 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -36,11 +36,17 @@ public final class IEntitySelector {
@@ -161,7 +161,7 @@ index 4665671ef..fbf2a50f0 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 829ab945f..0d8276a69 100644
+index 61c19661c..1a2512b52 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -136,6 +136,7 @@ public class PurpurWorldConfig {
@@ -181,5 +181,5 @@ index 829ab945f..0d8276a69 100644
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
      }
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0054-Option-for-slimes-not-pushable.patch b/patches/server/0052-Option-for-slimes-not-pushable.patch
similarity index 94%
rename from patches/server/0054-Option-for-slimes-not-pushable.patch
rename to patches/server/0052-Option-for-slimes-not-pushable.patch
index 9419f14a9..724cd13f9 100644
--- a/patches/server/0054-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0052-Option-for-slimes-not-pushable.patch
@@ -1,4 +1,4 @@
-From a4dc0303af430efc90020a1f4251a55f3969e7e8 Mon Sep 17 00:00:00 2001
+From 20877fdbc1796d3c6472796bc64c8516cd69c0b5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable
@@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable
  3 files changed, 22 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index b29525c40d..1e72b3bbc5 100644
+index b29525c40..1e72b3bbc 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -332,6 +332,16 @@ public class BlockPiston extends BlockDirectional {
@@ -31,7 +31,7 @@ index b29525c40d..1e72b3bbc5 100644
  
              if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
-index 01f32659d9..52ab86f0b1 100644
+index 01f32659d..52ab86f0b 100644
 --- a/src/main/java/net/minecraft/server/BlockSlime.java
 +++ b/src/main/java/net/minecraft/server/BlockSlime.java
 @@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent {
@@ -47,7 +47,7 @@ index 01f32659d9..52ab86f0b1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d3729c0896..391fe7a512 100644
+index d3729c089..391fe7a51 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -153,6 +153,11 @@ public class PurpurConfig {
diff --git a/patches/server/0055-Bring-back-server-name.patch b/patches/server/0053-Bring-back-server-name.patch
similarity index 93%
rename from patches/server/0055-Bring-back-server-name.patch
rename to patches/server/0053-Bring-back-server-name.patch
index 87bf8484b..67638dfe3 100644
--- a/patches/server/0055-Bring-back-server-name.patch
+++ b/patches/server/0053-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From 1297e8eb5780abad9be724575bd5bfbbf8c84bef Mon Sep 17 00:00:00 2001
+From 0278db5aeb7c163d4d625fea962db96af0fe23d4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 0c3ec83570..309f5562b8 100644
+index 0c3ec8357..309f5562b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -21,7 +21,7 @@ index 0c3ec83570..309f5562b8 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5ecdea2ee0..6cebb2b7c1 100644
+index 588481688..6336ee903 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2240,6 +2240,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0056-Dispenser-curse-of-binding-protection.patch b/patches/server/0054-Dispenser-curse-of-binding-protection.patch
similarity index 94%
rename from patches/server/0056-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0054-Dispenser-curse-of-binding-protection.patch
index 64e9655cf..055911999 100644
--- a/patches/server/0056-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0054-Dispenser-curse-of-binding-protection.patch
@@ -1,4 +1,4 @@
-From 2f0031c31dbe4c083713f492881df9d1af366e65 Mon Sep 17 00:00:00 2001
+From ab6859b1dd1b906b4c268ae29f01824618083f52 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
@@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection
  3 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 00cbd99914..66b4831949 100644
+index a35459d09..84f208b8c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -913,6 +913,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -28,7 +28,7 @@ index 00cbd99914..66b4831949 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 df8c42bfbd..a4b3d0c298 100644
+index df8c42bfb..a4b3d0c29 100644
 --- a/src/main/java/net/minecraft/server/ItemArmor.java
 +++ b/src/main/java/net/minecraft/server/ItemArmor.java
 @@ -31,7 +31,7 @@ public class ItemArmor extends Item {
@@ -49,7 +49,7 @@ index df8c42bfbd..a4b3d0c298 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 0d8276a69c..f6e4b0d8b8 100644
+index 1a2512b52..b8754ba2d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0057-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0055-Implement-LivingEntity-safeFallDistance.patch
similarity index 94%
rename from patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
rename to patches/server/0055-Implement-LivingEntity-safeFallDistance.patch
index f121f588a..ccf02915b 100644
--- a/patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0055-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From ce75eeb888fd6a3636de0efc067796ea7f78acfc Mon Sep 17 00:00:00 2001
+From 25a125f8ba5cf577c9b5550d77eb62d321022b22 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:45 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
  4 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index 4296aaa074..a2e3e60012 100644
+index 4296aaa07..a2e3e6001 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -5,6 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
@@ -25,7 +25,7 @@ index 4296aaa074..a2e3e60012 100644
  
      // Purpur start
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 55e18e4c7a..b14f67b3a3 100644
+index 55e18e4c7..b14f67b3a 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -229,7 +229,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -38,7 +38,7 @@ index 55e18e4c7a..b14f67b3a3 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9f2b100735..e43d0eb5a2 100644
+index 006b498fd..c6a6befdc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {
@@ -59,7 +59,7 @@ index 9f2b100735..e43d0eb5a2 100644
  
      protected void cZ() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8ffa3cb059..3dd0faea79 100644
+index 8ffa3cb05..3dd0faea7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -739,4 +739,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 94%
rename from patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
index bbcf1bdb4..f427f963c 100644
--- a/patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,4 +1,4 @@
-From ced3a2e752fe3e6abc9d437c97908743ae1d135c Mon Sep 17 00:00:00 2001
+From 03c1819b749fc733b4a3a502286e33037187f2b8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for boats to eject players on land
  2 files changed, 3 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 563fc8ced0..479ed7c7bc 100644
+index 563fc8ced..479ed7c7b 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
@@ -21,7 +21,7 @@ index 563fc8ced0..479ed7c7bc 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 f6e4b0d8b8..ba9fc88048 100644
+index b8754ba2d..2271d13f1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -134,6 +134,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0059-Advancement-API-Additions.patch b/patches/server/0057-Advancement-API-Additions.patch
similarity index 96%
rename from patches/server/0059-Advancement-API-Additions.patch
rename to patches/server/0057-Advancement-API-Additions.patch
index f49a5c7e3..1c7ef8f8d 100644
--- a/patches/server/0059-Advancement-API-Additions.patch
+++ b/patches/server/0057-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 1c6389a654c0ddb4ee3d959e31d148e5f08f6702 Mon Sep 17 00:00:00 2001
+From d62e303f4790eeb5bed000ee1149ffbd093642bc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:33 -0500
 Subject: [PATCH] Advancement API Additions
@@ -14,7 +14,7 @@ Subject: [PATCH] Advancement API Additions
  create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 
 diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
-index 4b85551faf..4cba4187a0 100644
+index 4b85551fa..4cba4187a 100644
 --- a/src/main/java/net/minecraft/server/Advancement.java
 +++ b/src/main/java/net/minecraft/server/Advancement.java
 @@ -65,7 +65,7 @@ public class Advancement {
@@ -27,7 +27,7 @@ index 4b85551faf..4cba4187a0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
-index e8172d56fe..976c85ef1b 100644
+index e8172d56f..976c85ef1 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
 @@ -16,10 +16,11 @@ public class AdvancementDisplay {
@@ -75,7 +75,7 @@ index e8172d56fe..976c85ef1b 100644
          return this.h;
      }
 diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
-index a9c49a4348..551a845476 100644
+index a9c49a434..551a84547 100644
 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
 +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
 @@ -1,14 +1,25 @@
@@ -107,7 +107,7 @@ index a9c49a4348..551a845476 100644
          this.e = i;
          this.f = enumchatformat;
 diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
-index 4fe7324475..6e5d81daf1 100644
+index 4fe732447..6e5d81daf 100644
 --- a/src/main/java/net/minecraft/server/CriterionTrigger.java
 +++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
 @@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
@@ -119,7 +119,7 @@ index 4fe7324475..6e5d81daf1 100644
              return this.a;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-index a5aadf2850..b0a7092d62 100644
+index a5aadf285..b0a7092d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 @@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
@@ -136,7 +136,7 @@ index a5aadf2850..b0a7092d62 100644
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 new file mode 100644
-index 0000000000..1cbb1e67b6
+index 000000000..1cbb1e67b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 @@ -0,0 +1,47 @@
diff --git a/patches/server/0060-Add-option-to-set-armorstand-step-height.patch b/patches/server/0058-Add-option-to-set-armorstand-step-height.patch
similarity index 95%
rename from patches/server/0060-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0058-Add-option-to-set-armorstand-step-height.patch
index 2056470e2..80457d7af 100644
--- a/patches/server/0060-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0058-Add-option-to-set-armorstand-step-height.patch
@@ -1,4 +1,4 @@
-From ec8b550c4ebb69c5ac0fc03f5680ca0ccdfb4296 Mon Sep 17 00:00:00 2001
+From 97d8a3bb6a940699fdd07db6c75d5ac8d6122f03 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 6 Oct 2019 12:46:35 -0500
 Subject: [PATCH] Add option to set armorstand step height
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to set armorstand step height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index dfe8c57cef..0f6870a45c 100644
+index d4aa9b24f..d65544953 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index dfe8c57cef..0f6870a45c 100644
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ba9fc88048..8d99003a8a 100644
+index 2271d13f1..4bb5ddea4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -135,6 +135,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch b/patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch
similarity index 94%
rename from patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch
index bdd9cc253..dadc0f499 100644
--- a/patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From 0a08cbb8c7b36082fe6efccd46987055239b1bba Mon Sep 17 00:00:00 2001
+From c647a91f3e4077945915c9be571fa76205454887 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:36:55 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement ItemFactory#getMonsterEgg
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 24af4c11d6..8ef2c32236 100644
+index 24af4c11d..8ef2c3223 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@@ -22,7 +22,7 @@ index 24af4c11d6..8ef2c32236 100644
      private final int c;
      private final EntityTypes<?> d;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 23d7756456..29161032c3 100644
+index 23d775645..29161032c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -354,4 +354,18 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/patches/server/0062-Alternative-Keepalive-Handling.patch b/patches/server/0060-Alternative-Keepalive-Handling.patch
similarity index 97%
rename from patches/server/0062-Alternative-Keepalive-Handling.patch
rename to patches/server/0060-Alternative-Keepalive-Handling.patch
index 8d847db89..0b2128bfa 100644
--- a/patches/server/0062-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0060-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From ba1dd951e2191a25587df2d0c2a1e69cedfb2946 Mon Sep 17 00:00:00 2001
+From d74c2c524c0c2e234f1bbbed4b0eefb84e2baadd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
  3 files changed, 33 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
-index 8e93f154..470f92c4 100644
+index 8e93f1540..470f92c4f 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f154..470f92c4 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c1a4697a..7616d345 100644
+index c1a4697ae..7616d3450 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,7 +74,7 @@ index c1a4697a..7616d345 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 391fe7a5..bcd6837d 100644
+index 391fe7a51..bcd6837d4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -148,6 +148,11 @@ public class PurpurConfig {
diff --git a/patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 95%
rename from patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index 7228b0882..8c1735dbb 100644
--- a/patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From 6f8799eed41032695252fb7ed9bce9a9690f471a Mon Sep 17 00:00:00 2001
+From a5d30ae75a2e55a3450e8a09537268ea07b479b6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
  1 file changed, 14 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 8ef2c32236..237fdeda5c 100644
+index 8ef2c3223..237fdeda5 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -2,6 +2,11 @@ package net.minecraft.server;
diff --git a/patches/server/0064-Add-moon-phase-API.patch b/patches/server/0062-Add-moon-phase-API.patch
similarity index 90%
rename from patches/server/0064-Add-moon-phase-API.patch
rename to patches/server/0062-Add-moon-phase-API.patch
index 24c7ed12b..a3d2b8241 100644
--- a/patches/server/0064-Add-moon-phase-API.patch
+++ b/patches/server/0062-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From 15142ed5ebde0a586fd83ebae67ac21b655c5c83 Mon Sep 17 00:00:00 2001
+From 2817799d1f627d5209ed009920b175fe7342fdae Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:16 -0600
 Subject: [PATCH] Add moon phase API
@@ -8,7 +8,7 @@ Subject: [PATCH] Add moon phase API
  1 file changed, 8 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f56131e3a5..de8c2cd2bc 100644
+index f56131e3a..de8c2cd2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2457,6 +2457,14 @@ public class CraftWorld implements World {
diff --git a/patches/server/0065-Add-getPlacementBlockData-to-World.patch b/patches/server/0063-Add-getPlacementBlockData-to-World.patch
similarity index 95%
rename from patches/server/0065-Add-getPlacementBlockData-to-World.patch
rename to patches/server/0063-Add-getPlacementBlockData-to-World.patch
index a11ff9dfc..362026deb 100644
--- a/patches/server/0065-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0063-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 3fa528c754db8cd7bb8cf844a1c4eda8cce349f7 Mon Sep 17 00:00:00 2001
+From 26632de6df84bea67c2147f2e4e92e59ef6022f1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:30:17 -0600
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -12,7 +12,7 @@ Subject: [PATCH] Add getPlacementBlockData to World
  create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java
 
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 69d04f6cbf..901d45f284 100644
+index 69d04f6cb..901d45f28 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -57,6 +57,7 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -25,7 +25,7 @@ index 69d04f6cbf..901d45f284 100644
          return i;
 diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
 new file mode 100644
-index 0000000000..7dc68ffe92
+index 000000000..7dc68ffe9
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -53,7 +53,7 @@ index 0000000000..7dc68ffe92
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 9c9b93f280..74a722cce5 100644
+index 9c9b93f28..74a722cce 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -155,7 +155,7 @@ public class Items {
@@ -66,7 +66,7 @@ index 9c9b93f280..74a722cce5 100644
      public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index de8c2cd2bc..0f5bd0a17a 100644
+index de8c2cd2b..0f5bd0a17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2463,6 +2463,11 @@ public class CraftWorld implements World {
diff --git a/patches/server/0066-Barrels-have-6-rows.patch b/patches/server/0064-Barrels-have-6-rows.patch
similarity index 95%
rename from patches/server/0066-Barrels-have-6-rows.patch
rename to patches/server/0064-Barrels-have-6-rows.patch
index 7f2587abe..91b4ebde8 100644
--- a/patches/server/0066-Barrels-have-6-rows.patch
+++ b/patches/server/0064-Barrels-have-6-rows.patch
@@ -1,4 +1,4 @@
-From 14a292ed71211ddc7ce139d495d826ac05a02885 Mon Sep 17 00:00:00 2001
+From f624c79c8e312166091064aed96516a7b29565be Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Barrels have 6 rows
@@ -10,7 +10,7 @@ Subject: [PATCH] Barrels have 6 rows
  3 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
-index 1e27abbea0..ca3b6c9aae 100644
+index 1e27abbea..ca3b6c9aa 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
 @@ -54,7 +54,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -40,7 +40,7 @@ index 1e27abbea0..ca3b6c9aae 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bcd6837d46..7ce48323ae 100644
+index bcd6837d4..7ce48323a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -69,7 +69,7 @@ index bcd6837d46..7ce48323ae 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 4f43f87cd4..9f05b76ff7 100644
+index 4f43f87cd..9f05b76ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 @@ -195,8 +195,10 @@ public class CraftContainer extends Container {
diff --git a/patches/server/0067-Enderchest-6-rows-plus-permissions.patch b/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
similarity index 96%
rename from patches/server/0067-Enderchest-6-rows-plus-permissions.patch
rename to patches/server/0065-Enderchest-6-rows-plus-permissions.patch
index 80c389773..e76a7e5b6 100644
--- a/patches/server/0067-Enderchest-6-rows-plus-permissions.patch
+++ b/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
@@ -1,4 +1,4 @@
-From a846ead72d1914e2ab5c8bf0d8d428631070cfc4 Mon Sep 17 00:00:00 2001
+From 99b883897a80f23e309dd7b6769b5ef0f9350432 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Enderchest 6 rows (plus permissions)
@@ -13,7 +13,7 @@ Subject: [PATCH] Enderchest 6 rows (plus permissions)
  6 files changed, 40 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
-index 0a892a5f1a..e7ef571dc5 100644
+index 0a892a5f1..e7ef571dc 100644
 --- a/src/main/java/net/minecraft/server/BlockEnderChest.java
 +++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
 @@ -48,6 +48,27 @@ public class BlockEnderChest extends BlockChestAbstract<TileEntityEnderChest> im
@@ -45,7 +45,7 @@ index 0a892a5f1a..e7ef571dc5 100644
                  }, BlockEnderChest.e));
                  entityhuman.a(StatisticList.OPEN_ENDERCHEST);
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index fd31b9a6dc..903c02e9ef 100644
+index fd31b9a6d..903c02e9e 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
@@ -58,7 +58,7 @@ index fd31b9a6dc..903c02e9ef 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7ce48323ae..16f5c9d372 100644
+index 7ce48323a..16f5c9d37 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -161,14 +161,22 @@ public class PurpurConfig {
@@ -85,7 +85,7 @@ index 7ce48323ae..16f5c9d372 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 9f05b76ff7..4dc632d917 100644
+index 9f05b76ff..4dc632d91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 @@ -195,7 +195,7 @@ public class CraftContainer extends Container {
@@ -98,7 +98,7 @@ index 9f05b76ff7..4dc632d917 100644
              case BARREL:
                  delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 026a0c3995..d2c06cff2c 100644
+index 026a0c399..d2c06cff2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {
@@ -111,7 +111,7 @@ index 026a0c3995..d2c06cff2c 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-index d936b9284e..d7b1b56d94 100644
+index d936b9284..d7b1b56d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 @@ -17,6 +17,14 @@ public final class CraftDefaultPermissions {
diff --git a/patches/server/0068-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
similarity index 96%
rename from patches/server/0068-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0066-Add-5-second-tps-average-in-tps.patch
index 58ead63ec..06bdbf032 100644
--- a/patches/server/0068-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From b604e2f51da67f811f2ea1b5988dec4288a427a7 Mon Sep 17 00:00:00 2001
+From 7e4cb3692a876a403dad9dbdf2d2a191b52c59cd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e620f7a74c..64aeaaaec1 100644
+index 8e46749e3..1c2153e1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,7 +52,7 @@ index e620f7a74c..64aeaaaec1 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 6336ee903c..39e8a5b149 100644
+index 6336ee903..39e8a5b14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2050,6 +2050,7 @@ public final class CraftServer implements Server {
@@ -64,7 +64,7 @@ index 6336ee903c..39e8a5b149 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 6d21c32692..2eed9d0a4a 100644
+index 6d21c3269..2eed9d0a4 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -30,7 +30,7 @@ public class TicksPerSecondCommand extends Command
diff --git a/patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0067-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 90%
rename from patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0067-Add-playPickupItemAnimation-to-LivingEntity.patch
index 19dc6d765..43eb58347 100644
--- a/patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0067-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 8741452b0b07fd1a96886e9aca6298a3ed699cf6 Mon Sep 17 00:00:00 2001
+From 2752e497629793d493d817e168f6a3d3b7bb3146 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:16 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -8,7 +8,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3dd0faea79..48f66b0c1b 100644
+index 3dd0faea7..48f66b0c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -750,5 +750,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0070-Add-more-evoker-API.patch b/patches/server/0068-Add-more-evoker-API.patch
similarity index 94%
rename from patches/server/0070-Add-more-evoker-API.patch
rename to patches/server/0068-Add-more-evoker-API.patch
index e57ad8494..a666bcdf6 100644
--- a/patches/server/0070-Add-more-evoker-API.patch
+++ b/patches/server/0068-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From 4ffdac06240625be0d492cdca14d3decda4fd3d5 Mon Sep 17 00:00:00 2001
+From 158909227dd0d495ece2f61db7adb8a4b16bee65 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:29:02 -0500
 Subject: [PATCH] Add more evoker API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add more evoker API
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 179a261296..e7d0d0f5e3 100644
+index 179a26129..e7d0d0f5e 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -102,12 +102,14 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -30,7 +30,7 @@ index 179a261296..e7d0d0f5e3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-index 0636d26473..4ccb938909 100644
+index 0636d2647..4ccb93890 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 @@ -36,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
diff --git a/patches/server/0071-Add-API-for-Villager-resetOffers.patch b/patches/server/0069-Add-API-for-Villager-resetOffers.patch
similarity index 93%
rename from patches/server/0071-Add-API-for-Villager-resetOffers.patch
rename to patches/server/0069-Add-API-for-Villager-resetOffers.patch
index 41aed143b..58f12ba89 100644
--- a/patches/server/0071-Add-API-for-Villager-resetOffers.patch
+++ b/patches/server/0069-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From d223e8233143f9da1f6fd2957ebf01d0da2bc274 Mon Sep 17 00:00:00 2001
+From 6a896c990bd53be67e99f1d797397c4af71bbc2f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:37 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
@@ -9,7 +9,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
  2 files changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index 9b75c67c72..ddd19aa2f9 100644
+index 9b75c67c7..ddd19aa2f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -82,6 +82,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
@@ -35,7 +35,7 @@ index 9b75c67c72..ddd19aa2f9 100644
  
      protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index a73ebaa75f..ac89ed9377 100644
+index a73ebaa75..ac89ed937 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -112,4 +112,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
diff --git a/patches/server/0072-Add-more-llama-API.patch b/patches/server/0070-Add-more-llama-API.patch
similarity index 97%
rename from patches/server/0072-Add-more-llama-API.patch
rename to patches/server/0070-Add-more-llama-API.patch
index bfad51db9..a26306be5 100644
--- a/patches/server/0072-Add-more-llama-API.patch
+++ b/patches/server/0070-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From f132a8efa42e3d7d67c5b857b31e7d22c980eb6b Mon Sep 17 00:00:00 2001
+From 6a7bfa1e3b358bef374f994a8642a15e52c4a863 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API
  3 files changed, 61 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 7a4e64a3d0..5761797568 100644
+index 7a4e64a3d..576179756 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -80,7 +80,7 @@ index 7a4e64a3d0..5761797568 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index e181d83505..8376f1dc4e 100644
+index e181d8350..8376f1dc4 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 @@ -6,7 +6,7 @@ import java.util.List;
@@ -109,7 +109,7 @@ index e181d83505..8376f1dc4e 100644
              double d0 = this.a.h((Entity) this.a.fe());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 3f94c5a920..a027634801 100644
+index 3f94c5a92..a02763480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE
diff --git a/patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
similarity index 93%
rename from patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
rename to patches/server/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
index b6549ae14..7b0167e87 100644
--- a/patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
+++ b/patches/server/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
@@ -1,4 +1,4 @@
-From 40669ce1b8be64c6d5ccdfa665b0d3116041ba30 Mon Sep 17 00:00:00 2001
+From 2f6624651e9da6e2678422f7d7e2b1f9488182dc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:36:52 -0500
 Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index d5432bfeb7..91ef7ac60f 100644
+index d5432bfeb..91ef7ac60 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -291,8 +291,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
diff --git a/patches/server/0074-Implement-infinite-lava.patch b/patches/server/0072-Implement-infinite-lava.patch
similarity index 94%
rename from patches/server/0074-Implement-infinite-lava.patch
rename to patches/server/0072-Implement-infinite-lava.patch
index 0f043f766..9033b1a5a 100644
--- a/patches/server/0074-Implement-infinite-lava.patch
+++ b/patches/server/0072-Implement-infinite-lava.patch
@@ -1,4 +1,4 @@
-From df729107182ad0052f70bf0cfd02d6e232d55177 Mon Sep 17 00:00:00 2001
+From c5f0bfa6ad647ce02b358ec73c626c7764cc31f9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite lava
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement infinite lava
  4 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 376dca1889..1a14fe4a24 100644
+index 376dca188..1a14fe4a2 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -219,7 +219,7 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -39,7 +39,7 @@ index 376dca1889..1a14fe4a24 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 d25368d032..09f82c2d92 100644
+index d25368d03..09f82c2d9 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -57,7 +57,7 @@ index d25368d032..09f82c2d92 100644
      protected boolean f() {
          return false;
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 9eba9a12c0..39252e6873 100644
+index 9eba9a12c..39252e687 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -70,7 +70,7 @@ index 9eba9a12c0..39252e6873 100644
      protected boolean c;
      protected boolean d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8d99003a8a..fc7c9dd37e 100644
+index 4bb5ddea4..5b042a609 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0075-Expose-getItemStack-for-Trident.patch b/patches/server/0073-Expose-getItemStack-for-Trident.patch
similarity index 91%
rename from patches/server/0075-Expose-getItemStack-for-Trident.patch
rename to patches/server/0073-Expose-getItemStack-for-Trident.patch
index 58dca413b..00e0dd9ce 100644
--- a/patches/server/0075-Expose-getItemStack-for-Trident.patch
+++ b/patches/server/0073-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From cfd4aa008264358a6f6fc5d7d20ea38201a8c680 Mon Sep 17 00:00:00 2001
+From fb44db28da16cad32d682bea2cf5f862d2b97c14 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:40 -0500
 Subject: [PATCH] Expose getItemStack for Trident
@@ -9,7 +9,7 @@ Subject: [PATCH] Expose getItemStack for Trident
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index 59bb039ad7..ed8e26aa45 100644
+index 59bb039ad..ed8e26aa4 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
 @@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow {
@@ -22,7 +22,7 @@ index 59bb039ad7..ed8e26aa45 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index 0518e6c683..63287a9b65 100644
+index 0518e6c68..63287a9b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 @@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident {
diff --git a/patches/server/0076-Despawn-egg-hatches-chicken.patch b/patches/server/0074-Despawn-egg-hatches-chicken.patch
similarity index 95%
rename from patches/server/0076-Despawn-egg-hatches-chicken.patch
rename to patches/server/0074-Despawn-egg-hatches-chicken.patch
index 7420da69b..0b2cb8db5 100644
--- a/patches/server/0076-Despawn-egg-hatches-chicken.patch
+++ b/patches/server/0074-Despawn-egg-hatches-chicken.patch
@@ -1,4 +1,4 @@
-From 4e2292cc6672a7442bbac64c454aeab43c11aa95 Mon Sep 17 00:00:00 2001
+From 7c95ef89786835589980d6a568dadcc9157a710c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 23:47:42 -0600
 Subject: [PATCH] Despawn egg hatches chicken
@@ -9,7 +9,7 @@ Subject: [PATCH] Despawn egg hatches chicken
  2 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 2926fbb957..bbb9ca1efc 100644
+index 2926fbb95..bbb9ca1ef 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -165,6 +165,27 @@ public class EntityItem extends Entity {
@@ -41,7 +41,7 @@ index 2926fbb957..bbb9ca1efc 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fc7c9dd37e..71872a3fe7 100644
+index 5b042a609..647bece31 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -262,11 +262,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 8573af881..1a7c8db05 100644
--- a/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From 609f674f3c194a3670547f1f589427812e72f504 Mon Sep 17 00:00:00 2001
+From 2adf96c0f743957fecd4e8bb4bd47c7b02182a8a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ba08855b1c..f7f584f981 100644
+index 2735b5252..2c940b42d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1419,8 +1419,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -25,7 +25,7 @@ index ba08855b1c..f7f584f981 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f5bd0a17a..b9b23c9803 100644
+index 0f5bd0a17..b9b23c980 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -383,12 +383,16 @@ public class CraftWorld implements World {
diff --git a/patches/server/0078-Add-sleep-options.patch b/patches/server/0076-Add-sleep-options.patch
similarity index 96%
rename from patches/server/0078-Add-sleep-options.patch
rename to patches/server/0076-Add-sleep-options.patch
index b3f57882e..a80185485 100644
--- a/patches/server/0078-Add-sleep-options.patch
+++ b/patches/server/0076-Add-sleep-options.patch
@@ -1,4 +1,4 @@
-From 13de5fcae50a95059fdc72e167bdf5e7d53202b9 Mon Sep 17 00:00:00 2001
+From 71159c88e6b9e9af5880fb437dc45b1b6928eec1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
  2 files changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5ac3c464..ed0a559f 100644
+index 5ac3c4641..ed0a559f9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -53,7 +53,7 @@ index 5ac3c464..ed0a559f 100644
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 71872a3f..44786e1f 100644
+index 647bece31..08fb0bae3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -150,6 +150,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0079-Option-for-hay-block-fall-damage.patch b/patches/server/0077-Option-for-hay-block-fall-damage.patch
similarity index 91%
rename from patches/server/0079-Option-for-hay-block-fall-damage.patch
rename to patches/server/0077-Option-for-hay-block-fall-damage.patch
index 26f50f9ab..a450a49d6 100644
--- a/patches/server/0079-Option-for-hay-block-fall-damage.patch
+++ b/patches/server/0077-Option-for-hay-block-fall-damage.patch
@@ -1,4 +1,4 @@
-From 24f1c083e54f296ccd53e0c171b45624c3bbc191 Mon Sep 17 00:00:00 2001
+From a6f7c9e48a65b0bee86ae28043c625c52ffd5975 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 01:31:09 -0600
 Subject: [PATCH] Option for hay block fall damage
@@ -9,7 +9,7 @@ Subject: [PATCH] Option for hay block fall damage
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java
-index ca81c49f0a..1f8f60542f 100644
+index ca81c49f0..1f8f60542 100644
 --- a/src/main/java/net/minecraft/server/BlockHay.java
 +++ b/src/main/java/net/minecraft/server/BlockHay.java
 @@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable {
@@ -21,7 +21,7 @@ index ca81c49f0a..1f8f60542f 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 44786e1fc9..c3c76a6fca 100644
+index 08fb0bae3..a4a09874f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 95%
rename from patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/server/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index 0e5efa3dd..37346df1e 100644
--- a/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/server/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From 10e1c72edc119d3f1f752985935291ac0fba854b Mon Sep 17 00:00:00 2001
+From 5bcccabbaed8c0dad6d1540355a1671c84857868 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:35 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 37626f925f..f8fd2d99cc 100644
+index 37626f925..f8fd2d99c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -2,7 +2,8 @@ package net.minecraft.server;
diff --git a/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0079-Add-LootableInventoryFirstFillEvent.patch
similarity index 94%
rename from patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
rename to patches/server/0079-Add-LootableInventoryFirstFillEvent.patch
index 682a32427..45026a6e9 100644
--- a/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/server/0079-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From 2c820399a19585925137de9ec871152990cb9c2a Mon Sep 17 00:00:00 2001
+From 777ed70875da2cdd96612f950004769d586d1271 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:17 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent
@@ -9,7 +9,7 @@ Subject: [PATCH] Add LootableInventoryFirstFillEvent
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-index b5401eaf97..1decf0e895 100644
+index b5401eaf9..1decf0e89 100644
 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -49,6 +49,10 @@ public class PaperLootableInventoryData {
@@ -24,7 +24,7 @@ index b5401eaf97..1decf0e895 100644
          }
  
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index d50410532c..2f24e5a702 100644
+index d50410532..2f24e5a70 100644
 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -57,7 +57,10 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
diff --git a/patches/server/0082-Villagers-follow-emerald-blocks.patch b/patches/server/0080-Villagers-follow-emerald-blocks.patch
similarity index 94%
rename from patches/server/0082-Villagers-follow-emerald-blocks.patch
rename to patches/server/0080-Villagers-follow-emerald-blocks.patch
index 63beb7619..a2e30e67f 100644
--- a/patches/server/0082-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0080-Villagers-follow-emerald-blocks.patch
@@ -1,4 +1,4 @@
-From a90f4a9dba663021b3a5f81fd49bc87d8b8e8cbc Mon Sep 17 00:00:00 2001
+From 0f4f4180db3ff70afccd1610aa4de88a2fbd9aaa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
@@ -11,7 +11,7 @@ Subject: [PATCH] Villagers follow emerald blocks
  4 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 65cd5f53c1..b31f614e6b 100644
+index 65cd5f53c..b31f614e6 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -89,6 +89,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index 65cd5f53c1..b31f614e6b 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index ddd19aa2f9..44947be833 100644
+index ddd19aa2f..44947be83 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -13,7 +13,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index ddd19aa2f9..44947be833 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 4e9c5e84a9..14ca5fc367 100644
+index 4e9c5e84a..14ca5fc36 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -57,6 +57,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,10 +48,10 @@ index 4e9c5e84a9..14ca5fc367 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 c3c76a6fca..3cb3bcfe13 100644
+index a4a09874f..7d2c51a2f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -779,21 +779,25 @@ public class PurpurWorldConfig {
+@@ -775,21 +775,25 @@ public class PurpurWorldConfig {
      public boolean villagerRequireShiftToMount = true;
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
diff --git a/patches/server/0083-Add-player-death-exp-control-options.patch b/patches/server/0081-Add-player-death-exp-control-options.patch
similarity index 96%
rename from patches/server/0083-Add-player-death-exp-control-options.patch
rename to patches/server/0081-Add-player-death-exp-control-options.patch
index 7d062bb5f..7db942b35 100644
--- a/patches/server/0083-Add-player-death-exp-control-options.patch
+++ b/patches/server/0081-Add-player-death-exp-control-options.patch
@@ -1,4 +1,4 @@
-From 78d2895b762b6a40bb6f1a23ff62f699155aa69c Mon Sep 17 00:00:00 2001
+From e77c9cf935556cb76bd3173aba0a3f69e504745f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
  2 files changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ed0a559f..8c6556fe 100644
+index ed0a559f9..8c6556feb 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1866,9 +1866,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,7 +35,7 @@ index ed0a559f..8c6556fe 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3cb3bcfe..1fcdb4e2 100644
+index 7d2c51a2f..caf7f0e84 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -155,6 +155,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0084-Add-permission-for-F3-N-debug.patch b/patches/server/0082-Add-permission-for-F3-N-debug.patch
similarity index 89%
rename from patches/server/0084-Add-permission-for-F3-N-debug.patch
rename to patches/server/0082-Add-permission-for-F3-N-debug.patch
index 090b9a634..b5dc58e6a 100644
--- a/patches/server/0084-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0082-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From 2c7a0df6ac9e889dfc14b8d8871efe457a8f9cd1 Mon Sep 17 00:00:00 2001
+From 60c4508cd2034759e296bf8ba858b41aa3d000ee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
@@ -8,7 +8,7 @@ Subject: [PATCH] Add permission for F3+N debug
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index eaba3cbf..8178fa96 100644
+index eaba3cbf0..8178fa960 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -969,6 +969,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0085-Allow-leashing-villagers.patch b/patches/server/0083-Allow-leashing-villagers.patch
similarity index 94%
rename from patches/server/0085-Allow-leashing-villagers.patch
rename to patches/server/0083-Allow-leashing-villagers.patch
index 092f6a7d4..d2f2d5ec8 100644
--- a/patches/server/0085-Allow-leashing-villagers.patch
+++ b/patches/server/0083-Allow-leashing-villagers.patch
@@ -1,4 +1,4 @@
-From a00211ce54c21d1d437c8f32cae87c491e97ed16 Mon Sep 17 00:00:00 2001
+From 94127dca0a0963c23bb5528cf16734421885c60a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -11,7 +11,7 @@ Subject: [PATCH] Allow leashing villagers
  4 files changed, 19 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 66b4831949..bac6cea1ff 100644
+index 84f208b8c..6a9d0ef0e 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -23,7 +23,7 @@ index 66b4831949..bac6cea1ff 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 b31f614e6b..315440b3fb 100644
+index b31f614e6..315440b3f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -1006,4 +1006,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index b31f614e6b..315440b3fb 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 14ca5fc367..427c589075 100644
+index 14ca5fc36..427c58907 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -283,4 +283,11 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1fcdb4e28d..f1f6618709 100644
+index caf7f0e84..284054db4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -784,6 +784,7 @@ public class PurpurWorldConfig {
+@@ -780,6 +780,7 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
@@ -66,7 +66,7 @@ index 1fcdb4e28d..f1f6618709 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -791,17 +792,20 @@ public class PurpurWorldConfig {
+@@ -787,17 +788,20 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
diff --git a/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 91%
rename from patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch
index 5ab2b4c53..c4202a795 100644
--- a/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch
@@ -1,4 +1,4 @@
-From c70d6a36530234215d99fdd091ef464ed2d0bcb4 Mon Sep 17 00:00:00 2001
+From 6c92ee4961a37a0a09521f8d0231b305f7efa90e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
  2 files changed, 5 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 315440b3fb..fe0e646ea6 100644
+index 315440b3f..fe0e646ea 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -903,6 +903,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -22,10 +22,10 @@ index 315440b3fb..fe0e646ea6 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f1f6618709..89a2faab38 100644
+index 284054db4..f60c4b629 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -785,6 +785,8 @@ public class PurpurWorldConfig {
+@@ -781,6 +781,8 @@ public class PurpurWorldConfig {
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -34,7 +34,7 @@ index f1f6618709..89a2faab38 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -793,6 +795,8 @@ public class PurpurWorldConfig {
+@@ -789,6 +791,8 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
diff --git a/patches/server/0087-Make-lava-flow-speed-configurable.patch b/patches/server/0085-Make-lava-flow-speed-configurable.patch
similarity index 93%
rename from patches/server/0087-Make-lava-flow-speed-configurable.patch
rename to patches/server/0085-Make-lava-flow-speed-configurable.patch
index 27cdfee96..debea11cc 100644
--- a/patches/server/0087-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0085-Make-lava-flow-speed-configurable.patch
@@ -1,4 +1,4 @@
-From e17415b9f704b89e86e3a491076179f866020c48 Mon Sep 17 00:00:00 2001
+From bb5eee99341679c5a44a93551162e96258b1ca54 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
@@ -10,7 +10,7 @@ Subject: [PATCH] Make lava flow speed configurable
  3 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index 09f82c2d92..470e9bfd01 100644
+index 09f82c2d9..470e9bfd0 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 {
@@ -23,7 +23,7 @@ index 09f82c2d92..470e9bfd01 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 39252e6873..75f8441ab6 100644
+index 39252e687..75f8441ab 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -42,6 +42,7 @@ public abstract class WorldProvider {
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 89a2faab38..b15abc81e8 100644
+index f60c4b629..c238607ac 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -133,8 +133,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0086-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 91%
rename from patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0086-Add-wither-skeleton-takes-wither-damage-option.patch
index ef3a406ab..c5e7d8b7b 100644
--- a/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0086-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,4 +1,4 @@
-From 02181da0d4ce520022f86ec7f394f129f26862ff Mon Sep 17 00:00:00 2001
+From 5034a283a01628e4258f61e294d1b10ff5d28d43 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -9,7 +9,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 8aa0a6699f..0fd740e717 100644
+index 8aa0a6699..0fd740e71 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -108,6 +108,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -21,10 +21,10 @@ index 8aa0a6699f..0fd740e717 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b15abc81e8..4db025e2c7 100644
+index c238607ac..d4b4dfdd3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -848,10 +848,12 @@ public class PurpurWorldConfig {
+@@ -844,10 +844,12 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonRidable = false;
      public boolean witherSkeletonRidableInWater = false;
      public boolean witherSkeletonRequireShiftToMount = true;
diff --git a/patches/server/0089-UPnP-Port-Forwarding-Service.patch b/patches/server/0087-UPnP-Port-Forwarding-Service.patch
similarity index 96%
rename from patches/server/0089-UPnP-Port-Forwarding-Service.patch
rename to patches/server/0087-UPnP-Port-Forwarding-Service.patch
index 2662f77a1..b5b10d530 100644
--- a/patches/server/0089-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0087-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From 64bdc122b1f0d98447a1cd146feea09d134d5ead Mon Sep 17 00:00:00 2001
+From b59a16c67762f6139144c954e6b48a40c9635b76 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
  create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 
 diff --git a/pom.xml b/pom.xml
-index a7ee9396a0..93fba088f4 100644
+index a7ee9396a..93fba088f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,6 +53,12 @@
@@ -42,7 +42,7 @@ index a7ee9396a0..93fba088f4 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fe474e4eba..18fdaf53ef 100644
+index fe474e4eb..18fdaf53e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -78,7 +78,7 @@ index fe474e4eba..18fdaf53ef 100644
          // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
          server.loadPlugins();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64aeaaaec1..0ae6a9760e 100644
+index 1c2153e1b..1b27382c6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -106,7 +106,7 @@ index 64aeaaaec1..0ae6a9760e 100644
          if (this.server != null) {
              this.server.disablePlugins();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 16f5c9d372..c4ec515557 100644
+index 16f5c9d37..c4ec51555 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -154,6 +154,11 @@ public class PurpurConfig {
@@ -122,7 +122,7 @@ index 16f5c9d372..c4ec515557 100644
      private static void dontSendUselessEntityPackets() {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
-index c4903c7db6..ee4f022fc5 100644
+index c4903c7db..ee4f022fc 100644
 --- a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 +++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 @@ -19,13 +19,16 @@ public class JInfoPanel extends JPanel {
@@ -144,7 +144,7 @@ index c4903c7db6..ee4f022fc5 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 new file mode 100644
-index 0000000000..b0465d3608
+index 000000000..b0465d360
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 @@ -0,0 +1,47 @@
diff --git a/patches/server/0090-Implement-EntityMoveEvent.patch b/patches/server/0088-Implement-EntityMoveEvent.patch
similarity index 94%
rename from patches/server/0090-Implement-EntityMoveEvent.patch
rename to patches/server/0088-Implement-EntityMoveEvent.patch
index 595ea3260..587f702d6 100644
--- a/patches/server/0090-Implement-EntityMoveEvent.patch
+++ b/patches/server/0088-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From cc3249e79954be7f076c23c880ed55e896c7c938 Mon Sep 17 00:00:00 2001
+From e0c2438434c3e3b2379bade6ebe637efb260b0cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:48 -0600
 Subject: [PATCH] Implement EntityMoveEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement EntityMoveEvent
  1 file changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e43d0eb5a2..0405393f32 100644
+index c6a6befdc..e69b09aa1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -17,6 +17,7 @@ import java.util.Random;
diff --git a/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 98%
rename from patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
index 3faf97632..83a3164b9 100644
--- a/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 339e67624e3d05eef905a0f2e4e7094cfe9f2fdc Mon Sep 17 00:00:00 2001
+From 8daf1ef38600e2b66b52aec6333aa6ba92ad17de Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -27,7 +27,7 @@ index 57a6e7c13..89fa4f0a9 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 aefae74ec..5b0be3878 100644
+index 8304b42cc..b626c6ada 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1572,6 +1572,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -134,7 +134,7 @@ index f5c8074dc..674f2ccc7 100644
          float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F);
          float f6 = -MathHelper.sin((f + f2) * 0.017453292F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4db025e2c..de6246e23 100644
+index d4b4dfdd3..51585a7d8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -164,6 +164,7 @@ public class PurpurWorldConfig {
@@ -168,5 +168,5 @@ index 4db025e2c..de6246e23 100644
  
      public int elytraDamagePerSecond = 1;
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0092-Implement-bed-explosion-options.patch b/patches/server/0090-Implement-bed-explosion-options.patch
similarity index 96%
rename from patches/server/0092-Implement-bed-explosion-options.patch
rename to patches/server/0090-Implement-bed-explosion-options.patch
index 4449036b6..0f1feb81f 100644
--- a/patches/server/0092-Implement-bed-explosion-options.patch
+++ b/patches/server/0090-Implement-bed-explosion-options.patch
@@ -1,4 +1,4 @@
-From 915d861a9f0574fcb68fad3466f79dd5d849ea16 Mon Sep 17 00:00:00 2001
+From d5e74234cbcaa2f8394a03b9ccf2ded145af8274 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:04:29 -0600
 Subject: [PATCH] Implement bed explosion options
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bed explosion options
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 06a35629ab..df41a7dfcd 100644
+index 74e915c21..aadd8902a 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -84,7 +84,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -22,7 +22,7 @@ index 06a35629ab..df41a7dfcd 100644
                  // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index de6246e230..eaaffc2b30 100644
+index 51585a7d8..0e34414a7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -3,6 +3,7 @@ package net.pl3x.purpur;
diff --git a/patches/server/0093-Add-item-entity-options.patch b/patches/server/0091-Add-item-entity-options.patch
similarity index 97%
rename from patches/server/0093-Add-item-entity-options.patch
rename to patches/server/0091-Add-item-entity-options.patch
index c2cbc78cd..69d645186 100644
--- a/patches/server/0093-Add-item-entity-options.patch
+++ b/patches/server/0091-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From 86a922d7c1f587da68283850f7222d735c61ffab Mon Sep 17 00:00:00 2001
+From 12201a8ab87a002d24b9d088f94da98cd3bf81b8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,7 +10,7 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5b0be3878..970eab330 100644
+index b626c6ada..ecccbe12a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1303,6 +1303,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -56,7 +56,7 @@ index bbb9ca1ef..262a7935e 100644
              if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index eaaffc2b3..9348193e5 100644
+index 0e34414a7..4cb856ebb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -5,6 +5,8 @@ import net.minecraft.server.Block;
@@ -100,5 +100,5 @@ index eaaffc2b3..9348193e5 100644
          playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
          playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0092-Make-natural-spawns-per-biome-configurable.patch
similarity index 98%
rename from patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
rename to patches/server/0092-Make-natural-spawns-per-biome-configurable.patch
index 1adc80fee..f892a9c99 100644
--- a/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
+++ b/patches/server/0092-Make-natural-spawns-per-biome-configurable.patch
@@ -1,4 +1,4 @@
-From d2fe438d86a197169414ea4c66c131976aff3df3 Mon Sep 17 00:00:00 2001
+From f1512eded7547496cbb990baf24531852aa65837 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] Make natural spawns per biome configurable
@@ -86,7 +86,7 @@ Subject: [PATCH] Make natural spawns per biome configurable
  create mode 100644 src/main/resources/biomes.yml
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
-index 9c38f8907a..3980504d9c 100644
+index 9c38f8907..3980504d9 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 @@ -22,22 +22,6 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -114,7 +114,7 @@ index 9c38f8907a..3980504d9c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
-index 2a6dafccdd..501314da9a 100644
+index 2a6dafccd..501314da9 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 @@ -22,22 +22,6 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -142,7 +142,7 @@ index 2a6dafccdd..501314da9a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0102a170dc..6e0627fdca 100644
+index 0102a170d..6e0627fdc 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -17,8 +17,25 @@ import org.apache.logging.log4j.Logger;
@@ -199,7 +199,7 @@ index 0102a170dc..6e0627fdca 100644
          ((List) this.v.get(enumcreaturetype)).add(biomebase_biomemeta);
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
-index f4e9345aeb..d8ff2c9a21 100644
+index f4e9345ae..d8ff2c9a2 100644
 --- a/src/main/java/net/minecraft/server/BiomeBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeBeach.java
 @@ -20,15 +20,6 @@ public final class BiomeBeach extends BiomeBase {
@@ -220,7 +220,7 @@ index f4e9345aeb..d8ff2c9a21 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
-index 58c30f6523..7107267421 100644
+index 58c30f652..710726742 100644
 --- a/src/main/java/net/minecraft/server/BiomeBigHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
 @@ -22,19 +22,6 @@ public final class BiomeBigHills extends BiomeBase {
@@ -245,7 +245,7 @@ index 58c30f6523..7107267421 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
-index 9437438c82..1749c258b9 100644
+index 9437438c8..1749c258b 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
 @@ -21,18 +21,6 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -269,7 +269,7 @@ index 9437438c82..1749c258b9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
-index 3e5c23d31e..5d262c9712 100644
+index 3e5c23d31..5d262c971 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 @@ -21,18 +21,6 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -293,7 +293,7 @@ index 3e5c23d31e..5d262c9712 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
-index d5eb5c91c4..de048fb480 100644
+index d5eb5c91c..de048fb48 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 @@ -21,18 +21,6 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -317,7 +317,7 @@ index d5eb5c91c4..de048fb480 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
-index e805f9568e..2115b05caa 100644
+index e805f9568..2115b05ca 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 @@ -21,18 +21,6 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -341,7 +341,7 @@ index e805f9568e..2115b05caa 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
-index 1b92f4567d..210226e19f 100644
+index 1b92f4567..210226e19 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
 @@ -20,14 +20,6 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -361,7 +361,7 @@ index 1b92f4567d..210226e19f 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
-index b9a5cb63a4..3622ef6690 100644
+index b9a5cb63a..3622ef669 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 @@ -25,18 +25,6 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -385,7 +385,7 @@ index b9a5cb63a4..3622ef6690 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
-index 571c3d139d..c640aa9eeb 100644
+index 571c3d139..c640aa9ee 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
 @@ -24,18 +24,6 @@ public class BiomeColdOcean extends BiomeBase {
@@ -409,7 +409,7 @@ index 571c3d139d..c640aa9eeb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
-index 88400e77bf..caaa8ec999 100644
+index 88400e77b..caaa8ec99 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 @@ -23,21 +23,6 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -436,7 +436,7 @@ index 88400e77bf..caaa8ec999 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
-index 8a8fc7dbd2..323f20452d 100644
+index 8a8fc7dbd..323f20452 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 @@ -22,21 +22,6 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -463,7 +463,7 @@ index 8a8fc7dbd2..323f20452d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
-index 327e6847f0..973eb8eeb6 100644
+index 327e6847f..973eb8eeb 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 @@ -22,21 +22,6 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -490,7 +490,7 @@ index 327e6847f0..973eb8eeb6 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
-index 651d44cb37..7088603b15 100644
+index 651d44cb3..7088603b1 100644
 --- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 @@ -25,18 +25,6 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -514,7 +514,7 @@ index 651d44cb37..7088603b15 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
-index 257732dad7..168614fe59 100644
+index 257732dad..168614fe5 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesert.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesert.java
 @@ -24,16 +24,6 @@ public final class BiomeDesert extends BiomeBase {
@@ -536,7 +536,7 @@ index 257732dad7..168614fe59 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
-index 3752fc4509..4df4437013 100644
+index 3752fc450..4df443701 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
 @@ -22,16 +22,6 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -558,7 +558,7 @@ index 3752fc4509..4df4437013 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
-index 1a0b569322..ac565c3822 100644
+index 1a0b56932..ac565c382 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 @@ -21,16 +21,6 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -580,7 +580,7 @@ index 1a0b569322..ac565c3822 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
-index 8e19e06889..93f9c55bb2 100644
+index 8e19e0688..93f9c55bb 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -605,7 +605,7 @@ index 8e19e06889..93f9c55bb2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
-index 69d4880c74..5c73ee4fb8 100644
+index 69d4880c7..5c73ee4fb 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -630,7 +630,7 @@ index 69d4880c74..5c73ee4fb8 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
-index 7661d53161..7bc4631db0 100644
+index 7661d5316..7bc4631db 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -655,7 +655,7 @@ index 7661d53161..7bc4631db0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
-index 05418f8fa1..b618c7e336 100644
+index 05418f8fa..b618c7e33 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 @@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -680,7 +680,7 @@ index 05418f8fa1..b618c7e336 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
-index 1d3f624323..1d0809c2cc 100644
+index 1d3f62432..1d0809c2c 100644
 --- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 @@ -23,19 +23,6 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -705,7 +705,7 @@ index 1d3f624323..1d0809c2cc 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
-index e849b411c6..2b69a128a6 100644
+index e849b411c..2b69a128a 100644
 --- a/src/main/java/net/minecraft/server/BiomeForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeForest.java
 @@ -22,19 +22,6 @@ public final class BiomeForest extends BiomeBase {
@@ -730,7 +730,7 @@ index e849b411c6..2b69a128a6 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
-index f7dea38eb3..57c7091816 100644
+index f7dea38eb..57c709181 100644
 --- a/src/main/java/net/minecraft/server/BiomeForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
 @@ -22,19 +22,6 @@ public final class BiomeForestHills extends BiomeBase {
@@ -755,7 +755,7 @@ index f7dea38eb3..57c7091816 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
-index 67d120bef2..f1ab35f2fa 100644
+index 67d120bef..f1ab35f2f 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 @@ -26,19 +26,7 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -780,7 +780,7 @@ index 67d120bef2..f1ab35f2fa 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
-index 2772bc6dac..3941438d92 100644
+index 2772bc6da..3941438d9 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 @@ -25,19 +25,7 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -805,7 +805,7 @@ index 2772bc6dac..3941438d92 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
-index 4be53fc0f6..f5d98bcac9 100644
+index 4be53fc0f..f5d98bcac 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 @@ -19,17 +19,6 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -828,7 +828,7 @@ index 4be53fc0f6..f5d98bcac9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
-index 888dfcd8d4..dd3375ef84 100644
+index 888dfcd8d..dd3375ef8 100644
 --- a/src/main/java/net/minecraft/server/BiomeHell.java
 +++ b/src/main/java/net/minecraft/server/BiomeHell.java
 @@ -18,9 +18,6 @@ public final class BiomeHell extends BiomeBase {
@@ -843,7 +843,7 @@ index 888dfcd8d4..dd3375ef84 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
-index ad9b4efe09..0e98efb9e9 100644
+index ad9b4efe0..0e98efb9e 100644
 --- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
 @@ -20,18 +20,7 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -867,7 +867,7 @@ index ad9b4efe09..0e98efb9e9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
-index 71606b0a71..ba0a16faa6 100644
+index 71606b0a7..ba0a16faa 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
 @@ -23,18 +23,7 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -891,7 +891,7 @@ index 71606b0a71..ba0a16faa6 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
-index 984f94bb59..375ccf9c45 100644
+index 984f94bb5..375ccf9c4 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 @@ -22,18 +22,7 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -915,7 +915,7 @@ index 984f94bb59..375ccf9c45 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 95e5019968..2b154a2761 100644
+index 95e501996..2b154a276 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -23,22 +23,6 @@ public final class BiomeJungle extends BiomeBase {
@@ -943,7 +943,7 @@ index 95e5019968..2b154a2761 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
-index e624f9764f..e6cf5d8539 100644
+index e624f9764..e6cf5d853 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 @@ -21,19 +21,6 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -968,7 +968,7 @@ index e624f9764f..e6cf5d8539 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
-index 1fe9c840a7..d4c9907b28 100644
+index 1fe9c840a..d4c9907b2 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 @@ -21,19 +21,6 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -993,7 +993,7 @@ index 1fe9c840a7..d4c9907b28 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
-index e2970ab00e..9e7b702c8a 100644
+index e2970ab00..9e7b702c8 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
 @@ -23,22 +23,6 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -1021,7 +1021,7 @@ index e2970ab00e..9e7b702c8a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
-index ffe6b4344e..f308e0dd45 100644
+index ffe6b4344..f308e0dd4 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 @@ -21,21 +21,6 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -1048,7 +1048,7 @@ index ffe6b4344e..f308e0dd45 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
-index b23c43305b..092233c50c 100644
+index b23c43305..092233c50 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 @@ -25,20 +25,6 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -1074,7 +1074,7 @@ index b23c43305b..092233c50c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
-index efcb11bbe8..1cebd5ce74 100644
+index efcb11bbe..1cebd5ce7 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 @@ -23,20 +23,6 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -1100,7 +1100,7 @@ index efcb11bbe8..1cebd5ce74 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
-index 328e939a6f..d0fe6c4493 100644
+index 328e939a6..d0fe6c449 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 @@ -23,21 +23,6 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -1127,7 +1127,7 @@ index 328e939a6f..d0fe6c4493 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
-index 36bea710a0..e3aad431e2 100644
+index 36bea710a..e3aad431e 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 @@ -23,21 +23,6 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -1154,7 +1154,7 @@ index 36bea710a0..e3aad431e2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
-index 22474d682a..2ef445ce64 100644
+index 22474d682..2ef445ce6 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 @@ -23,21 +23,6 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -1181,7 +1181,7 @@ index 22474d682a..2ef445ce64 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index 65d606d51c..8906115d47 100644
+index 65d606d51..8906115d4 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesa.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
 @@ -19,14 +19,6 @@ public final class BiomeMesa extends BiomeBase {
@@ -1201,7 +1201,7 @@ index 65d606d51c..8906115d47 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
-index 5ecec62f18..401fbd2d16 100644
+index 5ecec62f1..401fbd2d1 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 @@ -19,14 +19,6 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -1221,7 +1221,7 @@ index 5ecec62f18..401fbd2d16 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
-index 14d4bd312e..77a5828f07 100644
+index 14d4bd312..77a5828f0 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 @@ -20,14 +20,6 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -1241,7 +1241,7 @@ index 14d4bd312e..77a5828f07 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
-index b5dab9d2aa..a888312556 100644
+index b5dab9d2a..a88831255 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 @@ -19,14 +19,6 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -1261,7 +1261,7 @@ index b5dab9d2aa..a888312556 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
-index d05cc38b5e..be07387135 100644
+index d05cc38b5..be0738713 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 @@ -19,14 +19,6 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -1281,7 +1281,7 @@ index d05cc38b5e..be07387135 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
-index 21a77ee812..2a213025b9 100644
+index 21a77ee81..2a213025b 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 @@ -20,14 +20,6 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -1301,7 +1301,7 @@ index 21a77ee812..2a213025b9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
-index 0302efbdc7..f0be681aaf 100644
+index 0302efbdc..f0be681aa 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 @@ -18,7 +18,6 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -1314,7 +1314,7 @@ index 0302efbdc7..f0be681aaf 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
-index 51f92584b8..0118df023f 100644
+index 51f92584b..0118df023 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
 @@ -18,7 +18,6 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -1327,7 +1327,7 @@ index 51f92584b8..0118df023f 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
-index ad9628b2aa..5f4617c0a6 100644
+index ad9628b2a..5f4617c0a 100644
 --- a/src/main/java/net/minecraft/server/BiomeOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeOcean.java
 @@ -24,18 +24,6 @@ public final class BiomeOcean extends BiomeBase {
@@ -1351,7 +1351,7 @@ index ad9628b2aa..5f4617c0a6 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
-index ff6090e3c1..266f4165a4 100644
+index ff6090e3c..266f4165a 100644
 --- a/src/main/java/net/minecraft/server/BiomePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomePlains.java
 @@ -21,20 +21,6 @@ public final class BiomePlains extends BiomeBase {
@@ -1377,7 +1377,7 @@ index ff6090e3c1..266f4165a4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
-index a28222eb1d..f35557dfdf 100644
+index a28222eb1..f35557dfd 100644
 --- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 @@ -23,21 +23,6 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1404,7 +1404,7 @@ index a28222eb1d..f35557dfdf 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
-index b84b868b1a..405cc2bff4 100644
+index b84b868b1..405cc2bff 100644
 --- a/src/main/java/net/minecraft/server/BiomeRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeRiver.java
 @@ -20,17 +20,6 @@ public final class BiomeRiver extends BiomeBase {
@@ -1427,7 +1427,7 @@ index b84b868b1a..405cc2bff4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
-index 16bcf9bff0..f02a8a03c7 100644
+index 16bcf9bff..f02a8a03c 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 @@ -24,18 +24,6 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1451,7 +1451,7 @@ index 16bcf9bff0..f02a8a03c7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
-index 9fa84c87fa..9ee0fc6a43 100644
+index 9fa84c87f..9ee0fc6a4 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 @@ -24,18 +24,6 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1475,7 +1475,7 @@ index 9fa84c87fa..9ee0fc6a43 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
-index c12a890165..a539fc362d 100644
+index c12a89016..a539fc362 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavanna.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
 @@ -23,20 +23,6 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1501,7 +1501,7 @@ index c12a890165..a539fc362d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
-index db8b20a6c7..e041fcd412 100644
+index db8b20a6c..e041fcd41 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 @@ -20,20 +20,6 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1527,7 +1527,7 @@ index db8b20a6c7..e041fcd412 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
-index 2826c510d8..08407ea3e0 100644
+index 2826c510d..08407ea3e 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 @@ -21,21 +21,6 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1554,7 +1554,7 @@ index 2826c510d8..08407ea3e0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
-index e544a8f6b9..337310263c 100644
+index e544a8f6b..337310263 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 @@ -20,20 +20,6 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1580,7 +1580,7 @@ index e544a8f6b9..337310263c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
-index 34660f9f84..3a96c2aeba 100644
+index 34660f9f8..3a96c2aeb 100644
 --- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 @@ -19,14 +19,6 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1600,7 +1600,7 @@ index 34660f9f84..3a96c2aeba 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
-index 8815c95900..f971bc4bcb 100644
+index 8815c9590..f971bc4bc 100644
 --- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 @@ -21,20 +21,6 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1626,7 +1626,7 @@ index 8815c95900..f971bc4bcb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
-index 02584897e9..011628fff2 100644
+index 02584897e..011628fff 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamp.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
 @@ -20,19 +20,6 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1651,7 +1651,7 @@ index 02584897e9..011628fff2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
-index d85b01b956..10c6b4eb39 100644
+index d85b01b95..10c6b4eb3 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 @@ -18,19 +18,6 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1676,7 +1676,7 @@ index d85b01b956..10c6b4eb39 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
-index ae6e6ca896..456b6b1747 100644
+index ae6e6ca89..456b6b174 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
 @@ -24,21 +24,6 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1703,7 +1703,7 @@ index ae6e6ca896..456b6b1747 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
-index 4e19fe5ae9..cc699e354d 100644
+index 4e19fe5ae..cc699e354 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 @@ -22,21 +22,6 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1730,7 +1730,7 @@ index 4e19fe5ae9..cc699e354d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
-index 05e833ffed..3c722f50a9 100644
+index 05e833ffe..3c722f50a 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 @@ -22,21 +22,6 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1757,7 +1757,7 @@ index 05e833ffed..3c722f50a9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
-index 22e9789a36..6a5a8a991a 100644
+index 22e9789a3..6a5a8a991 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
 @@ -8,6 +8,6 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1769,7 +1769,7 @@ index 22e9789a36..6a5a8a991a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
-index 5b068299c8..07d72737b5 100644
+index 5b068299c..07d72737b 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
 @@ -5,6 +5,6 @@ public class BiomeTheEndBarrenIsland extends BiomeBase {
@@ -1781,7 +1781,7 @@ index 5b068299c8..07d72737b5 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
-index a26d56aa45..839d3e616a 100644
+index a26d56aa4..839d3e616 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 @@ -6,6 +6,6 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1793,7 +1793,7 @@ index a26d56aa45..839d3e616a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
-index e47add3e43..53aa6243de 100644
+index e47add3e4..53aa6243d 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 @@ -8,6 +8,6 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1805,7 +1805,7 @@ index e47add3e43..53aa6243de 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
-index ec92a84579..2452f18013 100644
+index ec92a8457..2452f1801 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 @@ -6,6 +6,6 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1817,7 +1817,7 @@ index ec92a84579..2452f18013 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
-index c9ba334535..5549d61421 100644
+index c9ba33453..5549d6142 100644
 --- a/src/main/java/net/minecraft/server/BiomeVoid.java
 +++ b/src/main/java/net/minecraft/server/BiomeVoid.java
 @@ -5,5 +5,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1828,7 +1828,7 @@ index c9ba334535..5549d61421 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
-index 11dc5f6374..c3fc79fb31 100644
+index 11dc5f637..c3fc79fb3 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 @@ -24,18 +24,6 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1852,7 +1852,7 @@ index 11dc5f6374..c3fc79fb31 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
-index e4dc7d198c..00f94b906b 100644
+index e4dc7d198..00f94b906 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 @@ -26,18 +26,6 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1876,7 +1876,7 @@ index e4dc7d198c..00f94b906b 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
-index 12742870ca..a448c77264 100644
+index 12742870c..a448c7726 100644
 --- a/src/main/java/net/minecraft/server/Biomes.java
 +++ b/src/main/java/net/minecraft/server/Biomes.java
 @@ -87,6 +87,34 @@ public abstract class Biomes {
@@ -1916,7 +1916,7 @@ index 12742870ca..a448c77264 100644
  
 diff --git a/src/main/resources/biomes.yml b/src/main/resources/biomes.yml
 new file mode 100644
-index 0000000000..f0ea65299f
+index 000000000..f0ea65299
 --- /dev/null
 +++ b/src/main/resources/biomes.yml
 @@ -0,0 +1,1042 @@
diff --git a/patches/server/0095-Configurable-void-damage-height.patch b/patches/server/0093-Configurable-void-damage-height.patch
similarity index 93%
rename from patches/server/0095-Configurable-void-damage-height.patch
rename to patches/server/0093-Configurable-void-damage-height.patch
index 69cbf4339..1e7888434 100644
--- a/patches/server/0095-Configurable-void-damage-height.patch
+++ b/patches/server/0093-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 1dafc3735358bb198bc92eb97b9325a24cc10d57 Mon Sep 17 00:00:00 2001
+From 88244c3a5893802b573d7661b5bd6958c906ad2e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 970eab330..68a951002 100644
+index ecccbe12a..22033b82d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -487,7 +487,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 970eab330..68a951002 100644
              && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9348193e5..7e920b0d0 100644
+index 4cb856ebb..53c8782b5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -189,6 +189,7 @@ public class PurpurWorldConfig {
@@ -42,5 +42,5 @@ index 9348193e5..7e920b0d0 100644
  
      public int elytraDamagePerSecond = 1;
 -- 
-2.25.0.windows.1
+2.24.0
 
diff --git a/patches/server/0096-Fix-the-dead-lagging-the-server.patch b/patches/server/0094-Fix-the-dead-lagging-the-server.patch
similarity index 92%
rename from patches/server/0096-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0094-Fix-the-dead-lagging-the-server.patch
index 864c902ad..0edca3c65 100644
--- a/patches/server/0096-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0094-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From 09a7023bcaeafc983433f31b0865c37af3942fb6 Mon Sep 17 00:00:00 2001
+From 0dfc812a84d86c520ee760cbb0dacafbb82b01cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6875245..bcb08c3a 100644
+index 22033b82d..62ce72fd1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1389,7 +1389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index a6875245..bcb08c3a 100644
  
      public void setPositionRotation(BlockPosition blockposition, float f, float f1) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e69b09aa..19e281be 100644
+index e69b09aa1..19e281bec 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2385,7 +2385,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch b/patches/server/0095-Add-flying-mobs-to-entity-activation-range-settings.patch
similarity index 97%
rename from patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch
rename to patches/server/0095-Add-flying-mobs-to-entity-activation-range-settings.patch
index 252c4029f..1a32a4e81 100644
--- a/patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch
+++ b/patches/server/0095-Add-flying-mobs-to-entity-activation-range-settings.patch
@@ -1,4 +1,4 @@
-From 90ddff0b3abcffa394245a6cb7b937ad7a582ec9 Mon Sep 17 00:00:00 2001
+From 7ca9653eb3cec1fa76d11e9e32da8009a3e741bb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 8 Mar 2020 20:54:44 -0500
 Subject: [PATCH] Add flying mobs to entity activation range settings
@@ -9,7 +9,7 @@ Subject: [PATCH] Add flying mobs to entity activation range settings
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 17c4d7ec9b..88ae15bc4f 100644
+index 17c4d7ec9..88ae15bc4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -12,6 +12,9 @@ import net.minecraft.server.EntityAmbient;
@@ -83,7 +83,7 @@ index 17c4d7ec9b..88ae15bc4f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1b42ba94c0..c9864d3f5c 100644
+index 1b42ba94c..c9864d3f5 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -181,6 +181,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0098-Add-ping-command.patch b/patches/server/0096-Add-ping-command.patch
similarity index 96%
rename from patches/server/0098-Add-ping-command.patch
rename to patches/server/0096-Add-ping-command.patch
index 88abcdd6f..1f184bfa5 100644
--- a/patches/server/0098-Add-ping-command.patch
+++ b/patches/server/0096-Add-ping-command.patch
@@ -1,4 +1,4 @@
-From 7b95417f3f6a67e9d67582481cf86b625b2a6aac Mon Sep 17 00:00:00 2001
+From 5dbaaaa2e7e12d166d0397841ed165be802af00e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command
@@ -13,7 +13,7 @@ Subject: [PATCH] Add /ping command
  create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
-index 39a6a9ac00..5568649b7e 100644
+index 39a6a9ac0..5568649b7 100644
 --- a/src/main/java/net/minecraft/server/ArgumentEntity.java
 +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java
 @@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType<EntitySelector> {
@@ -30,7 +30,7 @@ index 39a6a9ac00..5568649b7e 100644
          List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource());
  
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 2414b0a552..6a755df64f 100644
+index 2414b0a55..6a755df64 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent;
@@ -64,7 +64,7 @@ index 2414b0a552..6a755df64f 100644
          return RequiredArgumentBuilder.argument(s, argumenttype);
      }
 diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
-index 0b23a0548d..ab0cf8b561 100644
+index 0b23a0548..ab0cf8b56 100644
 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 @@ -159,6 +159,7 @@ public class CommandListenerWrapper implements ICompletionProvider {
@@ -77,7 +77,7 @@ index 0b23a0548d..ab0cf8b561 100644
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java
 new file mode 100644
-index 0000000000..dac3083bf0
+index 000000000..dac3083bf
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
 @@ -0,0 +1,33 @@
@@ -115,7 +115,7 @@ index 0000000000..dac3083bf0
 +    }
 +}
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index e925e1374d..e81beea7fa 100644
+index e925e1374..e81beea7f 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0099-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 94%
rename from patches/server/0099-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 30cb7c09e..f180471bb 100644
--- a/patches/server/0099-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -1,4 +1,4 @@
-From c9045a7548ec20979abe24abd5ba01f0a09eaa29 Mon Sep 17 00:00:00 2001
+From d604e471861aeec7b32a31a04d3114d548d3d911 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index ed8e26aa45..ca6c0ec299 100644
+index ed8e26aa4..ca6c0ec29 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 {
@@ -22,7 +22,7 @@ index ed8e26aa45..ca6c0ec299 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 7e920b0d04..a0405b6bff 100644
+index 53c8782b5..01b8fffe1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -189,6 +189,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0100-Configurable-server-mod-name.patch b/patches/server/0098-Configurable-server-mod-name.patch
similarity index 92%
rename from patches/server/0100-Configurable-server-mod-name.patch
rename to patches/server/0098-Configurable-server-mod-name.patch
index 38b6f0980..8d1e5f280 100644
--- a/patches/server/0100-Configurable-server-mod-name.patch
+++ b/patches/server/0098-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From e1257e7646fd997b2c636aba9ecaac80d29c70a7 Mon Sep 17 00:00:00 2001
+From 9cdd6f01aa74fc8cf5a95f5fdc543c19beccd8d3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable server mod name
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1b27382c..f7c82f51 100644
+index 1b27382c6..f7c82f519 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1550,7 +1550,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,7 +22,7 @@ index 1b27382c..f7c82f51 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c4ec5155..dd3afd4a 100644
+index c4ec51555..dd3afd4a5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -185,6 +185,11 @@ public class PurpurConfig {
diff --git a/patches/server/0101-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 90%
rename from patches/server/0101-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch
index 1c71d4106..a9a9e501a 100644
--- a/patches/server/0101-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,4 +1,4 @@
-From 13c5b21b96154ccac5be6eb4a1d7ab2b2b09ebcd Mon Sep 17 00:00:00 2001
+From cd72595fb41e924ab2d4622bf5d7f6cf08725dc2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 18:33:05 -0500
 Subject: [PATCH] End gateway should check if entity can use portal
@@ -8,7 +8,7 @@ Subject: [PATCH] End gateway should check if entity can use portal
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index c71f76004e..d73045f703 100644
+index c71f76004..d73045f70 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -118,6 +118,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/patches/server/0102-Configurable-TPS-Catchup.patch b/patches/server/0100-Configurable-TPS-Catchup.patch
similarity index 94%
rename from patches/server/0102-Configurable-TPS-Catchup.patch
rename to patches/server/0100-Configurable-TPS-Catchup.patch
index 1bda535d3..bbc14a16e 100644
--- a/patches/server/0102-Configurable-TPS-Catchup.patch
+++ b/patches/server/0100-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From 63bc9e56072e103ae01bd468c4ec3f4fcbf22347 Mon Sep 17 00:00:00 2001
+From 74d63117eb825338195946010890180778313db9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable TPS Catchup
  2 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7015611dc4..51fc57100e 100644
+index f7c82f519..5606e080f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -964,6 +964,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -27,7 +27,7 @@ index 7015611dc4..51fc57100e 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 dd3afd4a57..c55e5c1f27 100644
+index dd3afd4a5..c55e5c1f2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -159,6 +159,11 @@ public class PurpurConfig {
diff --git a/patches/server/0103-Breedable-Polar-Bears.patch b/patches/server/0101-Breedable-Polar-Bears.patch
similarity index 95%
rename from patches/server/0103-Breedable-Polar-Bears.patch
rename to patches/server/0101-Breedable-Polar-Bears.patch
index 198796eba..192b278ca 100644
--- a/patches/server/0103-Breedable-Polar-Bears.patch
+++ b/patches/server/0101-Breedable-Polar-Bears.patch
@@ -1,4 +1,4 @@
-From 54965452c27d06894f11126f02e0b9a3d36b0c9d Mon Sep 17 00:00:00 2001
+From ae0eea483459759cf76e7bd1e3cc95a7e50675d2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:46:44 -0500
 Subject: [PATCH] Breedable Polar Bears
@@ -9,7 +9,7 @@ Subject: [PATCH] Breedable Polar Bears
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 0a3906bde0..42fef3abaa 100644
+index 0a3906bde..42fef3aba 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -32,6 +32,28 @@ public class EntityPolarBear extends EntityAnimal {
@@ -64,10 +64,10 @@ index 0a3906bde0..42fef3abaa 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a0405b6bff..360c4b9c7e 100644
+index 01b8fffe1..ced9edf82 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -670,10 +670,15 @@ public class PurpurWorldConfig {
+@@ -666,10 +666,15 @@ public class PurpurWorldConfig {
      public boolean polarBearRidable = false;
      public boolean polarBearRidableInWater = false;
      public boolean polarBearRequireShiftToMount = true;
diff --git a/patches/server/0104-Configurable-jockey-options.patch b/patches/server/0102-Configurable-jockey-options.patch
similarity index 97%
rename from patches/server/0104-Configurable-jockey-options.patch
rename to patches/server/0102-Configurable-jockey-options.patch
index caac2e593..9631f903c 100644
--- a/patches/server/0104-Configurable-jockey-options.patch
+++ b/patches/server/0102-Configurable-jockey-options.patch
@@ -1,4 +1,4 @@
-From cf57c8ebaecc5422ce6efcdae1be945e9b724e60 Mon Sep 17 00:00:00 2001
+From 091faa57defbd852c9422e28a2ff4436a752e61c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options
@@ -13,7 +13,7 @@ Subject: [PATCH] Configurable jockey options
  6 files changed, 112 insertions(+), 7 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 63f5969b10..f32950cc9b 100644
+index 63f5969b1..f32950cc9 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -34,6 +34,21 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -39,7 +39,7 @@ index 63f5969b10..f32950cc9b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index fb9ef88ea3..90bf12c735 100644
+index fb9ef88ea..90bf12c73 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -32,6 +32,21 @@ public class EntityPigZombie extends EntityZombie {
@@ -65,7 +65,7 @@ index fb9ef88ea3..90bf12c735 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 95ae6f3494..e60e4adc1d 100644
+index 95ae6f349..e60e4adc1 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;
@@ -139,7 +139,7 @@ index 95ae6f3494..e60e4adc1d 100644
          private GroupDataZombie(boolean flag) {
              this.a = flag;
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index db252ba4e0..e8b099d6c8 100644
+index db252ba4e..e8b099d6c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -23,6 +23,21 @@ public class EntityZombieHusk extends EntityZombie {
@@ -165,7 +165,7 @@ index db252ba4e0..e8b099d6c8 100644
  
      public static boolean b(EntityTypes<EntityZombieHusk> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index ebbfcb75a4..8532385d8d 100644
+index ebbfcb75a..8532385d8 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -40,6 +40,21 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -191,7 +191,7 @@ index ebbfcb75a4..8532385d8d 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 360c4b9c7e..092542c811 100644
+index ced9edf82..adcdc6b8f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -401,10 +401,16 @@ public class PurpurWorldConfig {
@@ -228,7 +228,7 @@ index 360c4b9c7e..092542c811 100644
      }
  
      public boolean horseRidableInWater = false;
-@@ -931,11 +943,17 @@ public class PurpurWorldConfig {
+@@ -927,11 +939,17 @@ public class PurpurWorldConfig {
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;
      public boolean zombieTargetTurtleEggs = true;
@@ -246,7 +246,7 @@ index 360c4b9c7e..092542c811 100644
      }
  
      public boolean zombieHorseCanSwim = false;
-@@ -950,18 +968,30 @@ public class PurpurWorldConfig {
+@@ -946,18 +964,30 @@ public class PurpurWorldConfig {
      public boolean zombiePigmanRidable = false;
      public boolean zombiePigmanRidableInWater = false;
      public boolean zombiePigmanRequireShiftToMount = true;
diff --git a/patches/server/0105-Configurable-enchantment-max-level.patch b/patches/server/0103-Configurable-enchantment-max-level.patch
similarity index 96%
rename from patches/server/0105-Configurable-enchantment-max-level.patch
rename to patches/server/0103-Configurable-enchantment-max-level.patch
index 1334eba3c..100727500 100644
--- a/patches/server/0105-Configurable-enchantment-max-level.patch
+++ b/patches/server/0103-Configurable-enchantment-max-level.patch
@@ -1,4 +1,4 @@
-From 61e33c354ed40f8da623cee42e41e9ff1d7de334 Mon Sep 17 00:00:00 2001
+From 74d64cd2ad283a2ac92ec976dfe4368aca133fb5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 17:21:42 -0500
 Subject: [PATCH] Configurable enchantment max level
@@ -39,7 +39,7 @@ Subject: [PATCH] Configurable enchantment max level
  32 files changed, 56 insertions(+), 148 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Enchantment.java b/src/main/java/net/minecraft/server/Enchantment.java
-index 70cd4a4837..0ab96ea34e 100644
+index 70cd4a483..0ab96ea34 100644
 --- a/src/main/java/net/minecraft/server/Enchantment.java
 +++ b/src/main/java/net/minecraft/server/Enchantment.java
 @@ -44,9 +44,17 @@ public abstract class Enchantment {
@@ -63,7 +63,7 @@ index 70cd4a4837..0ab96ea34e 100644
      public int a(int i) {
          return 1 + i * 10;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentArrowDamage.java b/src/main/java/net/minecraft/server/EnchantmentArrowDamage.java
-index ffa1d19cb9..1040e7e08b 100644
+index ffa1d19cb..1040e7e08 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentArrowDamage.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentArrowDamage.java
 @@ -4,6 +4,7 @@ public class EnchantmentArrowDamage extends Enchantment {
@@ -85,7 +85,7 @@ index ffa1d19cb9..1040e7e08b 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java b/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java
-index 9103f3c614..67f487b9e4 100644
+index 9103f3c61..67f487b9e 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java
 @@ -4,6 +4,7 @@ public class EnchantmentArrowKnockback extends Enchantment {
@@ -107,7 +107,7 @@ index 9103f3c614..67f487b9e4 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentBinding.java b/src/main/java/net/minecraft/server/EnchantmentBinding.java
-index b49154b13e..ec4dad3cf2 100644
+index b49154b13..ec4dad3cf 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentBinding.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentBinding.java
 @@ -4,6 +4,7 @@ public class EnchantmentBinding extends Enchantment {
@@ -131,7 +131,7 @@ index b49154b13e..ec4dad3cf2 100644
      public boolean isTreasure() {
          return true;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentDepthStrider.java b/src/main/java/net/minecraft/server/EnchantmentDepthStrider.java
-index 669fbd2685..07d566cd9e 100644
+index 669fbd268..07d566cd9 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentDepthStrider.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentDepthStrider.java
 @@ -4,6 +4,7 @@ public class EnchantmentDepthStrider extends Enchantment {
@@ -155,7 +155,7 @@ index 669fbd2685..07d566cd9e 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.FROST_WALKER;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentDigging.java b/src/main/java/net/minecraft/server/EnchantmentDigging.java
-index 798b3c250c..16a7c38bc0 100644
+index 798b3c250..16a7c38bc 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentDigging.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentDigging.java
 @@ -4,6 +4,7 @@ public class EnchantmentDigging extends Enchantment {
@@ -179,7 +179,7 @@ index 798b3c250c..16a7c38bc0 100644
      public boolean canEnchant(ItemStack itemstack) {
          return itemstack.getItem() == Items.SHEARS ? true : super.canEnchant(itemstack);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentDurability.java b/src/main/java/net/minecraft/server/EnchantmentDurability.java
-index c946326fbc..6deccef554 100644
+index c946326fb..6deccef55 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentDurability.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentDurability.java
 @@ -6,6 +6,7 @@ public class EnchantmentDurability extends Enchantment {
@@ -203,7 +203,7 @@ index c946326fbc..6deccef554 100644
      public boolean canEnchant(ItemStack itemstack) {
          return itemstack.e() ? true : super.canEnchant(itemstack);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentFire.java b/src/main/java/net/minecraft/server/EnchantmentFire.java
-index c4da4378cb..f2664c18e2 100644
+index c4da4378c..f2664c18e 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentFire.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentFire.java
 @@ -4,6 +4,7 @@ public class EnchantmentFire extends Enchantment {
@@ -225,7 +225,7 @@ index c4da4378cb..f2664c18e2 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java b/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java
-index a0b4da25b8..af3db770f8 100644
+index a0b4da25b..af3db770f 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java
 @@ -4,6 +4,7 @@ public class EnchantmentFlameArrows extends Enchantment {
@@ -247,7 +247,7 @@ index a0b4da25b8..af3db770f8 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java b/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java
-index b5de6c740c..8c4fd331c8 100644
+index b5de6c740..8c4fd331c 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java
 @@ -10,6 +10,7 @@ public class EnchantmentFrostWalker extends Enchantment {
@@ -271,7 +271,7 @@ index b5de6c740c..8c4fd331c8 100644
          if (entityliving.onGround) {
              IBlockData iblockdata = Blocks.FROSTED_ICE.getBlockData();
 diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
-index 408cfa4609..1dbedc0adb 100644
+index 408cfa460..1dbedc0ad 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
 @@ -4,6 +4,7 @@ public class EnchantmentInfiniteArrows extends Enchantment {
@@ -295,7 +295,7 @@ index 408cfa4609..1dbedc0adb 100644
      public boolean a(Enchantment enchantment) {
          return enchantment instanceof EnchantmentMending ? false : super.a(enchantment);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentKnockback.java b/src/main/java/net/minecraft/server/EnchantmentKnockback.java
-index 362ce7bc47..04062c2557 100644
+index 362ce7bc4..04062c255 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentKnockback.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentKnockback.java
 @@ -4,6 +4,7 @@ public class EnchantmentKnockback extends Enchantment {
@@ -317,7 +317,7 @@ index 362ce7bc47..04062c2557 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentLootBonus.java b/src/main/java/net/minecraft/server/EnchantmentLootBonus.java
-index b5232faccc..c27e20e066 100644
+index b5232facc..c27e20e06 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentLootBonus.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentLootBonus.java
 @@ -4,6 +4,7 @@ public class EnchantmentLootBonus extends Enchantment {
@@ -341,7 +341,7 @@ index b5232faccc..c27e20e066 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.SILK_TOUCH;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentLure.java b/src/main/java/net/minecraft/server/EnchantmentLure.java
-index 1ffb91c570..c5a9e61f9a 100644
+index 1ffb91c57..c5a9e61f9 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentLure.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentLure.java
 @@ -4,6 +4,7 @@ public class EnchantmentLure extends Enchantment {
@@ -363,7 +363,7 @@ index 1ffb91c570..c5a9e61f9a 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentMending.java b/src/main/java/net/minecraft/server/EnchantmentMending.java
-index dafc29399f..ace2e19a6f 100644
+index dafc29399..ace2e19a6 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentMending.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentMending.java
 @@ -4,6 +4,7 @@ public class EnchantmentMending extends Enchantment {
@@ -385,7 +385,7 @@ index dafc29399f..ace2e19a6f 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentMultishot.java b/src/main/java/net/minecraft/server/EnchantmentMultishot.java
-index 6f423e7536..5fb8a624c2 100644
+index 6f423e753..5fb8a624c 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentMultishot.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentMultishot.java
 @@ -4,6 +4,7 @@ public class EnchantmentMultishot extends Enchantment {
@@ -409,7 +409,7 @@ index 6f423e7536..5fb8a624c2 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.PIERCING;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentOxygen.java b/src/main/java/net/minecraft/server/EnchantmentOxygen.java
-index c1bc97f6ef..a5726d36df 100644
+index c1bc97f6e..a5726d36d 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentOxygen.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentOxygen.java
 @@ -4,6 +4,7 @@ public class EnchantmentOxygen extends Enchantment {
@@ -431,7 +431,7 @@ index c1bc97f6ef..a5726d36df 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentPiercing.java b/src/main/java/net/minecraft/server/EnchantmentPiercing.java
-index 1a2e8e31f9..0e8993e86e 100644
+index 1a2e8e31f..0e8993e86 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentPiercing.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentPiercing.java
 @@ -4,6 +4,7 @@ public class EnchantmentPiercing extends Enchantment {
@@ -455,7 +455,7 @@ index 1a2e8e31f9..0e8993e86e 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.MULTISHOT;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentProtection.java b/src/main/java/net/minecraft/server/EnchantmentProtection.java
-index 416e57caa0..b29cb54677 100644
+index 416e57caa..b29cb5467 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentProtection.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentProtection.java
 @@ -10,7 +10,7 @@ public class EnchantmentProtection extends Enchantment {
@@ -480,7 +480,7 @@ index 416e57caa0..b29cb54677 100644
      public int a(int i, DamageSource damagesource) {
          return damagesource.ignoresInvulnerability() ? 0 : (this.a == EnchantmentProtection.DamageType.ALL ? i : (this.a == EnchantmentProtection.DamageType.FIRE && damagesource.isFire() ? i * 2 : (this.a == EnchantmentProtection.DamageType.FALL && damagesource == DamageSource.FALL ? i * 3 : (this.a == EnchantmentProtection.DamageType.EXPLOSION && damagesource.isExplosion() ? i * 2 : (this.a == EnchantmentProtection.DamageType.PROJECTILE && damagesource.b() ? i * 2 : 0)))));
 diff --git a/src/main/java/net/minecraft/server/EnchantmentQuickCharge.java b/src/main/java/net/minecraft/server/EnchantmentQuickCharge.java
-index e624b63aaf..762642ce5a 100644
+index e624b63aa..762642ce5 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentQuickCharge.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentQuickCharge.java
 @@ -4,6 +4,7 @@ public class EnchantmentQuickCharge extends Enchantment {
@@ -502,7 +502,7 @@ index e624b63aaf..762642ce5a 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java b/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java
-index 04aa8e1d5d..d0eac6dbc1 100644
+index 04aa8e1d5..d0eac6dbc 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java
 @@ -4,6 +4,7 @@ public class EnchantmentSilkTouch extends Enchantment {
@@ -526,7 +526,7 @@ index 04aa8e1d5d..d0eac6dbc1 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.LOOT_BONUS_BLOCKS;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentSweeping.java b/src/main/java/net/minecraft/server/EnchantmentSweeping.java
-index a20b1c8f5b..7804e0a0a8 100644
+index a20b1c8f5..7804e0a0a 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentSweeping.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentSweeping.java
 @@ -4,6 +4,7 @@ public class EnchantmentSweeping extends Enchantment {
@@ -550,7 +550,7 @@ index a20b1c8f5b..7804e0a0a8 100644
          return 1.0F - 1.0F / (float) (i + 1);
      }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentThorns.java b/src/main/java/net/minecraft/server/EnchantmentThorns.java
-index fd0255c890..df7c9b24b5 100644
+index fd0255c89..df7c9b24b 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentThorns.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentThorns.java
 @@ -7,6 +7,7 @@ public class EnchantmentThorns extends Enchantment {
@@ -574,7 +574,7 @@ index fd0255c890..df7c9b24b5 100644
      public boolean canEnchant(ItemStack itemstack) {
          return itemstack.getItem() instanceof ItemArmor ? true : super.canEnchant(itemstack);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentTridentChanneling.java b/src/main/java/net/minecraft/server/EnchantmentTridentChanneling.java
-index 14115ecc78..2533b2cab2 100644
+index 14115ecc7..2533b2cab 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentTridentChanneling.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentTridentChanneling.java
 @@ -4,6 +4,7 @@ public class EnchantmentTridentChanneling extends Enchantment {
@@ -598,7 +598,7 @@ index 14115ecc78..2533b2cab2 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentTridentImpaling.java b/src/main/java/net/minecraft/server/EnchantmentTridentImpaling.java
-index f64fc401e8..b47d8284f8 100644
+index f64fc401e..b47d8284f 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentTridentImpaling.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentTridentImpaling.java
 @@ -4,6 +4,7 @@ public class EnchantmentTridentImpaling extends Enchantment {
@@ -622,7 +622,7 @@ index f64fc401e8..b47d8284f8 100644
      public float a(int i, EnumMonsterType enummonstertype) {
          return enummonstertype == EnumMonsterType.e ? (float) i * 2.5F : 0.0F;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentTridentLoyalty.java b/src/main/java/net/minecraft/server/EnchantmentTridentLoyalty.java
-index dd91bed6e4..826f4d8750 100644
+index dd91bed6e..826f4d875 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentTridentLoyalty.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentTridentLoyalty.java
 @@ -4,6 +4,7 @@ public class EnchantmentTridentLoyalty extends Enchantment {
@@ -646,7 +646,7 @@ index dd91bed6e4..826f4d8750 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment);
 diff --git a/src/main/java/net/minecraft/server/EnchantmentTridentRiptide.java b/src/main/java/net/minecraft/server/EnchantmentTridentRiptide.java
-index 0f669dc7ac..81d6ccc35b 100644
+index 0f669dc7a..81d6ccc35 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentTridentRiptide.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentTridentRiptide.java
 @@ -4,6 +4,7 @@ public class EnchantmentTridentRiptide extends Enchantment {
@@ -670,7 +670,7 @@ index 0f669dc7ac..81d6ccc35b 100644
      public boolean a(Enchantment enchantment) {
          return super.a(enchantment) && enchantment != Enchantments.LOYALTY && enchantment != Enchantments.CHANNELING;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentVanishing.java b/src/main/java/net/minecraft/server/EnchantmentVanishing.java
-index 4ef59d7f17..5d7b6ca57a 100644
+index 4ef59d7f1..5d7b6ca57 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentVanishing.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentVanishing.java
 @@ -4,6 +4,7 @@ public class EnchantmentVanishing extends Enchantment {
@@ -694,7 +694,7 @@ index 4ef59d7f17..5d7b6ca57a 100644
      public boolean isTreasure() {
          return true;
 diff --git a/src/main/java/net/minecraft/server/EnchantmentWaterWorker.java b/src/main/java/net/minecraft/server/EnchantmentWaterWorker.java
-index cf0999095e..bea57861bf 100644
+index cf0999095..bea57861b 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentWaterWorker.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentWaterWorker.java
 @@ -4,6 +4,7 @@ public class EnchantmentWaterWorker extends Enchantment {
@@ -716,7 +716,7 @@ index cf0999095e..bea57861bf 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java b/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java
-index 4571cdf021..aa3cbd523a 100644
+index 4571cdf02..aa3cbd523 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java
 @@ -11,6 +11,7 @@ public class EnchantmentWeaponDamage extends Enchantment {
@@ -740,7 +740,7 @@ index 4571cdf021..aa3cbd523a 100644
      public float a(int i, EnumMonsterType enummonstertype) {
          return this.a == 0 ? 1.0F + (float) Math.max(0, i - 1) * 0.5F : (this.a == 1 && enummonstertype == EnumMonsterType.UNDEAD ? (float) i * 2.5F : (this.a == 2 && enummonstertype == EnumMonsterType.ARTHROPOD ? (float) i * 2.5F : 0.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c55e5c1f27..e09cc77785 100644
+index c55e5c1f2..e09cc7778 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,8 @@
@@ -766,7 +766,7 @@ index c55e5c1f27..e09cc77785 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 64ceeda1af..0e9fa34411 100644
+index 64ceeda1a..0e9fa3441 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -23,6 +23,13 @@ public class CraftEnchantment extends Enchantment {
diff --git a/patches/server/0106-Optimize-Chunk-Ticks.patch b/patches/server/0104-Optimize-Chunk-Ticks.patch
similarity index 98%
rename from patches/server/0106-Optimize-Chunk-Ticks.patch
rename to patches/server/0104-Optimize-Chunk-Ticks.patch
index 387fae02f..bf95b2421 100644
--- a/patches/server/0106-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0104-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From 6ac96e503a4993027ace192acf75b252b81c3dab Mon Sep 17 00:00:00 2001
+From 47afab96016c7acd88908b1c2d71d990a6a7e274 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 00:28:06 -0500
 Subject: [PATCH] Optimize Chunk Ticks
@@ -10,7 +10,7 @@ Subject: [PATCH] Optimize Chunk Ticks
  3 files changed, 51 insertions(+), 63 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2d4d7250..b7dadb1b 100644
+index 2d4d7250f..b7dadb1b9 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -737,11 +737,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -105,7 +105,7 @@ index 2d4d7250..b7dadb1b 100644
  
                                      // Paper start - only allow spawns upto the limit per chunk and update count afterwards
 diff --git a/src/main/java/net/minecraft/server/EnumCreatureType.java b/src/main/java/net/minecraft/server/EnumCreatureType.java
-index 3ed7fa32..7f236585 100644
+index 3ed7fa324..7f236585d 100644
 --- a/src/main/java/net/minecraft/server/EnumCreatureType.java
 +++ b/src/main/java/net/minecraft/server/EnumCreatureType.java
 @@ -31,11 +31,25 @@ public enum EnumCreatureType {
@@ -135,7 +135,7 @@ index 3ed7fa32..7f236585 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ee0cabad..5b9647c8 100644
+index ee0cabadc..5b9647c85 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1371,28 +1371,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/patches/server/0107-Add-configurable-beehive-generation-chance.patch b/patches/server/0105-Add-configurable-beehive-generation-chance.patch
similarity index 97%
rename from patches/server/0107-Add-configurable-beehive-generation-chance.patch
rename to patches/server/0105-Add-configurable-beehive-generation-chance.patch
index db5b61b32..8c20c38ba 100644
--- a/patches/server/0107-Add-configurable-beehive-generation-chance.patch
+++ b/patches/server/0105-Add-configurable-beehive-generation-chance.patch
@@ -1,4 +1,4 @@
-From 2430452d433a1e3cbc45ccb0db6e7d0c0a3e3c28 Mon Sep 17 00:00:00 2001
+From f539adeab76742c9fb014ddb3c0b67981f1dc540 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 03:39:34 -0500
 Subject: [PATCH] Add configurable beehive generation chance
@@ -10,7 +10,7 @@ Subject: [PATCH] Add configurable beehive generation chance
  3 files changed, 43 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
-index 5827b1ba1a..5ef9ae16e3 100644
+index 5827b1ba1..5ef9ae16e 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 @@ -10,7 +10,7 @@ import java.util.stream.Collectors;
@@ -53,7 +53,7 @@ index 5827b1ba1a..5ef9ae16e3 100644
      public <T> T a(DynamicOps<T> dynamicops) {
          return new Dynamic<>(dynamicops, dynamicops.createMap(ImmutableMap.of(dynamicops.createString("type"), dynamicops.createString(IRegistry.w.getKey(this.a).toString()), dynamicops.createString("probability"), dynamicops.createFloat(this.b)))).getValue(); // Purpur - decompile error
 diff --git a/src/main/java/net/minecraft/server/WorldGenTreeProvider.java b/src/main/java/net/minecraft/server/WorldGenTreeProvider.java
-index b9dee0e255..9e9d9e6437 100644
+index b9dee0e25..9e9d9e643 100644
 --- a/src/main/java/net/minecraft/server/WorldGenTreeProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldGenTreeProvider.java
 @@ -31,7 +31,10 @@ public abstract class WorldGenTreeProvider {
@@ -69,7 +69,7 @@ index b9dee0e255..9e9d9e6437 100644
          BlockPosition blockposition1;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 092542c811..833b58f858 100644
+index adcdc6b8f..0347b729c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -99,6 +99,29 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0108-Add-more-timings-timers.patch b/patches/server/0106-Add-more-timings-timers.patch
similarity index 97%
rename from patches/server/0108-Add-more-timings-timers.patch
rename to patches/server/0106-Add-more-timings-timers.patch
index c475eb124..0b0d2a094 100644
--- a/patches/server/0108-Add-more-timings-timers.patch
+++ b/patches/server/0106-Add-more-timings-timers.patch
@@ -1,4 +1,4 @@
-From ac0b17650a47c0c66f4160c6e356757f81a7d680 Mon Sep 17 00:00:00 2001
+From 61ba4cfbcbc576de5c1be2698d96cc20495b23f3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 02:36:45 -0500
 Subject: [PATCH] Add more timings timers
@@ -12,7 +12,7 @@ Subject: [PATCH] Add more timings timers
  5 files changed, 56 insertions(+)
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 434833d50e..cb27ed36e6 100644
+index 434833d50..cb27ed36e 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -43,6 +43,28 @@ public final class MinecraftTimings {
@@ -45,7 +45,7 @@ index 434833d50e..cb27ed36e6 100644
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 6a9d0ef0ef..15a5fb7139 100644
+index 6a9d0ef0e..15a5fb713 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1,5 +1,7 @@
@@ -98,7 +98,7 @@ index 6a9d0ef0ef..15a5fb7139 100644
          this.K();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2769077bb4..fdb8a0f8c7 100644
+index 19e281bec..5bf8a2ba2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2385,7 +2385,9 @@ public abstract class EntityLiving extends Entity {
@@ -164,7 +164,7 @@ index 2769077bb4..fdb8a0f8c7 100644
          // Purpur start
          if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 90319909e5..ab51ef4297 100644
+index 90319909e..ab51ef429 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -77,6 +77,7 @@ public class PathfinderGoalSelector {
@@ -206,7 +206,7 @@ index 90319909e5..ab51ef4297 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d0d3d6c29c..51b7b23181 100644
+index e1387ddce..4e513c3b8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -833,7 +833,9 @@ public class WorldServer extends World {
diff --git a/patches/server/0109-Skip-events-if-there-s-no-listeners.patch b/patches/server/0107-Skip-events-if-there-s-no-listeners.patch
similarity index 93%
rename from patches/server/0109-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0107-Skip-events-if-there-s-no-listeners.patch
index 09468efb9..46f6771af 100644
--- a/patches/server/0109-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0107-Skip-events-if-there-s-no-listeners.patch
@@ -1,4 +1,4 @@
-From 0c8b77f20fe27deccd422869c2276b560832efb2 Mon Sep 17 00:00:00 2001
+From 0630a14a583fb53ddcb82eabd93971d746d3b33f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners
@@ -8,7 +8,7 @@ Subject: [PATCH] Skip events if there's no listeners
  1 file changed, 2 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 6a755df64f..5ece5c4eeb 100644
+index 6a755df64..5ece5c4ee 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -274,6 +274,7 @@ public class CommandDispatcher {
diff --git a/patches/server/0110-Debug-stick-should-not-update-neighbors.patch b/patches/server/0108-Debug-stick-should-not-update-neighbors.patch
similarity index 91%
rename from patches/server/0110-Debug-stick-should-not-update-neighbors.patch
rename to patches/server/0108-Debug-stick-should-not-update-neighbors.patch
index b45eebb5d..91dba27b2 100644
--- a/patches/server/0110-Debug-stick-should-not-update-neighbors.patch
+++ b/patches/server/0108-Debug-stick-should-not-update-neighbors.patch
@@ -1,4 +1,4 @@
-From 9fb281ad4d375cdf7071b698c64d4d64c49cad20 Mon Sep 17 00:00:00 2001
+From ef986adbfb080101340356a3077f14b00dae280a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 17:16:30 -0500
 Subject: [PATCH] Debug stick should not update neighbors
@@ -8,7 +8,7 @@ Subject: [PATCH] Debug stick should not update neighbors
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6b45bc17cf..92d9ddf6a7 100644
+index 6b45bc17c..92d9ddf6a 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -185,6 +185,11 @@ public final class ItemStack {
diff --git a/patches/server/0111-Chickens-can-retaliate.patch b/patches/server/0109-Chickens-can-retaliate.patch
similarity index 96%
rename from patches/server/0111-Chickens-can-retaliate.patch
rename to patches/server/0109-Chickens-can-retaliate.patch
index 95b294922..5b8f6d039 100644
--- a/patches/server/0111-Chickens-can-retaliate.patch
+++ b/patches/server/0109-Chickens-can-retaliate.patch
@@ -1,4 +1,4 @@
-From dcddff3c4d31806884dadf1bd5214c7fd71664ef Mon Sep 17 00:00:00 2001
+From 2422eb999f076057c56730aea8c7f10125bce5a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 12 Apr 2020 13:19:34 -0500
 Subject: [PATCH] Chickens can retaliate
@@ -9,7 +9,7 @@ Subject: [PATCH] Chickens can retaliate
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 5505b7ee94..1c9b0ce61b 100644
+index 5505b7ee9..1c9b0ce61 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -38,13 +38,22 @@ public class EntityChicken extends EntityAnimal {
@@ -47,7 +47,7 @@ index 5505b7ee94..1c9b0ce61b 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 833b58f858..cb7bdf2dad 100644
+index 0347b729c..b557353ac 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -361,6 +361,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0110-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
similarity index 95%
rename from patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
rename to patches/server/0110-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
index 4b29951e0..fecea7233 100644
--- a/patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
+++ b/patches/server/0110-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
@@ -1,4 +1,4 @@
-From d73313c8885078fa9587512f8d951baac56558c8 Mon Sep 17 00:00:00 2001
+From da20e0679ace0b7eaeda46a07b45c6fbc6f42fd7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
@@ -8,7 +8,7 @@ Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 48da1e662a..11d1dc8763 100644
+index 48da1e662..11d1dc876 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -154,6 +154,8 @@ public abstract class EntityArrow extends Entity implements IProjectile {
diff --git a/patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0111-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 95%
rename from patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0111-MC-168772-Fix-Add-turtle-egg-block-options.patch
index c2c1bfeec..7f4748025 100644
--- a/patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch
+++ b/patches/server/0111-MC-168772-Fix-Add-turtle-egg-block-options.patch
@@ -1,4 +1,4 @@
-From 72cd246994378bfeed237d33367b59267a9da267 Mon Sep 17 00:00:00 2001
+From d4f324a177591396fb10607966a9cbb9df7517a0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
@@ -9,7 +9,7 @@ Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
  2 files changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index cb36334e41..aa83ef1699 100644
+index cb36334e4..aa83ef169 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -157,6 +157,23 @@ public class BlockTurtleEgg extends Block {
@@ -38,7 +38,7 @@ index cb36334e41..aa83ef1699 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cb7bdf2dad..c6b436c1f3 100644
+index b557353ac..7c81d1149 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -191,6 +191,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0114-MC-4-Fix-Item-position-desync.patch b/patches/server/0112-MC-4-Fix-Item-position-desync.patch
similarity index 94%
rename from patches/server/0114-MC-4-Fix-Item-position-desync.patch
rename to patches/server/0112-MC-4-Fix-Item-position-desync.patch
index 0bb6e59d1..bfcb75731 100644
--- a/patches/server/0114-MC-4-Fix-Item-position-desync.patch
+++ b/patches/server/0112-MC-4-Fix-Item-position-desync.patch
@@ -1,4 +1,4 @@
-From e9b38ffb7e164bd0afb0dfe8d4fd86c8b10beb90 Mon Sep 17 00:00:00 2001
+From 0e973218573b264686c93bc7b2b09fac4f9ba5a0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync
@@ -10,7 +10,7 @@ Subject: [PATCH] MC-4 Fix - Item position desync
  3 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 1f7c8f7da0..1589b46b75 100644
+index 1f7c8f7da..1589b46b7 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -126,6 +126,12 @@ public class EntityTrackerEntry {
@@ -27,7 +27,7 @@ index 1f7c8f7da0..1589b46b75 100644
                  boolean flag2 = flag1 || this.tickCounter % 60 == 0;
                  boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index 5b1d959354..0010448e3a 100644
+index 5b1d95935..0010448e3 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
@@ -44,7 +44,7 @@ index 5b1d959354..0010448e3a 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e09cc77785..4d7795c938 100644
+index e09cc7778..4d7795c93 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -167,8 +167,10 @@ public class PurpurConfig {
diff --git a/patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0113-MC-56653-Fix-pig-zombies-aggro.patch
similarity index 93%
rename from patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch
rename to patches/server/0113-MC-56653-Fix-pig-zombies-aggro.patch
index 38322b1ce..1e3406c8b 100644
--- a/patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch
+++ b/patches/server/0113-MC-56653-Fix-pig-zombies-aggro.patch
@@ -1,4 +1,4 @@
-From 2f815445c62c46d625d38d620c0a9cab82f579ac Mon Sep 17 00:00:00 2001
+From 706f84b4e67f75b70f04a00e9a669cc6193805b6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] MC-56653 Fix - pig zombies aggro
@@ -9,7 +9,7 @@ Subject: [PATCH] MC-56653 Fix - pig zombies aggro
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 90bf12c735..c78876fc42 100644
+index 90bf12c73..c78876fc4 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -170,6 +170,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -43,10 +43,10 @@ index 90bf12c735..c78876fc42 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c6b436c1f3..e46a9fd9be 100644
+index 7c81d1149..9d56de22b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1005,6 +1005,7 @@ public class PurpurWorldConfig {
+@@ -1001,6 +1001,7 @@ public class PurpurWorldConfig {
      public boolean zombiePigmanJockeyOnlyBaby = true;
      public double zombiePigmanJockeyChance = 0.05D;
      public boolean zombiePigmanJockeyTryExistingChickens = true;
@@ -54,7 +54,7 @@ index c6b436c1f3..e46a9fd9be 100644
      private void zombiePigmanSettings() {
          zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable);
          zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater);
-@@ -1012,6 +1013,7 @@ public class PurpurWorldConfig {
+@@ -1008,6 +1009,7 @@ public class PurpurWorldConfig {
          zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby);
          zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance);
          zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens);
diff --git a/patches/server/0116-EMC-MonsterEggSpawn-Event.patch b/patches/server/0114-EMC-MonsterEggSpawn-Event.patch
similarity index 97%
rename from patches/server/0116-EMC-MonsterEggSpawn-Event.patch
rename to patches/server/0114-EMC-MonsterEggSpawn-Event.patch
index 3c58d4d5b..257d6c3cc 100644
--- a/patches/server/0116-EMC-MonsterEggSpawn-Event.patch
+++ b/patches/server/0114-EMC-MonsterEggSpawn-Event.patch
@@ -1,4 +1,4 @@
-From 31513ff7e94bbfa1caef3894f7d0c73a78f07e91 Mon Sep 17 00:00:00 2001
+From 9f61ced4cf69cbcf15bb72b3eb5757d6136cd39e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event
@@ -8,7 +8,7 @@ Subject: [PATCH] EMC - MonsterEggSpawn Event
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 8e8d392a15..ff11baa7c5 100644
+index 8e8d392a1..ff11baa7c 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -163,19 +163,45 @@ public class EntityTypes<T extends Entity> {
diff --git a/patches/server/0117-PaperPR-Add-BellRingEvent.patch b/patches/server/0115-PaperPR-Add-BellRingEvent.patch
similarity index 96%
rename from patches/server/0117-PaperPR-Add-BellRingEvent.patch
rename to patches/server/0115-PaperPR-Add-BellRingEvent.patch
index a38e82ed1..9e8b6c20f 100644
--- a/patches/server/0117-PaperPR-Add-BellRingEvent.patch
+++ b/patches/server/0115-PaperPR-Add-BellRingEvent.patch
@@ -1,4 +1,4 @@
-From c14c95dd0966ac032112ccfb1f5c5ddd33c42d6f Mon Sep 17 00:00:00 2001
+From b06b8b8acc0905e168f95ed9121673337b70bd7f Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] PaperPR - Add BellRingEvent
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockBell.java b/src/main/java/net/minecraft/server/BlockBell.java
-index dbdbfb8ad9..0bbd1e1594 100644
+index dbdbfb8ad..0bbd1e159 100644
 --- a/src/main/java/net/minecraft/server/BlockBell.java
 +++ b/src/main/java/net/minecraft/server/BlockBell.java
 @@ -45,7 +45,7 @@ public class BlockBell extends BlockTileEntity {
diff --git a/patches/server/0118-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0116-PaperPR-Per-World-Spawn-limits.patch
similarity index 93%
rename from patches/server/0118-PaperPR-Per-World-Spawn-limits.patch
rename to patches/server/0116-PaperPR-Per-World-Spawn-limits.patch
index 58be76767..2c1db338c 100644
--- a/patches/server/0118-PaperPR-Per-World-Spawn-limits.patch
+++ b/patches/server/0116-PaperPR-Per-World-Spawn-limits.patch
@@ -1,4 +1,4 @@
-From 872ceab741f0e42341a81dd926b476c65b808e73 Mon Sep 17 00:00:00 2001
+From da1579cb7a9491c0198daccaa813079447cf2018 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -9,7 +9,7 @@ Subject: [PATCH] PaperPR - Per World Spawn limits
  2 files changed, 18 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e46a9fd9be..ef34a3482e 100644
+index 9d56de22b..fa92f92b2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -307,6 +307,17 @@ public class PurpurWorldConfig {
@@ -31,7 +31,7 @@ index e46a9fd9be..ef34a3482e 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b9b23c9803..46de7d232f 100644
+index b9b23c980..46de7d232 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -332,6 +332,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0119-Tuinity-Delay-chunk-unloads.patch b/patches/server/0117-Tuinity-Delay-chunk-unloads.patch
similarity index 97%
rename from patches/server/0119-Tuinity-Delay-chunk-unloads.patch
rename to patches/server/0117-Tuinity-Delay-chunk-unloads.patch
index 96abb2326..ba208fa83 100644
--- a/patches/server/0119-Tuinity-Delay-chunk-unloads.patch
+++ b/patches/server/0117-Tuinity-Delay-chunk-unloads.patch
@@ -1,4 +1,4 @@
-From 9b9c02d7330a016c77147e42462ee459b54edafd Mon Sep 17 00:00:00 2001
+From d1338ae8d4e0b7404717c5c77f9bd4d01d41d786 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
 Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -23,7 +23,7 @@ Configurable under `delay-chunkunloads-by` in config.
  6 files changed, 83 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 55f9f4e6e7..ac21fdb4c9 100644
+index 55f9f4e6e..ac21fdb4c 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -68,6 +68,7 @@ public abstract class ChunkMap extends LightEngineGraph {
@@ -35,7 +35,7 @@ index 55f9f4e6e7..ac21fdb4c9 100644
          this.a(ChunkCoordIntPair.a, i, j, flag);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 279c7a85fb..f26bc3417e 100644
+index 279c7a85f..f26bc3417 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -30,7 +30,7 @@ public abstract class ChunkMapDistance {
@@ -148,7 +148,7 @@ index 279c7a85fb..f26bc3417e 100644
  
          if (arraysetsorted.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
-index 7a8397815a..8aae0b63e5 100644
+index 7a8397815..8aae0b63e 100644
 --- a/src/main/java/net/minecraft/server/Ticket.java
 +++ b/src/main/java/net/minecraft/server/Ticket.java
 @@ -5,9 +5,10 @@ import java.util.Objects;
@@ -173,7 +173,7 @@ index 7a8397815a..8aae0b63e5 100644
          long j = this.a.b();
  
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 6e0d0a54a2..07f77dbb87 100644
+index 6e0d0a54a..07f77dbb8 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -24,6 +24,7 @@ public class TicketType<T> {
@@ -185,7 +185,7 @@ index 6e0d0a54a2..07f77dbb87 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4d7795c938..a13cb072ba 100644
+index 4d7795c93..a13cb072b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Throwables;
@@ -210,7 +210,7 @@ index 4d7795c938..a13cb072ba 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 46de7d232f..efc9e52305 100644
+index 46de7d232..efc9e5230 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -485,6 +485,7 @@ public class CraftWorld implements World {
diff --git a/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
similarity index 91%
rename from patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
rename to patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
index 8a3a0d4f5..0b4766570 100644
--- a/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
+++ b/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
@@ -1,4 +1,4 @@
-From cd86fc965766b1c066b2eeacc366357c63c586c9 Mon Sep 17 00:00:00 2001
+From da871a180dfc54739fff08a9cbdcbd3be8a5b974 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
@@ -12,7 +12,7 @@ chunks.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5606e080..b27d1389 100644
+index 5606e080f..b27d1389a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1085,7 +1085,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0121-YAPFA-Disable-mojang-profiler.patch b/patches/server/0119-YAPFA-Disable-mojang-profiler.patch
similarity index 96%
rename from patches/server/0121-YAPFA-Disable-mojang-profiler.patch
rename to patches/server/0119-YAPFA-Disable-mojang-profiler.patch
index 503bac6be..bbbbe609c 100644
--- a/patches/server/0121-YAPFA-Disable-mojang-profiler.patch
+++ b/patches/server/0119-YAPFA-Disable-mojang-profiler.patch
@@ -1,4 +1,4 @@
-From d5f1d879bfcd359045ee89a6c3da3148dbaee4f4 Mon Sep 17 00:00:00 2001
+From cb418422b16518c3ddbb6a12dd8a8b87996e23b2 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler
@@ -13,7 +13,7 @@ Subject: [PATCH] YAPFA - Disable mojang profiler
  create mode 100644 src/main/java/net/pl3x/purpur/GameProfilerNoop.java
 
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index f0d72ea3..e38a6840 100644
+index f0d72ea39..e38a68406 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -22,6 +22,7 @@ public class CommandDebug {
@@ -43,7 +43,7 @@ index f0d72ea3..e38a6840 100644
              throw CommandDebug.b.create();
          } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b27d1389..e61740eb 100644
+index b27d1389a..e61740eb1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -74,7 +74,7 @@ index b27d1389..e61740eb 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/GameProfilerNoop.java b/src/main/java/net/pl3x/purpur/GameProfilerNoop.java
 new file mode 100644
-index 00000000..b32a5418
+index 000000000..b32a5418f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/GameProfilerNoop.java
 @@ -0,0 +1,68 @@
@@ -147,7 +147,7 @@ index 00000000..b32a5418
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7b7e1475..1136a0a2 100644
+index 7b7e1475b..1136a0a26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -144,6 +144,8 @@ public class Main {
@@ -160,7 +160,7 @@ index 7b7e1475..1136a0a2 100644
  
                  // Paper start
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index e81beea7..5c3536b2 100644
+index e81beea7f..5c3536b26 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0122-More-anvil-controls.patch b/patches/server/0120-More-anvil-controls.patch
similarity index 97%
rename from patches/server/0122-More-anvil-controls.patch
rename to patches/server/0120-More-anvil-controls.patch
index 596d74377..4fb50077c 100644
--- a/patches/server/0122-More-anvil-controls.patch
+++ b/patches/server/0120-More-anvil-controls.patch
@@ -1,4 +1,4 @@
-From aa6795c81c388dea7f26303c9082f3a31c5ce830 Mon Sep 17 00:00:00 2001
+From dd6301f66647999a2f68a9bed9b3fafa3a20177e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 19 Apr 2020 00:17:56 -0500
 Subject: [PATCH] More anvil controls
@@ -9,7 +9,7 @@ Subject: [PATCH] More anvil controls
  2 files changed, 43 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 286b930ddb..c34f1e02cb 100644
+index 286b930dd..c34f1e02c 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger;
@@ -97,7 +97,7 @@ index 286b930ddb..c34f1e02cb 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 9374c27061..db5e4f2bd1 100644
+index 9374c2706..db5e4f2bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 @@ -47,4 +47,26 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
diff --git a/patches/server/0123-PlayerItemCooldownEvent.patch b/patches/server/0121-PlayerItemCooldownEvent.patch
similarity index 92%
rename from patches/server/0123-PlayerItemCooldownEvent.patch
rename to patches/server/0121-PlayerItemCooldownEvent.patch
index a0ad77650..fd7f4f495 100644
--- a/patches/server/0123-PlayerItemCooldownEvent.patch
+++ b/patches/server/0121-PlayerItemCooldownEvent.patch
@@ -1,4 +1,4 @@
-From f3bd62e552aed846b8c1b902292254e376de8430 Mon Sep 17 00:00:00 2001
+From 3a2fd1eec0a16da2d4b7c46770bf261055d9a7f3 Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:06 +0200
 Subject: [PATCH] PlayerItemCooldownEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] PlayerItemCooldownEvent
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-index 27cde8c1..3c3bcc7f 100644
+index 27cde8c15..3c3bcc7f9 100644
 --- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
 +++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
 @@ -2,12 +2,23 @@ package net.minecraft.server;
@@ -37,5 +37,5 @@ index 27cde8c1..3c3bcc7f 100644
      protected void b(Item item, int i) {
          super.b(item, i);
 -- 
-2.26.1.windows.1
+2.24.0
 
diff --git a/patches/server/0124-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0122-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
similarity index 95%
rename from patches/server/0124-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
rename to patches/server/0122-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
index cd50e0fc2..b60a94bbe 100644
--- a/patches/server/0124-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0122-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@@ -1,4 +1,4 @@
-From 46b921754cc8fa9dcb95827411be3110b692ede7 Mon Sep 17 00:00:00 2001
+From 05f18eb35eccb106ab1751d5f0571af690044434 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:33:11 -0500
 Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
@@ -9,7 +9,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 15a5fb71..6e37acaa 100644
+index 15a5fb713..6e37acaa4 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -525,7 +525,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index 15a5fb71..6e37acaa 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 ef34a348..f4ac3143 100644
+index fa92f92b2..394c62f49 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -209,6 +209,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0125-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0123-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
similarity index 90%
rename from patches/server/0125-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
rename to patches/server/0123-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
index 07b1f5b04..a35667559 100644
--- a/patches/server/0125-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0123-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
@@ -1,4 +1,4 @@
-From 872711bd898c69801bb8971a3a3424b7a4f3271a Mon Sep 17 00:00:00 2001
+From d1c239c1ca012787901034918cd6a5b9949c9903 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:37:29 -0500
 Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
@@ -9,7 +9,7 @@ Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java
-index e05e9772..cf3126a6 100644
+index e05e97727..cf3126a65 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java
 @@ -20,7 +20,7 @@ public class BehaviorFarm extends Behavior<EntityVillager> {
@@ -22,10 +22,10 @@ index e05e9772..cf3126a6 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 f4ac3143..117f2095 100644
+index 394c62f49..d98cf3bd9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -912,6 +912,7 @@ public class PurpurWorldConfig {
+@@ -908,6 +908,7 @@ public class PurpurWorldConfig {
      public boolean villagerCanBeLeashed = false;
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
@@ -33,7 +33,7 @@ index f4ac3143..117f2095 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -922,6 +923,7 @@ public class PurpurWorldConfig {
+@@ -918,6 +919,7 @@ public class PurpurWorldConfig {
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);