From c0c212bf4873df06e588732b6dba787a8f3e020d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 Jun 2020 21:41:54 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more
---
 Paper                                         |   2 +-
 current-paper                                 |   2 +-
 patches/api/0002-Purpur-config-files.patch    |  50 +----
 patches/api/0003-Host-our-own-timings.patch   |  25 ---
 ...004-Ridables.patch => 0003-Ridables.patch} |   2 +-
 ...ntless-annotations-and-deprecations.patch} |  16 +-
 ...ch => 0005-Allow-inventory-resizing.patch} |   2 +-
 ...API.patch => 0006-Implement-AFK-API.patch} |   6 +-
 ... => 0007-Add-EntityPortalReadyEvent.patch} |   2 +-
 ...atch => 0008-Bring-back-server-name.patch} |   6 +-
 ...ement-LivingEntity-safeFallDistance.patch} |   2 +-
 ...tch => 0010-Add-ExecuteCommandEvent.patch} |   2 +-
 ...> 0011-Implement-ChunkTooLargeEvent.patch} |   2 +-
 ...=> 0012-Implement-lagging-threshold.patch} |   6 +-
 ...h => 0013-Advancement-API-Additions.patch} |   2 +-
 ...Implement-ItemFactory-getMonsterEgg.patch} |   2 +-
 ...nt-PlayerSetSpawnerTypeWithEggEvent.patch} |   2 +-
 ...ch => 0016-Add-MonsterEggSpawnEvent.patch} |   2 +-
 ...tch => 0017-Add-ThrownEggHatchEvent.patch} |   2 +-
 ...PI.patch => 0018-Add-moon-phase-API.patch} |   2 +-
 ...19-Add-API-for-Villager-resetOffers.patch} |   4 +-
 ...020-Expose-getItemStack-for-Trident.patch} |   2 +-
 ...PI.patch => 0021-Add-more-llama-API.patch} |   2 +-
 ...I.patch => 0022-Add-more-evoker-API.patch} |   2 +-
 ...-Add-getPlacementBlockData-to-World.patch} |   2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   2 +-
 ...getPlayer-to-SkeletonHorseTrapEvent.patch} |   2 +-
 ...Add-LootableInventoryFirstFillEvent.patch} |   2 +-
 ...tyCreatePortalEvent-for-EnderDragon.patch} |   2 +-
 ...h => 0028-Implement-EntityMoveEvent.patch} |   2 +-
 ...9-Add-ItemStack-convenience-methods.patch} |   2 +-
 ...ent.patch => 0030-Add-BellRingEvent.patch} |   2 +-
 ...-Configurable-enchantment-max-level.patch} |   2 +-
 ...s.patch => 0032-More-anvil-controls.patch} |   8 +-
 ...tch => 0033-PlayerItemCooldownEvent.patch} |   6 +-
 ...ch => 0034-Player-invulnerabilities.patch} |   4 +-
 patches/server/0001-Rebrand.patch             |  20 +-
 patches/server/0002-Purpur-config-files.patch |  20 +-
 patches/server/0003-Timings-stuff.patch       |  62 ++++++
 ...fixes.patch => 0004-decompile-fixes.patch} | 178 +++++++++---------
 ...0005-Add-language-asset-purpur.lang.patch} |   2 +-
 ...-vanilla-command-permission-handler.patch} |   4 +-
 ....patch => 0007-Host-our-own-timings.patch} |   4 +-
 ...007-Ridables.patch => 0008-Ridables.patch} |   8 +-
 ...settings-suppressing-pointless-logs.patch} |  12 +-
 ...> 0010-Disable-outdated-build-check.patch} |   4 +-
 ... 0011-Add-obfhelpers-for-plugin-use.patch} |   8 +-
 ...s.patch => 0012-Silk-touch-spawners.patch} |   8 +-
 ...nts-AI.patch => 0013-Give-giants-AI.patch} |   6 +-
 ...tch => 0014-Illusioners-AI-settings.patch} |   4 +-
 ...> 0015-Zombie-horse-naturally-spawn.patch} |   2 +-
 ...016-Charged-creeper-naturally-spawn.patch} |   4 +-
 ...it-naturally-spawn-toast-and-killer.patch} |   2 +-
 ....patch => 0018-Cat-spawning-options.patch} |   4 +-
 ...ck-cat-types-spawning-in-swamp-huts.patch} |   2 +-
 ...ms.patch => 0020-Cows-eat-mushrooms.patch} |  10 +-
 ...ow-rotation-when-shearing-mooshroom.patch} |   4 +-
 ...patch => 0022-Pigs-give-saddle-back.patch} |   2 +-
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  14 +-
 ...4-Snowman-drop-and-put-back-pumpkin.patch} |   6 +-
 ...> 0025-Ender-dragon-always-drop-egg.patch} |   6 +-
 ...6-Ender-dragon-always-drop-full-exp.patch} |   6 +-
 ... 0027-Signs-editable-on-right-click.patch} |   8 +-
 ...er-showing-in-ping-before-server-fu.patch} |   4 +-
 ...patch => 0029-Make-Iron-Golems-Swim.patch} |   6 +-
 ...oisten-from-water-directly-under-it.patch} |   6 +-
 ...atch => 0031-Controllable-Minecarts.patch} |  10 +-
 ...tch => 0032-Signs-allow-color-codes.patch} |   4 +-
 ...=> 0033-Campfires-have-regen-effect.patch} |  12 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |   6 +-
 ... => 0035-Campfires-burn-out-in-rain.patch} |   8 +-
 ...-Campfires-should-fall-with-gravity.patch} |   6 +-
 ...37-Dont-send-useless-entity-packets.patch} |   8 +-
 ...API.patch => 0038-Implement-AFK-API.patch} |   8 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |   6 +-
 ...-mends-most-damages-equipment-first.patch} |  10 +-
 ...atch => 0041-Tulips-change-fox-type.patch} |   8 +-
 ...-Pillager-limits-and-leaders-chance.patch} |   8 +-
 ...r.patch => 0043-Make-the-GUI-better.patch} |  38 ++--
 ...44-Players-should-not-cram-to-death.patch} |   2 +-
 ... => 0045-Add-EntityPortalReadyEvent.patch} |   2 +-
 ...h => 0046-Implement-elytra-settings.patch} |  14 +-
 ...Add-blacklist-option-for-grindstone.patch} |   8 +-
 ...=> 0048-Implement-lagging-threshold.patch} |   8 +-
 ...t-configurable-villager-brain-ticks.patch} |   2 +-
 ...-for-zombies-targetting-turtle-eggs.patch} |   6 +-
 ...51-Implement-bamboo-growth-settings.patch} |   6 +-
 ...should-not-bypass-cramming-gamerule.patch} |  22 +--
 ...0053-Option-for-slimes-not-pushable.patch} |   8 +-
 ...atch => 0054-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 => 0058-Advancement-API-Additions.patch} |  14 +-
 ...ption-to-set-armorstand-step-height.patch} |   6 +-
 ...Implement-ItemFactory-getMonsterEgg.patch} |   6 +-
 ...0061-Alternative-Keepalive-Handling.patch} |   8 +-
 ...nt-PlayerSetSpawnerTypeWithEggEvent.patch} |   4 +-
 ...PI.patch => 0063-Add-moon-phase-API.patch} |   4 +-
 ...-Add-getPlacementBlockData-to-World.patch} |  10 +-
 ...s.patch => 0065-Barrels-have-6-rows.patch} |   8 +-
 ...-Enderchest-6-rows-plus-permissions.patch} |  14 +-
 ...067-Add-5-second-tps-average-in-tps.patch} |   8 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   4 +-
 ...I.patch => 0069-Add-more-evoker-API.patch} |   6 +-
 ...70-Add-API-for-Villager-resetOffers.patch} |   2 +-
 ...PI.patch => 0071-Add-more-llama-API.patch} |   8 +-
 ...speed-multiplier-using-values-betwe.patch} |   4 +-
 ...tch => 0073-Implement-infinite-lava.patch} |  10 +-
 ...074-Expose-getItemStack-for-Trident.patch} |   6 +-
 ...=> 0075-Despawn-egg-hatches-chicken.patch} |   6 +-
 ...eEvent-not-firing-for-all-use-cases.patch} |   6 +-
 ...ons.patch => 0077-Add-sleep-options.patch} |   6 +-
 ...78-Option-for-hay-block-fall-damage.patch} |   6 +-
 ...getPlayer-to-SkeletonHorseTrapEvent.patch} |   4 +-
 ...Add-LootableInventoryFirstFillEvent.patch} |   6 +-
 ...081-Villagers-follow-emerald-blocks.patch} |  10 +-
 ...dd-player-death-exp-control-options.patch} |   6 +-
 ... 0083-Add-permission-for-F3-N-debug.patch} |   4 +-
 ...ch => 0084-Allow-leashing-villagers.patch} |   2 +-
 ...rable-search-radius-for-villagers-t.patch} |   2 +-
 ...6-Make-lava-flow-speed-configurable.patch} |   8 +-
 ...skeleton-takes-wither-damage-option.patch} |   6 +-
 ...> 0088-UPnP-Port-Forwarding-Service.patch} |  14 +-
 ...h => 0089-Implement-EntityMoveEvent.patch} |   4 +-
 ...-disable-saving-projectiles-to-disk.patch} |  18 +-
 ...091-Implement-bed-explosion-options.patch} |   6 +-
 ...tch => 0092-Add-item-entity-options.patch} |   8 +-
 ...tural-spawns-per-biome-configurable.patch} | 158 ++++++++--------
 ...094-Configurable-void-damage-height.patch} |   6 +-
 ...095-Fix-the-dead-lagging-the-server.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} |   8 +-
 ...ould-check-if-entity-can-use-portal.patch} |   4 +-
 ...ch => 0100-Configurable-TPS-Catchup.patch} |   6 +-
 ...patch => 0101-Breedable-Polar-Bears.patch} |   6 +-
 ...=> 0102-Configurable-jockey-options.patch} |  14 +-
 ...-Configurable-enchantment-max-level.patch} |  66 +++----
 ....patch => 0104-Optimize-Chunk-Ticks.patch} |   2 +-
 ...figurable-beehive-generation-chance.patch} |   8 +-
 ...tch => 0106-Add-more-timings-timers.patch} |   4 +-
 ...Skip-events-if-there-s-no-listeners.patch} |   4 +-
 ...g-stick-should-not-update-neighbors.patch} |   4 +-
 ...erman-and-creeper-griefing-controls.patch} |   8 +-
 ...atch => 0110-Chickens-can-retaliate.patch} |   6 +-
 ...p-loot-bypass-mob-griefing-gamerule.patch} |   6 +-
 ...s.patch => 0112-More-anvil-controls.patch} |   6 +-
 ...ng-can-bypass-mob-griefing-gamerule.patch} |   6 +-
 ...ch => 0114-Player-invulnerabilities.patch} |  10 +-
 ...ays-increment-arrow-despawn-counter.patch} |   4 +-
 ...72-Fix-Add-turtle-egg-block-options.patch} |   6 +-
 ... 0117-MC-4-Fix-Item-position-desync.patch} |   8 +-
 ...0118-MC-56653-Fix-pig-zombies-aggro.patch} |   6 +-
 ...h => 0119-EMC-MonsterEggSpawn-Event.patch} |   4 +-
 ...h => 0120-PaperPR-Add-BellRingEvent.patch} |   4 +-
 ...0121-PaperPR-Per-World-Spawn-limits.patch} |   6 +-
 ...122-PaperPR-PlayerItemCooldownEvent.patch} |   4 +-
 ...=> 0123-Tuinity-Delay-chunk-unloads.patch} |   4 +-
 ...le-to-execute-tasks-on-the-main-ser.patch} |   4 +-
 ... 0125-YAPFA-Disable-mojang-profiler.patch} |  14 +-
 161 files changed, 754 insertions(+), 759 deletions(-)
 delete mode 100644 patches/api/0003-Host-our-own-timings.patch
 rename patches/api/{0004-Ridables.patch => 0003-Ridables.patch} (98%)
 rename patches/api/{0005-Remove-pointless-annotations-and-deprecations.patch => 0004-Remove-pointless-annotations-and-deprecations.patch} (95%)
 rename patches/api/{0006-Allow-inventory-resizing.patch => 0005-Allow-inventory-resizing.patch} (94%)
 rename patches/api/{0007-Implement-AFK-API.patch => 0006-Implement-AFK-API.patch} (96%)
 rename patches/api/{0008-Add-EntityPortalReadyEvent.patch => 0007-Add-EntityPortalReadyEvent.patch} (96%)
 rename patches/api/{0009-Bring-back-server-name.patch => 0008-Bring-back-server-name.patch} (91%)
 rename patches/api/{0010-Implement-LivingEntity-safeFallDistance.patch => 0009-Implement-LivingEntity-safeFallDistance.patch} (94%)
 rename patches/api/{0011-Add-ExecuteCommandEvent.patch => 0010-Add-ExecuteCommandEvent.patch} (98%)
 rename patches/api/{0012-Implement-ChunkTooLargeEvent.patch => 0011-Implement-ChunkTooLargeEvent.patch} (98%)
 rename patches/api/{0013-Implement-lagging-threshold.patch => 0012-Implement-lagging-threshold.patch} (91%)
 rename patches/api/{0014-Advancement-API-Additions.patch => 0013-Advancement-API-Additions.patch} (98%)
 rename patches/api/{0015-Implement-ItemFactory-getMonsterEgg.patch => 0014-Implement-ItemFactory-getMonsterEgg.patch} (93%)
 rename patches/api/{0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch => 0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch} (97%)
 rename patches/api/{0017-Add-MonsterEggSpawnEvent.patch => 0016-Add-MonsterEggSpawnEvent.patch} (97%)
 rename patches/api/{0018-Add-ThrownEggHatchEvent.patch => 0017-Add-ThrownEggHatchEvent.patch} (98%)
 rename patches/api/{0019-Add-moon-phase-API.patch => 0018-Add-moon-phase-API.patch} (96%)
 rename patches/api/{0020-Add-API-for-Villager-resetOffers.patch => 0019-Add-API-for-Villager-resetOffers.patch} (89%)
 rename patches/api/{0021-Expose-getItemStack-for-Trident.patch => 0020-Expose-getItemStack-for-Trident.patch} (94%)
 rename patches/api/{0022-Add-more-llama-API.patch => 0021-Add-more-llama-API.patch} (98%)
 rename patches/api/{0023-Add-more-evoker-API.patch => 0022-Add-more-evoker-API.patch} (94%)
 rename patches/api/{0024-Add-getPlacementBlockData-to-World.patch => 0023-Add-getPlacementBlockData-to-World.patch} (94%)
 rename patches/api/{0025-Add-playPickupItemAnimation-to-LivingEntity.patch => 0024-Add-playPickupItemAnimation-to-LivingEntity.patch} (95%)
 rename patches/api/{0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (97%)
 rename patches/api/{0027-Add-LootableInventoryFirstFillEvent.patch => 0026-Add-LootableInventoryFirstFillEvent.patch} (96%)
 rename patches/api/{0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch => 0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch} (96%)
 rename patches/api/{0029-Implement-EntityMoveEvent.patch => 0028-Implement-EntityMoveEvent.patch} (97%)
 rename patches/api/{0030-Add-ItemStack-convenience-methods.patch => 0029-Add-ItemStack-convenience-methods.patch} (99%)
 rename patches/api/{0031-Add-BellRingEvent.patch => 0030-Add-BellRingEvent.patch} (97%)
 rename patches/api/{0032-Configurable-enchantment-max-level.patch => 0031-Configurable-enchantment-max-level.patch} (96%)
 rename patches/api/{0033-More-anvil-controls.patch => 0032-More-anvil-controls.patch} (96%)
 rename patches/api/{0034-PlayerItemCooldownEvent.patch => 0033-PlayerItemCooldownEvent.patch} (96%)
 rename patches/api/{0035-Player-invulnerabilities.patch => 0034-Player-invulnerabilities.patch} (92%)
 create mode 100644 patches/server/0003-Timings-stuff.patch
 rename patches/server/{0003-decompile-fixes.patch => 0004-decompile-fixes.patch} (97%)
 rename patches/server/{0004-Add-language-asset-purpur.lang.patch => 0005-Add-language-asset-purpur.lang.patch} (98%)
 rename patches/server/{0005-Fix-vanilla-command-permission-handler.patch => 0006-Fix-vanilla-command-permission-handler.patch} (95%)
 rename patches/server/{0006-Host-our-own-timings.patch => 0007-Host-our-own-timings.patch} (88%)
 rename patches/server/{0007-Ridables.patch => 0008-Ridables.patch} (99%)
 rename patches/server/{0008-Logger-settings-suppressing-pointless-logs.patch => 0009-Logger-settings-suppressing-pointless-logs.patch} (95%)
 rename patches/server/{0009-Disable-outdated-build-check.patch => 0010-Disable-outdated-build-check.patch} (92%)
 rename patches/server/{0010-Add-obfhelpers-for-plugin-use.patch => 0011-Add-obfhelpers-for-plugin-use.patch} (93%)
 rename patches/server/{0011-Silk-touch-spawners.patch => 0012-Silk-touch-spawners.patch} (96%)
 rename patches/server/{0012-Give-giants-AI.patch => 0013-Give-giants-AI.patch} (98%)
 rename patches/server/{0013-Illusioners-AI-settings.patch => 0014-Illusioners-AI-settings.patch} (96%)
 rename patches/server/{0014-Zombie-horse-naturally-spawn.patch => 0015-Zombie-horse-naturally-spawn.patch} (98%)
 rename patches/server/{0015-Charged-creeper-naturally-spawn.patch => 0016-Charged-creeper-naturally-spawn.patch} (96%)
 rename patches/server/{0016-Rabbit-naturally-spawn-toast-and-killer.patch => 0017-Rabbit-naturally-spawn-toast-and-killer.patch} (97%)
 rename patches/server/{0017-Cat-spawning-options.patch => 0018-Cat-spawning-options.patch} (97%)
 rename patches/server/{0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch => 0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch} (95%)
 rename patches/server/{0019-Cows-eat-mushrooms.patch => 0020-Cows-eat-mushrooms.patch} (97%)
 rename patches/server/{0020-Fix-cow-rotation-when-shearing-mooshroom.patch => 0021-Fix-cow-rotation-when-shearing-mooshroom.patch} (93%)
 rename patches/server/{0021-Pigs-give-saddle-back.patch => 0022-Pigs-give-saddle-back.patch} (97%)
 rename patches/server/{0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (98%)
 rename patches/server/{0023-Snowman-drop-and-put-back-pumpkin.patch => 0024-Snowman-drop-and-put-back-pumpkin.patch} (96%)
 rename patches/server/{0024-Ender-dragon-always-drop-egg.patch => 0025-Ender-dragon-always-drop-egg.patch} (95%)
 rename patches/server/{0025-Ender-dragon-always-drop-full-exp.patch => 0026-Ender-dragon-always-drop-full-exp.patch} (94%)
 rename patches/server/{0026-Signs-editable-on-right-click.patch => 0027-Signs-editable-on-right-click.patch} (94%)
 rename patches/server/{0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (91%)
 rename patches/server/{0028-Make-Iron-Golems-Swim.patch => 0029-Make-Iron-Golems-Swim.patch} (93%)
 rename patches/server/{0029-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0030-Allow-soil-to-moisten-from-water-directly-under-it.patch} (95%)
 rename patches/server/{0030-Controllable-Minecarts.patch => 0031-Controllable-Minecarts.patch} (97%)
 rename patches/server/{0031-Signs-allow-color-codes.patch => 0032-Signs-allow-color-codes.patch} (97%)
 rename patches/server/{0032-Campfires-have-regen-effect.patch => 0033-Campfires-have-regen-effect.patch} (97%)
 rename patches/server/{0033-Disable-loot-drops-on-death-by-cramming.patch => 0034-Disable-loot-drops-on-death-by-cramming.patch} (95%)
 rename patches/server/{0034-Campfires-burn-out-in-rain.patch => 0035-Campfires-burn-out-in-rain.patch} (96%)
 rename patches/server/{0035-Campfires-should-fall-with-gravity.patch => 0036-Campfires-should-fall-with-gravity.patch} (97%)
 rename patches/server/{0036-Dont-send-useless-entity-packets.patch => 0037-Dont-send-useless-entity-packets.patch} (96%)
 rename patches/server/{0037-Implement-AFK-API.patch => 0038-Implement-AFK-API.patch} (98%)
 rename patches/server/{0038-Option-to-toggle-milk-curing-bad-omen.patch => 0039-Option-to-toggle-milk-curing-bad-omen.patch} (94%)
 rename patches/server/{0039-Mending-mends-most-damages-equipment-first.patch => 0040-Mending-mends-most-damages-equipment-first.patch} (96%)
 rename patches/server/{0040-Tulips-change-fox-type.patch => 0041-Tulips-change-fox-type.patch} (96%)
 rename patches/server/{0041-Pillager-limits-and-leaders-chance.patch => 0042-Pillager-limits-and-leaders-chance.patch} (96%)
 rename patches/server/{0042-Make-the-GUI-better.patch => 0043-Make-the-GUI-better.patch} (98%)
 rename patches/server/{0043-Players-should-not-cram-to-death.patch => 0044-Players-should-not-cram-to-death.patch} (94%)
 rename patches/server/{0044-Add-EntityPortalReadyEvent.patch => 0045-Add-EntityPortalReadyEvent.patch} (99%)
 rename patches/server/{0045-Implement-elytra-settings.patch => 0046-Implement-elytra-settings.patch} (96%)
 rename patches/server/{0046-Add-blacklist-option-for-grindstone.patch => 0047-Add-blacklist-option-for-grindstone.patch} (96%)
 rename patches/server/{0047-Implement-lagging-threshold.patch => 0048-Implement-lagging-threshold.patch} (94%)
 rename patches/server/{0048-Implement-configurable-villager-brain-ticks.patch => 0049-Implement-configurable-villager-brain-ticks.patch} (98%)
 rename patches/server/{0049-Add-option-for-zombies-targetting-turtle-eggs.patch => 0050-Add-option-for-zombies-targetting-turtle-eggs.patch} (94%)
 rename patches/server/{0050-Implement-bamboo-growth-settings.patch => 0051-Implement-bamboo-growth-settings.patch} (97%)
 rename patches/server/{0051-Climbing-should-not-bypass-cramming-gamerule.patch => 0052-Climbing-should-not-bypass-cramming-gamerule.patch} (95%)
 rename patches/server/{0052-Option-for-slimes-not-pushable.patch => 0053-Option-for-slimes-not-pushable.patch} (94%)
 rename patches/server/{0053-Bring-back-server-name.patch => 0054-Bring-back-server-name.patch} (93%)
 rename patches/server/{0054-Dispenser-curse-of-binding-protection.patch => 0055-Dispenser-curse-of-binding-protection.patch} (94%)
 rename patches/server/{0055-Implement-LivingEntity-safeFallDistance.patch => 0056-Implement-LivingEntity-safeFallDistance.patch} (94%)
 rename patches/server/{0056-Add-option-for-boats-to-eject-players-on-land.patch => 0057-Add-option-for-boats-to-eject-players-on-land.patch} (94%)
 rename patches/server/{0057-Advancement-API-Additions.patch => 0058-Advancement-API-Additions.patch} (96%)
 rename patches/server/{0058-Add-option-to-set-armorstand-step-height.patch => 0059-Add-option-to-set-armorstand-step-height.patch} (95%)
 rename patches/server/{0059-Implement-ItemFactory-getMonsterEgg.patch => 0060-Implement-ItemFactory-getMonsterEgg.patch} (94%)
 rename patches/server/{0060-Alternative-Keepalive-Handling.patch => 0061-Alternative-Keepalive-Handling.patch} (96%)
 rename patches/server/{0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch => 0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch} (95%)
 rename patches/server/{0062-Add-moon-phase-API.patch => 0063-Add-moon-phase-API.patch} (91%)
 rename patches/server/{0063-Add-getPlacementBlockData-to-World.patch => 0064-Add-getPlacementBlockData-to-World.patch} (95%)
 rename patches/server/{0064-Barrels-have-6-rows.patch => 0065-Barrels-have-6-rows.patch} (95%)
 rename patches/server/{0065-Enderchest-6-rows-plus-permissions.patch => 0066-Enderchest-6-rows-plus-permissions.patch} (96%)
 rename patches/server/{0066-Add-5-second-tps-average-in-tps.patch => 0067-Add-5-second-tps-average-in-tps.patch} (96%)
 rename patches/server/{0067-Add-playPickupItemAnimation-to-LivingEntity.patch => 0068-Add-playPickupItemAnimation-to-LivingEntity.patch} (90%)
 rename patches/server/{0068-Add-more-evoker-API.patch => 0069-Add-more-evoker-API.patch} (94%)
 rename patches/server/{0069-Add-API-for-Villager-resetOffers.patch => 0070-Add-API-for-Villager-resetOffers.patch} (96%)
 rename patches/server/{0070-Add-more-llama-API.patch => 0071-Add-more-llama-API.patch} (97%)
 rename patches/server/{0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch => 0072-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch} (93%)
 rename patches/server/{0072-Implement-infinite-lava.patch => 0073-Implement-infinite-lava.patch} (94%)
 rename patches/server/{0073-Expose-getItemStack-for-Trident.patch => 0074-Expose-getItemStack-for-Trident.patch} (91%)
 rename patches/server/{0074-Despawn-egg-hatches-chicken.patch => 0075-Despawn-egg-hatches-chicken.patch} (95%)
 rename patches/server/{0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (94%)
 rename patches/server/{0076-Add-sleep-options.patch => 0077-Add-sleep-options.patch} (96%)
 rename patches/server/{0077-Option-for-hay-block-fall-damage.patch => 0078-Option-for-hay-block-fall-damage.patch} (91%)
 rename patches/server/{0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (95%)
 rename patches/server/{0079-Add-LootableInventoryFirstFillEvent.patch => 0080-Add-LootableInventoryFirstFillEvent.patch} (94%)
 rename patches/server/{0080-Villagers-follow-emerald-blocks.patch => 0081-Villagers-follow-emerald-blocks.patch} (95%)
 rename patches/server/{0081-Add-player-death-exp-control-options.patch => 0082-Add-player-death-exp-control-options.patch} (96%)
 rename patches/server/{0082-Add-permission-for-F3-N-debug.patch => 0083-Add-permission-for-F3-N-debug.patch} (89%)
 rename patches/server/{0083-Allow-leashing-villagers.patch => 0084-Allow-leashing-villagers.patch} (98%)
 rename patches/server/{0084-Implement-configurable-search-radius-for-villagers-t.patch => 0085-Implement-configurable-search-radius-for-villagers-t.patch} (97%)
 rename patches/server/{0085-Make-lava-flow-speed-configurable.patch => 0086-Make-lava-flow-speed-configurable.patch} (93%)
 rename patches/server/{0086-Add-wither-skeleton-takes-wither-damage-option.patch => 0087-Add-wither-skeleton-takes-wither-damage-option.patch} (94%)
 rename patches/server/{0087-UPnP-Port-Forwarding-Service.patch => 0088-UPnP-Port-Forwarding-Service.patch} (96%)
 rename patches/server/{0088-Implement-EntityMoveEvent.patch => 0089-Implement-EntityMoveEvent.patch} (94%)
 rename patches/server/{0089-Add-option-to-disable-saving-projectiles-to-disk.patch => 0090-Add-option-to-disable-saving-projectiles-to-disk.patch} (95%)
 rename patches/server/{0090-Implement-bed-explosion-options.patch => 0091-Implement-bed-explosion-options.patch} (96%)
 rename patches/server/{0091-Add-item-entity-options.patch => 0092-Add-item-entity-options.patch} (97%)
 rename patches/server/{0092-Make-natural-spawns-per-biome-configurable.patch => 0093-Make-natural-spawns-per-biome-configurable.patch} (98%)
 rename patches/server/{0093-Configurable-void-damage-height.patch => 0094-Configurable-void-damage-height.patch} (94%)
 rename patches/server/{0094-Fix-the-dead-lagging-the-server.patch => 0095-Fix-the-dead-lagging-the-server.patch} (92%)
 rename patches/server/{0095-Add-ping-command.patch => 0096-Add-ping-command.patch} (96%)
 rename patches/server/{0096-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/{0097-Configurable-server-mod-name.patch => 0098-Configurable-server-mod-name.patch} (89%)
 rename patches/server/{0098-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/{0099-Configurable-TPS-Catchup.patch => 0100-Configurable-TPS-Catchup.patch} (94%)
 rename patches/server/{0100-Breedable-Polar-Bears.patch => 0101-Breedable-Polar-Bears.patch} (96%)
 rename patches/server/{0101-Configurable-jockey-options.patch => 0102-Configurable-jockey-options.patch} (97%)
 rename patches/server/{0102-Configurable-enchantment-max-level.patch => 0103-Configurable-enchantment-max-level.patch} (96%)
 rename patches/server/{0103-Optimize-Chunk-Ticks.patch => 0104-Optimize-Chunk-Ticks.patch} (99%)
 rename patches/server/{0104-Add-configurable-beehive-generation-chance.patch => 0105-Add-configurable-beehive-generation-chance.patch} (97%)
 rename patches/server/{0105-Add-more-timings-timers.patch => 0106-Add-more-timings-timers.patch} (99%)
 rename patches/server/{0106-Skip-events-if-there-s-no-listeners.patch => 0107-Skip-events-if-there-s-no-listeners.patch} (93%)
 rename patches/server/{0107-Debug-stick-should-not-update-neighbors.patch => 0108-Debug-stick-should-not-update-neighbors.patch} (91%)
 rename patches/server/{0108-Add-enderman-and-creeper-griefing-controls.patch => 0109-Add-enderman-and-creeper-griefing-controls.patch} (96%)
 rename patches/server/{0109-Chickens-can-retaliate.patch => 0110-Chickens-can-retaliate.patch} (96%)
 rename patches/server/{0110-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (95%)
 rename patches/server/{0111-More-anvil-controls.patch => 0112-More-anvil-controls.patch} (97%)
 rename patches/server/{0112-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (94%)
 rename patches/server/{0113-Player-invulnerabilities.patch => 0114-Player-invulnerabilities.patch} (96%)
 rename patches/server/{0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch => 0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch} (95%)
 rename patches/server/{0115-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0116-MC-168772-Fix-Add-turtle-egg-block-options.patch} (95%)
 rename patches/server/{0116-MC-4-Fix-Item-position-desync.patch => 0117-MC-4-Fix-Item-position-desync.patch} (95%)
 rename patches/server/{0117-MC-56653-Fix-pig-zombies-aggro.patch => 0118-MC-56653-Fix-pig-zombies-aggro.patch} (96%)
 rename patches/server/{0118-EMC-MonsterEggSpawn-Event.patch => 0119-EMC-MonsterEggSpawn-Event.patch} (97%)
 rename patches/server/{0119-PaperPR-Add-BellRingEvent.patch => 0120-PaperPR-Add-BellRingEvent.patch} (96%)
 rename patches/server/{0120-PaperPR-Per-World-Spawn-limits.patch => 0121-PaperPR-Per-World-Spawn-limits.patch} (93%)
 rename patches/server/{0121-PaperPR-PlayerItemCooldownEvent.patch => 0122-PaperPR-PlayerItemCooldownEvent.patch} (93%)
 rename patches/server/{0122-Tuinity-Delay-chunk-unloads.patch => 0123-Tuinity-Delay-chunk-unloads.patch} (99%)
 rename patches/server/{0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch => 0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch} (91%)
 rename patches/server/{0124-YAPFA-Disable-mojang-profiler.patch => 0125-YAPFA-Disable-mojang-profiler.patch} (95%)

diff --git a/Paper b/Paper
index d6eda567f..b75eeca0e 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit d6eda567ff742064f040e78b75cd49d22c754203
+Subproject commit b75eeca0e57b305d1272756ceb1eab98405353cd
diff --git a/current-paper b/current-paper
index aa6527b52..124e53173 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--625ee23d39fa324caa05ebe166b95257153f4d5b
+1.15.2--9f38dcdbf4e925715798dd41d1276eb1f2c8f518
diff --git a/patches/api/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch
index 57b5bac50..01b27f77a 100644
--- a/patches/api/0002-Purpur-config-files.patch
+++ b/patches/api/0002-Purpur-config-files.patch
@@ -1,56 +1,14 @@
-From 23500f1f8f5d8e17be4b8e14b2ec52638b2db889 Mon Sep 17 00:00:00 2001
+From 48b6e33ffaa5a320da32cf4750a932c5018e7be4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
 
 ---
- .../java/co/aikar/timings/TimingsExport.java  | 23 ++++++++++++++++---
- src/main/java/org/bukkit/Server.java          | 12 ++++++++++
- 2 files changed, 32 insertions(+), 3 deletions(-)
+ src/main/java/org/bukkit/Server.java | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f9..5e7e10c8 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
-         // Information on the users Config
- 
-         parent.put("config", createObject(
--            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
--            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+                // Purpur start
-+                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
-+                pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-+                pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+                pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
-+                // Purpur end
-         ));
- 
-         new TimingsExport(listeners, parent, history).start();
-@@ -247,6 +251,19 @@ class TimingsExport extends Thread {
-         return timingsCost;
-     }
- 
-+    // Purpur start
-+    private static JSONObject mapAsJSON(java.util.Properties properties) {
-+        JSONObject object = new JSONObject();
-+        for (String key : properties.stringPropertyNames()) {
-+            if (TimingsManager.hiddenConfigs.contains(key)) {
-+                continue;
-+            }
-+            object.put(key, valAsJSON(properties.get(key), key));
-+        }
-+        return object;
-+    }
-+    // Purpur end
-+
-     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
- 
-         JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c3fb1c27..79543106 100644
+index cc06492f4..47548dfd1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1396,6 +1396,18 @@ public interface Server extends PluginMessageRecipient {
diff --git a/patches/api/0003-Host-our-own-timings.patch b/patches/api/0003-Host-our-own-timings.patch
deleted file mode 100644
index f7527a073..000000000
--- a/patches/api/0003-Host-our-own-timings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From efced177921197f8480a7c4e9fba2484fdd41604 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 18 Feb 2020 20:38:26 -0600
-Subject: [PATCH] Host our own timings
-
----
- src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 47be89aea..1b5767b29 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -300,7 +300,7 @@ class TimingsExport extends Thread {
-         String response = null;
-         String timingsURL = null;
-         try {
--            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
-+            HttpURLConnection con = (HttpURLConnection) new URL(Bukkit.spigot().getPurpurConfig().getString("settings.timings.url", "https://timings.pl3x.net") + "/post").openConnection(); // Purpur
-             con.setDoOutput(true);
-             String hostName = "BrokenHost";
-             try {
--- 
-2.24.0
-
diff --git a/patches/api/0004-Ridables.patch b/patches/api/0003-Ridables.patch
similarity index 98%
rename from patches/api/0004-Ridables.patch
rename to patches/api/0003-Ridables.patch
index a2597a341..2444dfc27 100644
--- a/patches/api/0004-Ridables.patch
+++ b/patches/api/0003-Ridables.patch
@@ -1,4 +1,4 @@
-From 282ffe28105fdbbbaa9ca8efc1184d83f5f47dee Mon Sep 17 00:00:00 2001
+From 928b868b220c11a48ed5dc688f92c3cf793078b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables
diff --git a/patches/api/0005-Remove-pointless-annotations-and-deprecations.patch b/patches/api/0004-Remove-pointless-annotations-and-deprecations.patch
similarity index 95%
rename from patches/api/0005-Remove-pointless-annotations-and-deprecations.patch
rename to patches/api/0004-Remove-pointless-annotations-and-deprecations.patch
index 07c6b0d57..e9455054c 100644
--- a/patches/api/0005-Remove-pointless-annotations-and-deprecations.patch
+++ b/patches/api/0004-Remove-pointless-annotations-and-deprecations.patch
@@ -1,4 +1,4 @@
-From b635caa251ca2fe802bfe3ff6c967971a2b88b93 Mon Sep 17 00:00:00 2001
+From d943d6fd099a66d7f6934394f6a839be75104828 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 31 Dec 2019 23:00:07 -0600
 Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,7 +14,7 @@ Subject: [PATCH] Remove pointless annotations and deprecations
  7 files changed, 9 insertions(+), 18 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 95ad0122..5d42cf62 100644
+index a9c10228e..780d603e4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -863,13 +863,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 95ad0122..5d42cf62 100644
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 79543106..aabf82b5 100644
+index 47548dfd1..bbb2946f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -722,13 +722,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 79543106..aabf82b5 100644
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
 diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
-index 45cb8da1..383b43e1 100644
+index 45cb8da12..383b43e1b 100644
 --- a/src/main/java/org/bukkit/command/CommandExecutor.java
 +++ b/src/main/java/org/bukkit/command/CommandExecutor.java
 @@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da1..383b43e1 100644
 +    public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
-index e9cf71f5..34d3462c 100644
+index e9cf71f5c..34d3462c7 100644
 --- a/src/main/java/org/bukkit/command/TabCompleter.java
 +++ b/src/main/java/org/bukkit/command/TabCompleter.java
 @@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -72,7 +72,7 @@ index e9cf71f5..34d3462c 100644
 +    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index d7d6a3e8..cf8d7749 100644
+index ccd81fca2..a8ade268c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -100,7 +100,7 @@ index d7d6a3e8..cf8d7749 100644
          ItemMeta meta = getItemMeta();
          return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 04fa3991..24d65491 100644
+index 04fa3991f..24d65491c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991..24d65491 100644
      }
  
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index a48be38b..951b81e7 100644
+index a48be38b1..951b81e79 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -41,6 +41,11 @@ public class AnnotationTest {
diff --git a/patches/api/0006-Allow-inventory-resizing.patch b/patches/api/0005-Allow-inventory-resizing.patch
similarity index 94%
rename from patches/api/0006-Allow-inventory-resizing.patch
rename to patches/api/0005-Allow-inventory-resizing.patch
index 0e68306c7..ec5234b93 100644
--- a/patches/api/0006-Allow-inventory-resizing.patch
+++ b/patches/api/0005-Allow-inventory-resizing.patch
@@ -1,4 +1,4 @@
-From fd0bef0590aaaa10deefcda30d4e6b7a6bde21fc Mon Sep 17 00:00:00 2001
+From 78aecf28f5492c23d4c60df906093ffa9120e008 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing
diff --git a/patches/api/0007-Implement-AFK-API.patch b/patches/api/0006-Implement-AFK-API.patch
similarity index 96%
rename from patches/api/0007-Implement-AFK-API.patch
rename to patches/api/0006-Implement-AFK-API.patch
index b4f587633..3bbd46bb4 100644
--- a/patches/api/0007-Implement-AFK-API.patch
+++ b/patches/api/0006-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 37efa9e3cdecabc0f10d35dc501ef4cafa164080 Mon Sep 17 00:00:00 2001
+From b9e40e25bdb2a99a85e88c413e6cc8949c5cd619 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 00000000..0c8b3e5e
+index 000000000..0c8b3e5e4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..0c8b3e5e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 787bb144..edc48117 100644
+index 787bb144b..edc481170 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1830,4 +1830,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0008-Add-EntityPortalReadyEvent.patch b/patches/api/0007-Add-EntityPortalReadyEvent.patch
similarity index 96%
rename from patches/api/0008-Add-EntityPortalReadyEvent.patch
rename to patches/api/0007-Add-EntityPortalReadyEvent.patch
index 4fa3d365a..c713d9f61 100644
--- a/patches/api/0008-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0007-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 07869e37e8dc3b12e9e0fa2ce5ee0a4e23e250a6 Mon Sep 17 00:00:00 2001
+From e63bb83fe25662c23e93b21da43c4f75ec616990 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:00 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
diff --git a/patches/api/0009-Bring-back-server-name.patch b/patches/api/0008-Bring-back-server-name.patch
similarity index 91%
rename from patches/api/0009-Bring-back-server-name.patch
rename to patches/api/0008-Bring-back-server-name.patch
index 8a573e327..8cd5d2460 100644
--- a/patches/api/0009-Bring-back-server-name.patch
+++ b/patches/api/0008-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From cc89d98244645c403a461188a6fb49bc86288213 Mon Sep 17 00:00:00 2001
+From 2c770cf3a11862fdec3aa1a7a9f04871a41d1e27 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 780d603e..33ccf297 100644
+index 780d603e4..33ccf2979 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1714,4 +1714,15 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index 780d603e..33ccf297 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bbb2946f..8d3501a6 100644
+index bbb2946f6..8d3501a67 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1505,4 +1505,13 @@ public interface Server extends PluginMessageRecipient {
diff --git a/patches/api/0010-Implement-LivingEntity-safeFallDistance.patch b/patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
similarity index 94%
rename from patches/api/0010-Implement-LivingEntity-safeFallDistance.patch
rename to patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
index 3688ebda7..fd500c391 100644
--- a/patches/api/0010-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From 24a737b9d80b9bc724dbcff7b9487de04f8fd706 Mon Sep 17 00:00:00 2001
+From 5ae5f9e9d98de60e44d57aee71eeab472d3639a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
diff --git a/patches/api/0011-Add-ExecuteCommandEvent.patch b/patches/api/0010-Add-ExecuteCommandEvent.patch
similarity index 98%
rename from patches/api/0011-Add-ExecuteCommandEvent.patch
rename to patches/api/0010-Add-ExecuteCommandEvent.patch
index c466ab96d..fd42169b6 100644
--- a/patches/api/0011-Add-ExecuteCommandEvent.patch
+++ b/patches/api/0010-Add-ExecuteCommandEvent.patch
@@ -1,4 +1,4 @@
-From 026def607865ff42c7740b5c0ef9439c09497888 Mon Sep 17 00:00:00 2001
+From db25bc04648a0ce70ac58987a994c730f3c6e1ae Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 00:08:28 -0500
 Subject: [PATCH] Add ExecuteCommandEvent
diff --git a/patches/api/0012-Implement-ChunkTooLargeEvent.patch b/patches/api/0011-Implement-ChunkTooLargeEvent.patch
similarity index 98%
rename from patches/api/0012-Implement-ChunkTooLargeEvent.patch
rename to patches/api/0011-Implement-ChunkTooLargeEvent.patch
index 30ca22894..7de77fea3 100644
--- a/patches/api/0012-Implement-ChunkTooLargeEvent.patch
+++ b/patches/api/0011-Implement-ChunkTooLargeEvent.patch
@@ -1,4 +1,4 @@
-From 0cf23610dddc0f16cb40bf33ccdd6495abd55fb2 Mon Sep 17 00:00:00 2001
+From e4b28b6ed7d3e1f7f32f0397abb1068483715cc0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent
diff --git a/patches/api/0013-Implement-lagging-threshold.patch b/patches/api/0012-Implement-lagging-threshold.patch
similarity index 91%
rename from patches/api/0013-Implement-lagging-threshold.patch
rename to patches/api/0012-Implement-lagging-threshold.patch
index 5c28a4c93..c31caaa44 100644
--- a/patches/api/0013-Implement-lagging-threshold.patch
+++ b/patches/api/0012-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From d2beebd0b8bca2ad0eef2138675d81cd0f0f9568 Mon Sep 17 00:00:00 2001
+From 25c7441fd2fe5c753d82cb728ff762125fff9983 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 33ccf297..ee8fe48a 100644
+index 33ccf2979..ee8fe48aa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1724,5 +1724,14 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 33ccf297..ee8fe48a 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8d3501a6..c35405e0 100644
+index 8d3501a67..c35405e09 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1513,5 +1513,12 @@ public interface Server extends PluginMessageRecipient {
diff --git a/patches/api/0014-Advancement-API-Additions.patch b/patches/api/0013-Advancement-API-Additions.patch
similarity index 98%
rename from patches/api/0014-Advancement-API-Additions.patch
rename to patches/api/0013-Advancement-API-Additions.patch
index 6114e1e43..0a5bf2c23 100644
--- a/patches/api/0014-Advancement-API-Additions.patch
+++ b/patches/api/0013-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 60b43c69c3c60af8494c8a3e456528c541734e29 Mon Sep 17 00:00:00 2001
+From a2b02de4ec98e2d8fee3fc9a36f3da00a839c38d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions
diff --git a/patches/api/0015-Implement-ItemFactory-getMonsterEgg.patch b/patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
similarity index 93%
rename from patches/api/0015-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
index 6a59c0206..038078349 100644
--- a/patches/api/0015-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From 629ed9eab41a762189f7671220ad3b459c010243 Mon Sep 17 00:00:00 2001
+From 8c6a8c2f9bc5badb5b85a0901b329eb01366c4cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:37:04 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
diff --git a/patches/api/0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 97%
rename from patches/api/0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index c1cac6653..f18258068 100644
--- a/patches/api/0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From 02402b5e5b5cf877fdc9c4772b3823b74c466d39 Mon Sep 17 00:00:00 2001
+From 226d3bc769d579cb0463f1aa0551e02a22b68753 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
diff --git a/patches/api/0017-Add-MonsterEggSpawnEvent.patch b/patches/api/0016-Add-MonsterEggSpawnEvent.patch
similarity index 97%
rename from patches/api/0017-Add-MonsterEggSpawnEvent.patch
rename to patches/api/0016-Add-MonsterEggSpawnEvent.patch
index e32559ccb..9c9da429a 100644
--- a/patches/api/0017-Add-MonsterEggSpawnEvent.patch
+++ b/patches/api/0016-Add-MonsterEggSpawnEvent.patch
@@ -1,4 +1,4 @@
-From a9072d23135ed363762d4521228cda31784f35b4 Mon Sep 17 00:00:00 2001
+From c90d5a3d7fc8dc2449b778807b42e18de51f3641 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:49 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent
diff --git a/patches/api/0018-Add-ThrownEggHatchEvent.patch b/patches/api/0017-Add-ThrownEggHatchEvent.patch
similarity index 98%
rename from patches/api/0018-Add-ThrownEggHatchEvent.patch
rename to patches/api/0017-Add-ThrownEggHatchEvent.patch
index 672b59bde..2b582cc5f 100644
--- a/patches/api/0018-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0017-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From 3e05bb777ebac12f0ac443593e417efdc4decccb Mon Sep 17 00:00:00 2001
+From c7e580d108dcc2aa8c6375bc489c2a3925a5e48a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:27:55 -0500
 Subject: [PATCH] Add ThrownEggHatchEvent
diff --git a/patches/api/0019-Add-moon-phase-API.patch b/patches/api/0018-Add-moon-phase-API.patch
similarity index 96%
rename from patches/api/0019-Add-moon-phase-API.patch
rename to patches/api/0018-Add-moon-phase-API.patch
index a34243f73..cac6d25a7 100644
--- a/patches/api/0019-Add-moon-phase-API.patch
+++ b/patches/api/0018-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From 707e74f8dc730b9e1f1ce8183430d5c39af67b64 Mon Sep 17 00:00:00 2001
+From fd204c5ff1b25d9c570cfab851c791d546bd966d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:07 -0600
 Subject: [PATCH] Add moon phase API
diff --git a/patches/api/0020-Add-API-for-Villager-resetOffers.patch b/patches/api/0019-Add-API-for-Villager-resetOffers.patch
similarity index 89%
rename from patches/api/0020-Add-API-for-Villager-resetOffers.patch
rename to patches/api/0019-Add-API-for-Villager-resetOffers.patch
index be62807ec..bc3c56fe6 100644
--- a/patches/api/0020-Add-API-for-Villager-resetOffers.patch
+++ b/patches/api/0019-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From 013e7bc6e20e097f054a3b76f9d6a3aa49d2f256 Mon Sep 17 00:00:00 2001
+From 1a3ff839467609e8b95ae15984ca7fa1b76ee965 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:28 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
@@ -8,7 +8,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
  1 file changed, 7 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index e0a3285b..32b8c4f2 100644
+index e0a3285b8..32b8c4f20 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {
diff --git a/patches/api/0021-Expose-getItemStack-for-Trident.patch b/patches/api/0020-Expose-getItemStack-for-Trident.patch
similarity index 94%
rename from patches/api/0021-Expose-getItemStack-for-Trident.patch
rename to patches/api/0020-Expose-getItemStack-for-Trident.patch
index 41f3c07c6..8b1827af0 100644
--- a/patches/api/0021-Expose-getItemStack-for-Trident.patch
+++ b/patches/api/0020-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From 0f7cf240c9626b6026a3d677c27d2f6e6ce25f77 Mon Sep 17 00:00:00 2001
+From b036bfcd8aa79e0b040aa83b0cc1983e3afe679f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:31 -0500
 Subject: [PATCH] Expose getItemStack for Trident
diff --git a/patches/api/0022-Add-more-llama-API.patch b/patches/api/0021-Add-more-llama-API.patch
similarity index 98%
rename from patches/api/0022-Add-more-llama-API.patch
rename to patches/api/0021-Add-more-llama-API.patch
index 21097ef1c..f0497bbd3 100644
--- a/patches/api/0022-Add-more-llama-API.patch
+++ b/patches/api/0021-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From e063ff17a0d1999d1e2c5df0b9854c9b6d19b32f Mon Sep 17 00:00:00 2001
+From 5dbf64e9ba5558297cbc7584e973926d6fbe073f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API
diff --git a/patches/api/0023-Add-more-evoker-API.patch b/patches/api/0022-Add-more-evoker-API.patch
similarity index 94%
rename from patches/api/0023-Add-more-evoker-API.patch
rename to patches/api/0022-Add-more-evoker-API.patch
index 1cceb3314..06c6c8923 100644
--- a/patches/api/0023-Add-more-evoker-API.patch
+++ b/patches/api/0022-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From d3f0f04f84e7ede322ace349254a61cc3e7cb349 Mon Sep 17 00:00:00 2001
+From 5a78f176845e8317a91657d10012218362479e06 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:28:53 -0500
 Subject: [PATCH] Add more evoker API
diff --git a/patches/api/0024-Add-getPlacementBlockData-to-World.patch b/patches/api/0023-Add-getPlacementBlockData-to-World.patch
similarity index 94%
rename from patches/api/0024-Add-getPlacementBlockData-to-World.patch
rename to patches/api/0023-Add-getPlacementBlockData-to-World.patch
index d5cd08839..7c915797f 100644
--- a/patches/api/0024-Add-getPlacementBlockData-to-World.patch
+++ b/patches/api/0023-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
+From 01653647955c1bcb951cf78ffd53e96691032aad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
diff --git a/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0024-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 95%
rename from patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/0024-Add-playPickupItemAnimation-to-LivingEntity.patch
index 69656fdee..c7f3609c2 100644
--- a/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0024-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 42cfdbc72c16463dd1425698390a833e3897a16c Mon Sep 17 00:00:00 2001
+From 1e19760c6229130f4ac3251e96812a7b48f45c2f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
diff --git a/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/api/0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 97%
rename from patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/api/0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index 17513d218..3d9ee2455 100644
--- a/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/api/0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From 5d02f8f0e45d9b702f4b9af577ba96597e671eda Mon Sep 17 00:00:00 2001
+From 2d430ee7eddeccfec313ff6b233cd21610d43268 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:24 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
diff --git a/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch b/patches/api/0026-Add-LootableInventoryFirstFillEvent.patch
similarity index 96%
rename from patches/api/0027-Add-LootableInventoryFirstFillEvent.patch
rename to patches/api/0026-Add-LootableInventoryFirstFillEvent.patch
index 1e573e18a..25cca7c8a 100644
--- a/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/api/0026-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From 5ab2d114a2e7670385dbc009fa4003fd33128328 Mon Sep 17 00:00:00 2001
+From d791d6fabb76c20a61628b1385c9fd4082e4182a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:10 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent
diff --git a/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch b/patches/api/0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
similarity index 96%
rename from patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
rename to patches/api/0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
index 4b9478f25..7e77ef205 100644
--- a/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
+++ b/patches/api/0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
@@ -1,4 +1,4 @@
-From 7585dec7e71ded381ac4e47354e34bf1d0899b86 Mon Sep 17 00:00:00 2001
+From b1d25612377cabaa13d2283f99ecf369edb75d5e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:46 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
diff --git a/patches/api/0029-Implement-EntityMoveEvent.patch b/patches/api/0028-Implement-EntityMoveEvent.patch
similarity index 97%
rename from patches/api/0029-Implement-EntityMoveEvent.patch
rename to patches/api/0028-Implement-EntityMoveEvent.patch
index 43a1e4a59..75806f2c0 100644
--- a/patches/api/0029-Implement-EntityMoveEvent.patch
+++ b/patches/api/0028-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From 019520dabc7b0c2aa506fd02575b5ecaa7f90071 Mon Sep 17 00:00:00 2001
+From bff9840823ea00fc90f1a46db26fb66edbc053df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:38 -0600
 Subject: [PATCH] Implement EntityMoveEvent
diff --git a/patches/api/0030-Add-ItemStack-convenience-methods.patch b/patches/api/0029-Add-ItemStack-convenience-methods.patch
similarity index 99%
rename from patches/api/0030-Add-ItemStack-convenience-methods.patch
rename to patches/api/0029-Add-ItemStack-convenience-methods.patch
index 6646f7a45..856d9dcef 100644
--- a/patches/api/0030-Add-ItemStack-convenience-methods.patch
+++ b/patches/api/0029-Add-ItemStack-convenience-methods.patch
@@ -1,4 +1,4 @@
-From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001
+From 5604fc9655a277f14d6796ea3dd49bc34af8ab7b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods
diff --git a/patches/api/0031-Add-BellRingEvent.patch b/patches/api/0030-Add-BellRingEvent.patch
similarity index 97%
rename from patches/api/0031-Add-BellRingEvent.patch
rename to patches/api/0030-Add-BellRingEvent.patch
index ed93d5786..718e39dc3 100644
--- a/patches/api/0031-Add-BellRingEvent.patch
+++ b/patches/api/0030-Add-BellRingEvent.patch
@@ -1,4 +1,4 @@
-From 179348f81a08cc70fc0ba7f2e72ced6222a0ac38 Mon Sep 17 00:00:00 2001
+From 1af4daf9a5234c33b5e3d53c401ffacf74179d8f Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:39 -0700
 Subject: [PATCH] Add BellRingEvent
diff --git a/patches/api/0032-Configurable-enchantment-max-level.patch b/patches/api/0031-Configurable-enchantment-max-level.patch
similarity index 96%
rename from patches/api/0032-Configurable-enchantment-max-level.patch
rename to patches/api/0031-Configurable-enchantment-max-level.patch
index 3ae38c268..7d7a41742 100644
--- a/patches/api/0032-Configurable-enchantment-max-level.patch
+++ b/patches/api/0031-Configurable-enchantment-max-level.patch
@@ -1,4 +1,4 @@
-From 05f331fbdeffe82858cc827f452ca3458108921e Mon Sep 17 00:00:00 2001
+From 8746ada205f89722c0e8c2aefb2a7f812a1493e1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 19:18:29 -0500
 Subject: [PATCH] Configurable enchantment max level
diff --git a/patches/api/0033-More-anvil-controls.patch b/patches/api/0032-More-anvil-controls.patch
similarity index 96%
rename from patches/api/0033-More-anvil-controls.patch
rename to patches/api/0032-More-anvil-controls.patch
index 12f3d434a..41b1548f5 100644
--- a/patches/api/0033-More-anvil-controls.patch
+++ b/patches/api/0032-More-anvil-controls.patch
@@ -1,4 +1,4 @@
-From 1f9945fb4f4524e6faf06b2b374a3c4a66aaf80b Mon Sep 17 00:00:00 2001
+From 2d9b148d0e16c2ac73a972d8d6cb418d51c77dba Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 19 Apr 2020 00:25:09 -0500
 Subject: [PATCH] More anvil controls
@@ -13,7 +13,7 @@ Subject: [PATCH] More anvil controls
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 00000000..85663c0a
+index 000000000..85663c0a4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 00000000..85663c0a
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 00000000..2717ad82
+index 000000000..2717ad82c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -111,7 +111,7 @@ index 00000000..2717ad82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b..435026e5 100644
+index b95e563b5..435026e53 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {
diff --git a/patches/api/0034-PlayerItemCooldownEvent.patch b/patches/api/0033-PlayerItemCooldownEvent.patch
similarity index 96%
rename from patches/api/0034-PlayerItemCooldownEvent.patch
rename to patches/api/0033-PlayerItemCooldownEvent.patch
index 99c34437a..be182f0cd 100644
--- a/patches/api/0034-PlayerItemCooldownEvent.patch
+++ b/patches/api/0033-PlayerItemCooldownEvent.patch
@@ -1,4 +1,4 @@
-From f4a853766da3be371ba55bba97c3e8b2f0aaefd9 Mon Sep 17 00:00:00 2001
+From 37126b7796f37bc747b9f00439100a87e31c7efb Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:13 +0200
 Subject: [PATCH] PlayerItemCooldownEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 00000000..ffc2512e
+index 000000000..2002909f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@
@@ -92,5 +92,5 @@ index 00000000..ffc2512e
 +    }
 +}
 -- 
-2.26.1.windows.1
+2.24.0
 
diff --git a/patches/api/0035-Player-invulnerabilities.patch b/patches/api/0034-Player-invulnerabilities.patch
similarity index 92%
rename from patches/api/0035-Player-invulnerabilities.patch
rename to patches/api/0034-Player-invulnerabilities.patch
index 079149144..6f59a8537 100644
--- a/patches/api/0035-Player-invulnerabilities.patch
+++ b/patches/api/0034-Player-invulnerabilities.patch
@@ -1,4 +1,4 @@
-From 017455c2e28e6237b63a1b5d7ffb95a2a9efd334 Mon Sep 17 00:00:00 2001
+From 8eadbbe8b0c05341045d3cdb76946da3112b6957 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:31 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -8,7 +8,7 @@ Subject: [PATCH] Player invulnerabilities
  1 file changed, 21 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index edc48117..5d77b71d 100644
+index edc481170..5d77b71d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1850,5 +1850,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index a8f638931..a5f7e68d9 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From fad7117f1f0a960e444b059b3ef72357a008826e Mon Sep 17 00:00:00 2001
+From a7ce770713962d590d3f52703ad66ae10465a8a4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 
 diff --git a/pom.xml b/pom.xml
-index e4c63bb76..d5709e670 100644
+index e4c63bb76c..d5709e670b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -94,7 +94,7 @@ index e4c63bb76..d5709e670 100644
                  </configuration>
                  <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index cd6e25923..bb227bc0f 100644
+index cd6e259239..bb227bc0fb 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -107,10 +107,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b24de6d6..5cd342eda 100644
+index 395e5034ea..d7e29a59de 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1561,7 +1561,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -121,7 +121,7 @@ index 5b24de6d6..5cd342eda 100644
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 new file mode 100644
-index 000000000..d8b408f06
+index 0000000000..d8b408f061
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 @@ -0,0 +1,115 @@
@@ -241,7 +241,7 @@ index 000000000..d8b408f06
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 894917c88..648dde01a 100644
+index 894917c889..648dde01a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
@@ -254,10 +254,10 @@ index 894917c88..648dde01a 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b58f2ef5c..fefa718df 100644
+index 004b6ce132..e1cfde4ffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -312,7 +312,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -267,7 +267,7 @@ index b58f2ef5c..fefa718df 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 674096cab..e9aee2d8a 100644
+index 674096cab1..e9aee2d8a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 209bfa86b..bf7460d47 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From 6e736c2a7977666d82fb9e69db0d05f1608b0b7f Mon Sep 17 00:00:00 2001
+From 13430809585e2fb2d3669d172f8f9efaccec5609 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -18,7 +18,7 @@ Subject: [PATCH] Purpur config files
  create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 24641501a..b767dd1d0 100644
+index 24641501ae..b767dd1d04 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -581,7 +581,7 @@ public class Metrics {
@@ -42,7 +42,7 @@ index 24641501a..b767dd1d0 100644
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b07c49f1b..cf5abd393 100644
+index b07c49f1b4..cf5abd393e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -62,7 +62,7 @@ index b07c49f1b..cf5abd393 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 561b42472..6ada23918 100644
+index 9de505d01f..f97b304ade 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -80,10 +80,10 @@ index 561b42472..6ada23918 100644
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
          this.generator = gen;
-         dimensionmanager.world = (WorldServer) this; // Paper
+         if (dimensionmanager.world == null) dimensionmanager.world = (WorldServer) this; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 000000000..333c880bf
+index 0000000000..333c880bf2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,130 @@
@@ -219,7 +219,7 @@ index 000000000..333c880bf
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 000000000..eda37fa43
+index 0000000000..eda37fa43f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,67 @@
@@ -292,7 +292,7 @@ index 000000000..eda37fa43
 +}
 diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 new file mode 100644
-index 000000000..7d983d9a5
+index 0000000000..7d983d9a54
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 @@ -0,0 +1,67 @@
@@ -364,7 +364,7 @@ index 000000000..7d983d9a5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 648dde01a..64f1190b0 100644
+index 648dde01a7..64f1190b03 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -815,6 +815,7 @@ public final class CraftServer implements Server {
@@ -411,7 +411,7 @@ index 648dde01a..64f1190b0 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ffee0c5dd..f4626daed 100644
+index d6e5d014c0..17ebc84f51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -139,6 +139,14 @@ public class Main {
diff --git a/patches/server/0003-Timings-stuff.patch b/patches/server/0003-Timings-stuff.patch
new file mode 100644
index 000000000..b50921513
--- /dev/null
+++ b/patches/server/0003-Timings-stuff.patch
@@ -0,0 +1,62 @@
+From b13286b4d4b42daa6cbe690825f9e1a7ee2b5299 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Fri, 5 Jun 2020 21:30:19 -0500
+Subject: [PATCH] Timings stuff
+
+---
+ .../java/co/aikar/timings/TimingsExport.java  | 25 ++++++++++++++++---
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index a3b41ce5fc..4a9e7fd92c 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
+         // Information on the users Config
+ 
+         parent.put("config", createObject(
+-            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+-            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
++                // Purpur start
++                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
++                pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
++                pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
++                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++                pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
++                // Purpur end
+         ));
+ 
+         new TimingsExport(listeners, parent, history).start();
+@@ -270,6 +274,19 @@ public class TimingsExport extends Thread {
+         return timingsCost;
+     }
+ 
++    // Purpur start
++    private static JSONObject mapAsJSON(java.util.Properties properties) {
++        JSONObject object = new JSONObject();
++        for (String key : properties.stringPropertyNames()) {
++            if (TimingsManager.hiddenConfigs.contains(key)) {
++                continue;
++            }
++            object.put(key, valAsJSON(properties.get(key), key));
++        }
++        return object;
++    }
++    // Purpur end
++
+     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
+ 
+         JSONObject object = new JSONObject();
+@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
+         String response = null;
+         String timingsURL = null;
+         try {
+-            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
++            HttpURLConnection con = (HttpURLConnection) new URL(Bukkit.spigot().getPurpurConfig().getString("settings.timings.url", "https://timings.pl3x.net") + "/post").openConnection(); // Purpur
+             con.setDoOutput(true);
+             String hostName = "BrokenHost";
+             try {
+-- 
+2.24.0
+
diff --git a/patches/server/0003-decompile-fixes.patch b/patches/server/0004-decompile-fixes.patch
similarity index 97%
rename from patches/server/0003-decompile-fixes.patch
rename to patches/server/0004-decompile-fixes.patch
index 84fef3cca..8dedf3013 100644
--- a/patches/server/0003-decompile-fixes.patch
+++ b/patches/server/0004-decompile-fixes.patch
@@ -1,4 +1,4 @@
-From 6a3e2bccab2447deb3903835280a9fd6f83d8c3c Mon Sep 17 00:00:00 2001
+From 809dfebb0fe424318cf3d7efc6cf646d3edcd347 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] decompile-fixes
@@ -95,7 +95,7 @@ Subject: [PATCH] decompile-fixes
  88 files changed, 227 insertions(+), 233 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
-index de831ed87..9c38f8907 100644
+index de831ed87e..9c38f8907a 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 @@ -4,9 +4,9 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -112,7 +112,7 @@ index de831ed87..9c38f8907 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
-index 5ae19373d..2a6dafccd 100644
+index 5ae19373d6..2a6dafccdd 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 @@ -4,9 +4,9 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -129,7 +129,7 @@ index 5ae19373d..2a6dafccd 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
-index 262740414..f4e9345ae 100644
+index 2627404141..f4e9345aeb 100644
 --- a/src/main/java/net/minecraft/server/BiomeBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeBeach.java
 @@ -4,9 +4,9 @@ public final class BiomeBeach extends BiomeBase {
@@ -146,7 +146,7 @@ index 262740414..f4e9345ae 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
-index a42098da5..58c30f652 100644
+index a42098da5c..58c30f6523 100644
 --- a/src/main/java/net/minecraft/server/BiomeBigHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
 @@ -4,8 +4,8 @@ public final class BiomeBigHills extends BiomeBase {
@@ -161,7 +161,7 @@ index a42098da5..58c30f652 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
-index 27fa23801..9437438c8 100644
+index 27fa238013..9437438c82 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -176,7 +176,7 @@ index 27fa23801..9437438c8 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
-index 51b1d39f5..3e5c23d31 100644
+index 51b1d39f53..3e5c23d31e 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -191,7 +191,7 @@ index 51b1d39f5..3e5c23d31 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
-index b74f23cff..d5eb5c91c 100644
+index b74f23cff6..d5eb5c91c4 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -206,7 +206,7 @@ index b74f23cff..d5eb5c91c 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
-index 17fe3818d..e805f9568 100644
+index 17fe3818dd..e805f9568e 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -221,7 +221,7 @@ index 17fe3818d..e805f9568 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
-index 2c230be98..1b92f4567 100644
+index 2c230be98f..1b92f4567d 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
 @@ -4,9 +4,9 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -238,7 +238,7 @@ index 2c230be98..1b92f4567 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
-index d96e820e0..b9a5cb63a 100644
+index d96e820e07..b9a5cb63a4 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -266,7 +266,7 @@ index d96e820e0..b9a5cb63a 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
-index c7ed2e134..571c3d139 100644
+index c7ed2e134a..571c3d139d 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
 @@ -4,9 +4,9 @@ public class BiomeColdOcean extends BiomeBase {
@@ -292,7 +292,7 @@ index c7ed2e134..571c3d139 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
-index c766dedfa..88400e77b 100644
+index c766dedfa9..88400e77bf 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 @@ -4,9 +4,9 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -309,7 +309,7 @@ index c766dedfa..88400e77b 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
-index 187f11f58..8a8fc7dbd 100644
+index 187f11f584..8a8fc7dbd2 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -324,7 +324,7 @@ index 187f11f58..8a8fc7dbd 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
-index 97c56fb80..327e6847f 100644
+index 97c56fb803..327e6847f0 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -339,7 +339,7 @@ index 97c56fb80..327e6847f 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
-index bea129314..651d44cb3 100644
+index bea1293144..651d44cb37 100644
 --- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 @@ -4,10 +4,10 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -367,7 +367,7 @@ index bea129314..651d44cb3 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
-index 7a8784f18..257732dad 100644
+index 7a8784f18a..257732dad7 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesert.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesert.java
 @@ -4,11 +4,11 @@ public final class BiomeDesert extends BiomeBase {
@@ -388,7 +388,7 @@ index 7a8784f18..257732dad 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
-index 9f5e9abc4..3752fc450 100644
+index 9f5e9abc41..3752fc4509 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
 @@ -4,9 +4,9 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -405,7 +405,7 @@ index 9f5e9abc4..3752fc450 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
-index f79e438dc..1a0b56932 100644
+index f79e438dc4..1a0b569322 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -420,7 +420,7 @@ index f79e438dc..1a0b56932 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
-index 58a612528..8e19e0688 100644
+index 58a6125289..8e19e06889 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -435,7 +435,7 @@ index 58a612528..8e19e0688 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
-index cd18533bb..69d4880c7 100644
+index cd18533bb0..69d4880c74 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -450,7 +450,7 @@ index cd18533bb..69d4880c7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
-index 2c7f5940a..7661d5316 100644
+index 2c7f5940a4..7661d53161 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -465,7 +465,7 @@ index 2c7f5940a..7661d5316 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
-index 6e33c2363..05418f8fa 100644
+index 6e33c23632..05418f8fa1 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -480,7 +480,7 @@ index 6e33c2363..05418f8fa 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
-index c6ac9506a..1d3f62432 100644
+index c6ac9506a7..1d3f624323 100644
 --- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 @@ -6,18 +6,18 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -508,7 +508,7 @@ index c6ac9506a..1d3f62432 100644
          BiomeDecoratorGroups.Z(this);
          BiomeDecoratorGroups.aa(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
-index 570a1f66f..e849b411c 100644
+index 570a1f66f3..e849b411c6 100644
 --- a/src/main/java/net/minecraft/server/BiomeForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeForest.java
 @@ -4,9 +4,9 @@ public final class BiomeForest extends BiomeBase {
@@ -525,7 +525,7 @@ index 570a1f66f..e849b411c 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
-index 8179e1c60..f7dea38eb 100644
+index 8179e1c603..f7dea38eb3 100644
 --- a/src/main/java/net/minecraft/server/BiomeForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
 @@ -4,9 +4,9 @@ public final class BiomeForestHills extends BiomeBase {
@@ -542,7 +542,7 @@ index 8179e1c60..f7dea38eb 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
-index 852c4bd9a..67d120bef 100644
+index 852c4bd9ab..67d120bef2 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 @@ -6,10 +6,10 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -561,7 +561,7 @@ index 852c4bd9a..67d120bef 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
-index 3d649c600..2772bc6da 100644
+index 3d649c6004..2772bc6dac 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 @@ -6,9 +6,9 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -578,7 +578,7 @@ index 3d649c600..2772bc6da 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
-index 915f20042..4be53fc0f 100644
+index 915f20042b..4be53fc0f6 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 @@ -4,7 +4,7 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -591,7 +591,7 @@ index 915f20042..4be53fc0f 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
-index f9ca6b889..888dfcd8d 100644
+index f9ca6b889a..888dfcd8d4 100644
 --- a/src/main/java/net/minecraft/server/BiomeHell.java
 +++ b/src/main/java/net/minecraft/server/BiomeHell.java
 @@ -4,20 +4,20 @@ public final class BiomeHell extends BiomeBase {
@@ -629,7 +629,7 @@ index f9ca6b889..888dfcd8d 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ZOMBIE_PIGMAN, 100, 4, 4));
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.MAGMA_CUBE, 2, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
-index d5033de8a..ad9b4efe0 100644
+index d5033de8aa..ad9b4efe09 100644
 --- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
 @@ -4,8 +4,8 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -644,7 +644,7 @@ index d5033de8a..ad9b4efe0 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
-index 054b0e0ab..71606b0a7 100644
+index 054b0e0ab1..71606b0a71 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
 @@ -4,11 +4,11 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -665,7 +665,7 @@ index 054b0e0ab..71606b0a7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
-index 44c410f75..984f94bb5 100644
+index 44c410f75c..984f94bb59 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 @@ -4,14 +4,14 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -688,7 +688,7 @@ index 44c410f75..984f94bb5 100644
          BiomeDecoratorGroups.h(this);
          BiomeDecoratorGroups.l(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 2f893ce91..95e501996 100644
+index 2f893ce918..95e5019968 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -4,9 +4,9 @@ public final class BiomeJungle extends BiomeBase {
@@ -705,7 +705,7 @@ index 2f893ce91..95e501996 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
-index 485861785..e624f9764 100644
+index 4858617859..e624f9764f 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -720,7 +720,7 @@ index 485861785..e624f9764 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
-index a957f6124..1fe9c840a 100644
+index a957f6124b..1fe9c840a7 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -735,7 +735,7 @@ index a957f6124..1fe9c840a 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
-index 7b9bc967a..e2970ab00 100644
+index 7b9bc967a9..e2970ab00e 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
 @@ -4,9 +4,9 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -752,7 +752,7 @@ index 7b9bc967a..e2970ab00 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
-index 02246950d..ffe6b4344 100644
+index 02246950d0..ffe6b4344e 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -767,7 +767,7 @@ index 02246950d..ffe6b4344 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
-index e6d4a2c39..b23c43305 100644
+index e6d4a2c397..b23c43305b 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -786,7 +786,7 @@ index e6d4a2c39..b23c43305 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
-index f2dc5d1b5..efcb11bbe 100644
+index f2dc5d1b5c..efcb11bbe8 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 @@ -4,9 +4,9 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -803,7 +803,7 @@ index f2dc5d1b5..efcb11bbe 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
-index f6ec90c2d..328e939a6 100644
+index f6ec90c2d0..328e939a6f 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -818,7 +818,7 @@ index f6ec90c2d..328e939a6 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
-index e9ad930d8..36bea710a 100644
+index e9ad930d88..36bea710a0 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -833,7 +833,7 @@ index e9ad930d8..36bea710a 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
-index cdc182c22..22474d682 100644
+index cdc182c229..22474d682a 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -848,7 +848,7 @@ index cdc182c22..22474d682 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index 95e602a95..65d606d51 100644
+index 95e602a95f..65d606d51c 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesa.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
 @@ -4,8 +4,8 @@ public final class BiomeMesa extends BiomeBase {
@@ -863,7 +863,7 @@ index 95e602a95..65d606d51 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
-index 57ef10afb..5ecec62f1 100644
+index 57ef10afb0..5ecec62f18 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -878,7 +878,7 @@ index 57ef10afb..5ecec62f1 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
-index b9f81a044..14d4bd312 100644
+index b9f81a044f..14d4bd312e 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -893,7 +893,7 @@ index b9f81a044..14d4bd312 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
-index 3ce8d3cef..b5dab9d2a 100644
+index 3ce8d3cef5..b5dab9d2aa 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -908,7 +908,7 @@ index 3ce8d3cef..b5dab9d2a 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
-index 88b7b3746..d05cc38b5 100644
+index 88b7b37467..d05cc38b5e 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -923,7 +923,7 @@ index 88b7b3746..d05cc38b5 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
-index 7254bcf3e..21a77ee81 100644
+index 7254bcf3e5..21a77ee812 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -938,7 +938,7 @@ index 7254bcf3e..21a77ee81 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
-index 58bc1f234..0302efbdc 100644
+index 58bc1f2343..0302efbdc7 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 @@ -4,8 +4,8 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -953,7 +953,7 @@ index 58bc1f234..0302efbdc 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
-index cb620014b..51f92584b 100644
+index cb620014b7..51f92584b8 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
 @@ -4,8 +4,8 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -968,7 +968,7 @@ index cb620014b..51f92584b 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
-index fd7e99106..ad9628b2a 100644
+index fd7e991062..ad9628b2aa 100644
 --- a/src/main/java/net/minecraft/server/BiomeOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeOcean.java
 @@ -4,9 +4,9 @@ public final class BiomeOcean extends BiomeBase {
@@ -994,7 +994,7 @@ index fd7e99106..ad9628b2a 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
-index efbb36d01..ff6090e3c 100644
+index efbb36d016..ff6090e3c1 100644
 --- a/src/main/java/net/minecraft/server/BiomePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomePlains.java
 @@ -4,10 +4,10 @@ public final class BiomePlains extends BiomeBase {
@@ -1013,7 +1013,7 @@ index efbb36d01..ff6090e3c 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
-index 7804a4e32..a28222eb1 100644
+index 7804a4e329..a28222eb1d 100644
 --- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1028,7 +1028,7 @@ index 7804a4e32..a28222eb1 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
-index 6522c8021..b84b868b1 100644
+index 6522c80214..b84b868b1a 100644
 --- a/src/main/java/net/minecraft/server/BiomeRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeRiver.java
 @@ -4,7 +4,7 @@ public final class BiomeRiver extends BiomeBase {
@@ -1050,7 +1050,7 @@ index 6522c8021..b84b868b1 100644
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 2, 1, 4));
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SALMON, 5, 1, 5));
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
-index 30d680224..16bcf9bff 100644
+index 30d6802242..16bcf9bff0 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 @@ -6,14 +6,14 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1073,7 +1073,7 @@ index 30d680224..16bcf9bff 100644
          BiomeDecoratorGroups.g(this);
          BiomeDecoratorGroups.h(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
-index 5c9ab0864..9fa84c87f 100644
+index 5c9ab0864e..9fa84c87fa 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 @@ -6,14 +6,14 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1096,7 +1096,7 @@ index 5c9ab0864..9fa84c87f 100644
          BiomeDecoratorGroups.g(this);
          BiomeDecoratorGroups.h(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
-index e023898b3..c12a89016 100644
+index e023898b38..c12a890165 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavanna.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
 @@ -4,10 +4,10 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1115,7 +1115,7 @@ index e023898b3..c12a89016 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
-index 8a0da661f..db8b20a6c 100644
+index 8a0da661fb..db8b20a6c7 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1130,7 +1130,7 @@ index 8a0da661f..db8b20a6c 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
-index 1d2a37a41..2826c510d 100644
+index 1d2a37a41e..2826c510d8 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1145,7 +1145,7 @@ index 1d2a37a41..2826c510d 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
-index 91e2b5903..e544a8f6b 100644
+index 91e2b59037..e544a8f6b9 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1160,7 +1160,7 @@ index 91e2b5903..e544a8f6b 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
-index 501c36649..34660f9f8 100644
+index 501c36649e..34660f9f84 100644
 --- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 @@ -4,8 +4,8 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1175,7 +1175,7 @@ index 501c36649..34660f9f8 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
-index 62c1cfaef..8815c9590 100644
+index 62c1cfaef9..8815c95900 100644
 --- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 @@ -4,21 +4,21 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1206,7 +1206,7 @@ index 62c1cfaef..8815c9590 100644
          BiomeDecoratorGroups.ap(this);
          this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
-index 29e448f5a..02584897e 100644
+index 29e448f5ad..02584897e9 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamp.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
 @@ -4,8 +4,8 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1230,7 +1230,7 @@ index 29e448f5a..02584897e 100644
          BiomeDecoratorGroups.ap(this);
          this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
-index 1352daa25..d85b01b95 100644
+index 1352daa258..d85b01b956 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 @@ -4,7 +4,7 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1243,7 +1243,7 @@ index 1352daa25..d85b01b95 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
-index 5cd569dcd..ae6e6ca89 100644
+index 5cd569dcdd..ae6e6ca896 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
 @@ -4,10 +4,10 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1262,7 +1262,7 @@ index 5cd569dcd..ae6e6ca89 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
-index e182f0400..4e19fe5ae 100644
+index e182f04008..4e19fe5ae9 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1277,7 +1277,7 @@ index e182f0400..4e19fe5ae 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
-index 75d46c61d..05e833ffe 100644
+index 75d46c61dc..05e833ffed 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1292,7 +1292,7 @@ index 75d46c61d..05e833ffe 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
-index 26fda2cf6..22e9789a3 100644
+index 26fda2cf69..22e9789a36 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
 @@ -6,7 +6,7 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1305,7 +1305,7 @@ index 26fda2cf6..22e9789a3 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
-index c06512864..a26d56aa4 100644
+index c065128649..a26d56aa45 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 @@ -4,7 +4,7 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1318,7 +1318,7 @@ index c06512864..a26d56aa4 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
-index 90e79b291..e47add3e4 100644
+index 90e79b2918..e47add3e43 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 @@ -4,10 +4,10 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1336,7 +1336,7 @@ index 90e79b291..e47add3e4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
-index c7d5317cc..ec92a8457 100644
+index c7d5317cc0..ec92a84579 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 @@ -4,7 +4,7 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1349,7 +1349,7 @@ index c7d5317cc..ec92a8457 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
-index 87fd7e146..c9ba33453 100644
+index 87fd7e1467..c9ba334535 100644
 --- a/src/main/java/net/minecraft/server/BiomeVoid.java
 +++ b/src/main/java/net/minecraft/server/BiomeVoid.java
 @@ -4,6 +4,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1361,7 +1361,7 @@ index 87fd7e146..c9ba33453 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
-index 3f8e18a2c..11dc5f637 100644
+index 3f8e18a2c7..11dc5f6374 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1380,7 +1380,7 @@ index 3f8e18a2c..11dc5f637 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
-index dd7916c09..e4dc7d198 100644
+index dd7916c090..e4dc7d198c 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 @@ -6,9 +6,9 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1409,7 +1409,7 @@ index dd7916c09..e4dc7d198 100644
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4));
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3));
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index d384e9578..f0d72ea39 100644
+index d384e9578a..f0d72ea39d 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -25,7 +25,7 @@ public class CommandDebug {
@@ -1422,7 +1422,7 @@ index d384e9578..f0d72ea39 100644
      public static void a(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> com_mojang_brigadier_commanddispatcher) {
          com_mojang_brigadier_commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) CommandDispatcher.a("debug").requires((commandlistenerwrapper) -> {
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 5b1d2c7f5..da6a3fa2c 100644
+index 5b1d2c7f50..da6a3fa2c8 100644
 --- a/src/main/java/net/minecraft/server/EntityBlaze.java
 +++ b/src/main/java/net/minecraft/server/EntityBlaze.java
 @@ -24,7 +24,7 @@ public class EntityBlaze extends EntityMonster {
@@ -1435,7 +1435,7 @@ index 5b1d2c7f5..da6a3fa2c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 57af3835e..b3bdc194a 100644
+index 57af3835ee..b3bdc194ab 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -1448,7 +1448,7 @@ index 57af3835e..b3bdc194a 100644
          hashmap.put(1, new MinecraftKey("textures/entity/cat/black.png"));
          hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
 diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
-index c13abc7e0..7ebd7da1c 100644
+index c13abc7e07..7ebd7da1c5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
 @@ -21,7 +21,7 @@ public class EntityEnderSignal extends Entity {
@@ -1461,7 +1461,7 @@ index c13abc7e0..7ebd7da1c 100644
              }));
          }
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index b34695f2d..e4bd2796a 100644
+index b34695f2d0..e4bd2796a4 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -19,7 +19,7 @@ public class EntityEndermite extends EntityMonster {
@@ -1474,7 +1474,7 @@ index b34695f2d..e4bd2796a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 886268b09..b030fe957 100644
+index 886268b09e..b030fe9577 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -24,7 +24,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1487,7 +1487,7 @@ index 886268b09..b030fe957 100644
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index d332907b3..b853fd0d9 100644
+index d332907b3b..b853fd0d9b 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -73,11 +73,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1504,7 +1504,7 @@ index d332907b3..b853fd0d9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 140208761..94e57a2d8 100644
+index 1402087612..94e57a2d85 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -20,8 +20,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -1519,7 +1519,7 @@ index 140208761..94e57a2d8 100644
          hashmap.put(EntityTypes.CAVE_SPIDER, SoundEffects.ENTITY_PARROT_IMITATE_SPIDER);
          hashmap.put(EntityTypes.CREEPER, SoundEffects.ENTITY_PARROT_IMITATE_CREEPER);
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index bb46247f2..f63528ca3 100644
+index bb46247f2f..f63528ca3e 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -1543,7 +1543,7 @@ index bb46247f2..f63528ca3 100644
      private PathfinderGoalEatTile bA;
  
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 7b6b1ad17..1432d3f6b 100644
+index 7b6b1ad17b..1432d3f6bf 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -30,13 +30,13 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -1563,7 +1563,7 @@ index 7b6b1ad17..1432d3f6b 100644
          this.targetSelector.a(3, this.bA);
      }
 diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
-index 5648ba73c..304190fdc 100644
+index 5648ba73c5..304190fdc4 100644
 --- a/src/main/java/net/minecraft/server/GeneratorAccess.java
 +++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
 @@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
@@ -1576,7 +1576,7 @@ index 5648ba73c..304190fdc 100644
  
      @Override default java.util.List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Set<Entity> set, boolean returnFast) {return IEntityAccess.super.getEntityCollisions(entity, axisalignedbb, set, returnFast); } // Paper
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 38b79b5b1..c4aa38ddf 100644
+index 38b79b5b10..c4aa38ddf1 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -1589,7 +1589,7 @@ index 38b79b5b1..c4aa38ddf 100644
              afloat[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
          }
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
-index de8f1874a..73402f2b5 100644
+index de8f1874af..73402f2b5a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 @@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -1602,7 +1602,7 @@ index de8f1874a..73402f2b5 100644
  
      public WorldGenFeatureRandomChoiceConfigurationWeight<FC> a(float f) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
-index 979f3517c..5827b1ba1 100644
+index 979f3517c0..5827b1ba1a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 @@ -58,6 +58,6 @@ public class WorldGenFeatureTreeBeehive extends WorldGenFeatureTree {
diff --git a/patches/server/0004-Add-language-asset-purpur.lang.patch b/patches/server/0005-Add-language-asset-purpur.lang.patch
similarity index 98%
rename from patches/server/0004-Add-language-asset-purpur.lang.patch
rename to patches/server/0005-Add-language-asset-purpur.lang.patch
index e0063432c..29c134a16 100644
--- a/patches/server/0004-Add-language-asset-purpur.lang.patch
+++ b/patches/server/0005-Add-language-asset-purpur.lang.patch
@@ -1,4 +1,4 @@
-From 16fd129dea27af5866c4ff2281febb202873f9ac Mon Sep 17 00:00:00 2001
+From 0501bb760a4b2c1ddfb42b59e38fbb8f98e2d874 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 13:17:09 -0500
 Subject: [PATCH] Add language asset purpur.lang
diff --git a/patches/server/0005-Fix-vanilla-command-permission-handler.patch b/patches/server/0006-Fix-vanilla-command-permission-handler.patch
similarity index 95%
rename from patches/server/0005-Fix-vanilla-command-permission-handler.patch
rename to patches/server/0006-Fix-vanilla-command-permission-handler.patch
index a0c9eb2c8..ebec0bd2f 100644
--- a/patches/server/0005-Fix-vanilla-command-permission-handler.patch
+++ b/patches/server/0006-Fix-vanilla-command-permission-handler.patch
@@ -1,4 +1,4 @@
-From f8df3bbaaa80fa78bf8c279cef08ad1884b8945a Mon Sep 17 00:00:00 2001
+From 98e87908d5f618cbd2c223f6315b9dd62f1baa7f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Mar 2020 01:51:32 -0500
 Subject: [PATCH] Fix vanilla command permission handler
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix vanilla command permission handler
  2 files changed, 2 insertions(+)
 
 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index 98592a3e63..93d878bf1c 100644
+index bd2802d362..5fa2a45c81 100644
 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 @@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
diff --git a/patches/server/0006-Host-our-own-timings.patch b/patches/server/0007-Host-our-own-timings.patch
similarity index 88%
rename from patches/server/0006-Host-our-own-timings.patch
rename to patches/server/0007-Host-our-own-timings.patch
index 8ecafb1a6..25ff7e68e 100644
--- a/patches/server/0006-Host-our-own-timings.patch
+++ b/patches/server/0007-Host-our-own-timings.patch
@@ -1,4 +1,4 @@
-From 7401e76df06e0028a842fa4415106ec401a9bc3a Mon Sep 17 00:00:00 2001
+From be0d0fa48d1a6aad73e95083e4562505501d0ecb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:34 -0600
 Subject: [PATCH] Host our own timings
@@ -8,7 +8,7 @@ Subject: [PATCH] Host our own timings
  1 file changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 333c880bf..2673de821 100644
+index 333c880bf2..2673de8212 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -127,4 +127,8 @@ public class PurpurConfig {
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0008-Ridables.patch
similarity index 99%
rename from patches/server/0007-Ridables.patch
rename to patches/server/0008-Ridables.patch
index 94ab230f0..9494a0d45 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -1,4 +1,4 @@
-From 89312840b1523b425c3bd27c34bd0793db68eefc Mon Sep 17 00:00:00 2001
+From 67dffaad30d16e4b0c9918d58c710e4ebe9509b7 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
@@ -5227,7 +5227,7 @@ index 0c7f094e54..62a0810062 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 6ada239185..c3a862fea0 100644
+index f97b304ade..d2fac7f296 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -6517,10 +6517,10 @@ index 0000000000..9bb9da22aa
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ff60568ce4..ef64cfadec 100644
+index d16d3fe58e..5246db9636 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1059,4 +1059,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1058,4 +1058,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().spawnReason;
      }
      // Paper end
diff --git a/patches/server/0008-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
similarity index 95%
rename from patches/server/0008-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
index 6cad50611..e39d63061 100644
--- a/patches/server/0008-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
@@ -1,4 +1,4 @@
-From 89502c80c6cf9a1f07462f3475aef7c65949a6ef Mon Sep 17 00:00:00 2001
+From 0befe14c7c515802c2dcb800db9859c79822d9dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:52:12 -0500
 Subject: [PATCH] Logger settings (suppressing pointless logs)
@@ -12,7 +12,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
  5 files changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index c41e13847..44331cea7 100644
+index c41e138472..44331cea7c 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -162,6 +162,7 @@ public class AdvancementDataPlayer {
@@ -24,7 +24,7 @@ index c41e13847..44331cea7 100644
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
-index 469e293c2..ca58302cf 100644
+index 469e293c25..ca58302cf7 100644
 --- a/src/main/java/net/minecraft/server/GenericAttributes.java
 +++ b/src/main/java/net/minecraft/server/GenericAttributes.java
 @@ -79,6 +79,7 @@ public class GenericAttributes {
@@ -36,7 +36,7 @@ index 469e293c2..ca58302cf 100644
              } else {
                  a(attributeinstance, nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
-index 73402f2b5..1c2320cc5 100644
+index 73402f2b5a..1c2320cc54 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 @@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -48,7 +48,7 @@ index 73402f2b5..1c2320cc5 100644
              return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2673de821..d6f82d119 100644
+index 2673de8212..d6f82d119e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -128,6 +128,17 @@ public class PurpurConfig {
@@ -70,7 +70,7 @@ index 2673de821..d6f82d119 100644
          getString("settings.timings.url", "https://timings.pl3x.net");
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index 049e9f98d..1d179cd5b 100644
+index 049e9f98de..1d179cd5bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 @@ -254,6 +254,7 @@ public final class CraftLegacy {
diff --git a/patches/server/0009-Disable-outdated-build-check.patch b/patches/server/0010-Disable-outdated-build-check.patch
similarity index 92%
rename from patches/server/0009-Disable-outdated-build-check.patch
rename to patches/server/0010-Disable-outdated-build-check.patch
index 5de912eda..d4e3f14da 100644
--- a/patches/server/0009-Disable-outdated-build-check.patch
+++ b/patches/server/0010-Disable-outdated-build-check.patch
@@ -1,4 +1,4 @@
-From e15515e1c1a6f10072bb7ac3a2636403eddb86dd Mon Sep 17 00:00:00 2001
+From 139d189fa8600958abb4e5d209a2ab6dafdbfe99 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Dec 2019 12:53:59 -0600
 Subject: [PATCH] Disable outdated build check
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable outdated build check
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f4626daed..4b95b3c22 100644
+index 17ebc84f51..ced4acc5f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -252,7 +252,7 @@ public class Main {
diff --git a/patches/server/0010-Add-obfhelpers-for-plugin-use.patch b/patches/server/0011-Add-obfhelpers-for-plugin-use.patch
similarity index 93%
rename from patches/server/0010-Add-obfhelpers-for-plugin-use.patch
rename to patches/server/0011-Add-obfhelpers-for-plugin-use.patch
index af3c9aadc..2aca5da5a 100644
--- a/patches/server/0010-Add-obfhelpers-for-plugin-use.patch
+++ b/patches/server/0011-Add-obfhelpers-for-plugin-use.patch
@@ -1,4 +1,4 @@
-From d00b977d56be597aaafd83184f0693c10b656fd3 Mon Sep 17 00:00:00 2001
+From b28d366ed0e2e748cc515c6ac6c5d5a90652f579 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Jan 2020 20:12:39 -0600
 Subject: [PATCH] Add obfhelpers for plugin use
@@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
  3 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index fb97c51bb..50ed4001d 100644
+index fb97c51bb1..50ed4001d1 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -30,7 +30,7 @@ index fb97c51bb..50ed4001d 100644
              return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
          }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ea60880c6..413b888a0 100644
+index ea60880c6f..413b888a04 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -596,6 +596,7 @@ public final class ItemStack {
@@ -42,7 +42,7 @@ index ea60880c6..413b888a0 100644
          if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
              return this.tag.getCompound(s);
 diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
-index bea4a0b80..c6481c7ff 100644
+index bea4a0b808..c6481c7ff1 100644
 --- a/src/main/java/net/minecraft/server/NBTTagString.java
 +++ b/src/main/java/net/minecraft/server/NBTTagString.java
 @@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
diff --git a/patches/server/0011-Silk-touch-spawners.patch b/patches/server/0012-Silk-touch-spawners.patch
similarity index 96%
rename from patches/server/0011-Silk-touch-spawners.patch
rename to patches/server/0012-Silk-touch-spawners.patch
index dd5ab1545..c0fbe4e6c 100644
--- a/patches/server/0011-Silk-touch-spawners.patch
+++ b/patches/server/0012-Silk-touch-spawners.patch
@@ -1,4 +1,4 @@
-From 454f9a81df12ad44d358eeda82b46fedc91f3786 Mon Sep 17 00:00:00 2001
+From c458e4eb00beea0dc60c35e6c343e6b013c80a97 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
@@ -10,7 +10,7 @@ Subject: [PATCH] Silk touch spawners
  3 files changed, 47 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index d051a54aa..8c8dc9d6b 100644
+index d051a54aa0..8c8dc9d6b8 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -501,6 +501,7 @@ public class Block implements IMaterial {
@@ -22,7 +22,7 @@ index d051a54aa..8c8dc9d6b 100644
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 5296fdf16..69d04f6cb 100644
+index 5296fdf168..69d04f6cbf 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -67,7 +67,7 @@ index 5296fdf16..69d04f6cb 100644
      public void dropNaturally(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
          super.dropNaturally(iblockdata, world, blockposition, itemstack);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 5a7494947..8e8d392a1 100644
+index 5a7494947c..8e8d392a15 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -136,10 +136,17 @@ public class EntityTypes<T extends Entity> {
diff --git a/patches/server/0012-Give-giants-AI.patch b/patches/server/0013-Give-giants-AI.patch
similarity index 98%
rename from patches/server/0012-Give-giants-AI.patch
rename to patches/server/0013-Give-giants-AI.patch
index 220d321d1..c79ce908b 100644
--- a/patches/server/0012-Give-giants-AI.patch
+++ b/patches/server/0013-Give-giants-AI.patch
@@ -1,4 +1,4 @@
-From 8815a77a92f3c438d6a379f34307de09b536c87a Mon Sep 17 00:00:00 2001
+From 32ed6366b03dbec3921692e4297a0674beb0615c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Give giants AI
@@ -78,7 +78,7 @@ index ff8a41a539..4296aaa074 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 28218f048d..00cbd99914 100644
+index cbbbc875be..fbca429090 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -98,7 +98,7 @@ index 28218f048d..00cbd99914 100644
          float f = difficultydamagescaler.d();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fafbea673e..b5d9fc76b6 100644
+index 69f99a993d..7cf7ae3dcb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -255,12 +255,22 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0013-Illusioners-AI-settings.patch b/patches/server/0014-Illusioners-AI-settings.patch
similarity index 96%
rename from patches/server/0013-Illusioners-AI-settings.patch
rename to patches/server/0014-Illusioners-AI-settings.patch
index d20f2725a..cb028bccb 100644
--- a/patches/server/0013-Illusioners-AI-settings.patch
+++ b/patches/server/0014-Illusioners-AI-settings.patch
@@ -1,4 +1,4 @@
-From f69c078a136c8b4c90d46b19f5f0498fb94df06d Mon Sep 17 00:00:00 2001
+From e5b3ef66104c980b1d533be8844feb0814837194 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Illusioners AI settings
@@ -26,7 +26,7 @@ index 3e6722cfce..13545a8efe 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b5d9fc76b6..749fa33e55 100644
+index 7cf7ae3dcb..96a66926fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -299,10 +299,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0014-Zombie-horse-naturally-spawn.patch b/patches/server/0015-Zombie-horse-naturally-spawn.patch
similarity index 98%
rename from patches/server/0014-Zombie-horse-naturally-spawn.patch
rename to patches/server/0015-Zombie-horse-naturally-spawn.patch
index 6f8f67897..09d531ff5 100644
--- a/patches/server/0014-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0015-Zombie-horse-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From 84c4a40a15f523104c986a0a12140d94c537a8eb Mon Sep 17 00:00:00 2001
+From 9e770d2145e55b702d98ee898bf024d5a8a7eda6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
diff --git a/patches/server/0015-Charged-creeper-naturally-spawn.patch b/patches/server/0016-Charged-creeper-naturally-spawn.patch
similarity index 96%
rename from patches/server/0015-Charged-creeper-naturally-spawn.patch
rename to patches/server/0016-Charged-creeper-naturally-spawn.patch
index ce5b4355b..941653a25 100644
--- a/patches/server/0015-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0016-Charged-creeper-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From b193d1eae06da1137336b4beb8b8036af4b178ea Mon Sep 17 00:00:00 2001
+From 136521abd75dada9b5a980379b39c12838c50ff3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:37:44 -0600
 Subject: [PATCH] Charged creeper naturally spawn
@@ -31,7 +31,7 @@ index 48fd8e716b..ce366f401f 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1a8b8de8dd..e38d0bea2c 100644
+index 4c7469b903..bbae44ddb5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -148,10 +148,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0016-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0017-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 97%
rename from patches/server/0016-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0017-Rabbit-naturally-spawn-toast-and-killer.patch
index d53d01cbd..7c069917a 100644
--- a/patches/server/0016-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0017-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -1,4 +1,4 @@
-From 58e34621703befdfff630573a97f05c8f636304a Mon Sep 17 00:00:00 2001
+From 7a740eac98a1acd7253c498e690324cd18e42d47 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Rabbit naturally spawn toast and killer
diff --git a/patches/server/0017-Cat-spawning-options.patch b/patches/server/0018-Cat-spawning-options.patch
similarity index 97%
rename from patches/server/0017-Cat-spawning-options.patch
rename to patches/server/0018-Cat-spawning-options.patch
index 05ededbc6..3b941570a 100644
--- a/patches/server/0017-Cat-spawning-options.patch
+++ b/patches/server/0018-Cat-spawning-options.patch
@@ -1,4 +1,4 @@
-From 975326f787697bfeca3d2629407771ec917523cf Mon Sep 17 00:00:00 2001
+From 4d0a8cc4bd681061763e57d2addcbfff9a87f6b4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Cat spawning options
@@ -57,7 +57,7 @@ index 6024478dc0..4b55c07d41 100644
          return list.size() < 1 ? this.a(blockposition, world) : 0;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7df44adc8a..8ecf47f25a 100644
+index 4aaf75fcf4..12fbdf65c5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -101,10 +101,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch b/patches/server/0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
similarity index 95%
rename from patches/server/0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
rename to patches/server/0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
index 64f1e0dc8..f335e7418 100644
--- a/patches/server/0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
+++ b/patches/server/0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
@@ -1,4 +1,4 @@
-From 61da90d5caa954016f81121175adcae46f5c5c98 Mon Sep 17 00:00:00 2001
+From aa2411409c85d1baa93f157506e929bfcf44d62c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 01:23:22 -0600
 Subject: [PATCH] Fix non black cat types spawning in swamp huts
diff --git a/patches/server/0019-Cows-eat-mushrooms.patch b/patches/server/0020-Cows-eat-mushrooms.patch
similarity index 97%
rename from patches/server/0019-Cows-eat-mushrooms.patch
rename to patches/server/0020-Cows-eat-mushrooms.patch
index c2f2d0b1a..1e82dc7c7 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0020-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 424361653f547e2ef080fcccba4bca7e6752a6ba Mon Sep 17 00:00:00 2001
+From 4359121c6cc4b87aa44cdf26bc9bbb55d75d8b67 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 1ef13ee78..0652f6312 100644
+index 1ef13ee78e..0652f63124 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1098,6 +1098,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index 1ef13ee78..0652f6312 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 723a9fa1e..f56fd7c01 100644
+index 723a9fa1ee..f56fd7c012 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 723a9fa1e..f56fd7c01 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 58aa2a9a3..ea245de18 100644
+index 58aa2a9a3e..ea245de18c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2831,8 +2831,9 @@ public abstract class EntityLiving extends Entity {
@@ -140,7 +140,7 @@ index 58aa2a9a3..ea245de18 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 12fbdf65c..091f30727 100644
+index 12fbdf65c5..091f30727f 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/0020-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 93%
rename from patches/server/0020-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch
index e9ff53006..2c476b292 100644
--- a/patches/server/0020-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -1,4 +1,4 @@
-From 1d65387a081f39fa4878f89bb059b6e142e3ad16 Mon Sep 17 00:00:00 2001
+From 79c6e032d882ad999fd65f3eab561f36397bddb6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:53:16 -0500
 Subject: [PATCH] Fix cow rotation when shearing mooshroom
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 53bc31287..bf835aaf9 100644
+index 53bc312870..bf835aaf9a 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -114,7 +114,13 @@ public class EntityMushroomCow extends EntityCow {
diff --git a/patches/server/0021-Pigs-give-saddle-back.patch b/patches/server/0022-Pigs-give-saddle-back.patch
similarity index 97%
rename from patches/server/0021-Pigs-give-saddle-back.patch
rename to patches/server/0022-Pigs-give-saddle-back.patch
index a1b248429..5ec43a204 100644
--- a/patches/server/0021-Pigs-give-saddle-back.patch
+++ b/patches/server/0022-Pigs-give-saddle-back.patch
@@ -1,4 +1,4 @@
-From d27bc15e80c2fa9bb8612938a9fb0746a48aa609 Mon Sep 17 00:00:00 2001
+From 9f40bd20e244a74b5840eff4e216421775c3bf51 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 01:14:46 -0500
 Subject: [PATCH] Pigs give saddle back
diff --git a/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 98%
rename from patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index c0a936d3b..e0162df66 100644
--- a/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From a50f400dcbc7332935e3d8292445bc40191fef76 Mon Sep 17 00:00:00 2001
+From 522d8cbc36b8834ce7c4b5e2cf4192fe37cef25f 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 f7344d3ae..f6c0165f9 100644
+index f7344d3aec..f6c0165f94 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 f7344d3ae..f6c0165f9 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 0652f6312..197953e19 100644
+index 0652f63124..197953e19f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1445,6 +1445,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 0652f6312..197953e19 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 a57d0089d..02952c3af 100644
+index a57d0089d8..02952c3af8 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 a57d0089d..02952c3af 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 777bc95ee..265077048 100644
+index 777bc95eef..2650770489 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 777bc95ee..265077048 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 3bc57ef91..e0d97d2c8 100644
+index 3bc57ef91d..e0d97d2c8b 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,7 +362,7 @@ index 3bc57ef91..e0d97d2c8 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 85692500b..c9b41cebd 100644
+index 85692500b4..c9b41cebd6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -402,6 +402,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0024-Snowman-drop-and-put-back-pumpkin.patch
similarity index 96%
rename from patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0024-Snowman-drop-and-put-back-pumpkin.patch
index bb9fcfc0d..53c6a968b 100644
--- a/patches/server/0023-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0024-Snowman-drop-and-put-back-pumpkin.patch
@@ -1,4 +1,4 @@
-From 0cdfff808b4570fe20e44a30c12880318b2942f6 Mon Sep 17 00:00:00 2001
+From f7ebb12367af42882a2ad9c9cc7e4414197bc40b 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 65d746899..3f6f8ad45 100644
+index 65d7468997..3f6f8ad454 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -47,7 +47,7 @@ index 65d746899..3f6f8ad45 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 c9b41cebd..56b67c408 100644
+index c9b41cebd6..56b67c4082 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -540,11 +540,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0024-Ender-dragon-always-drop-egg.patch b/patches/server/0025-Ender-dragon-always-drop-egg.patch
similarity index 95%
rename from patches/server/0024-Ender-dragon-always-drop-egg.patch
rename to patches/server/0025-Ender-dragon-always-drop-egg.patch
index 3bf3602e4..c4930414c 100644
--- a/patches/server/0024-Ender-dragon-always-drop-egg.patch
+++ b/patches/server/0025-Ender-dragon-always-drop-egg.patch
@@ -1,4 +1,4 @@
-From 902c04b41327f7db8aa12a85bae347e1969e2cf9 Mon Sep 17 00:00:00 2001
+From 5b5cebc495d4db4f7eddd40c578e7d4fa9faf36a 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 687efa022..ead334607 100644
+index 687efa022d..ead3346072 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 687efa022..ead334607 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 56b67c408..cc6f8563b 100644
+index 56b67c4082..cc6f8563b1 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/0025-Ender-dragon-always-drop-full-exp.patch b/patches/server/0026-Ender-dragon-always-drop-full-exp.patch
similarity index 94%
rename from patches/server/0025-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0026-Ender-dragon-always-drop-full-exp.patch
index 0b8efd8e6..0bb18e27e 100644
--- a/patches/server/0025-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0026-Ender-dragon-always-drop-full-exp.patch
@@ -1,4 +1,4 @@
-From ec4c2b7e0bc52fbd36bbe6a011a5dbd0c6149d51 Mon Sep 17 00:00:00 2001
+From 5cfee6aa56787421ed223aad2ebcbf6fd108be63 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 a6a79f5e9..336cf7da2 100644
+index ab1747198a..f06fde3242 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 a6a79f5e9..336cf7da2 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc6f8563b..426e6f18b 100644
+index cc6f8563b1..426e6f18bd 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/0026-Signs-editable-on-right-click.patch b/patches/server/0027-Signs-editable-on-right-click.patch
similarity index 94%
rename from patches/server/0026-Signs-editable-on-right-click.patch
rename to patches/server/0027-Signs-editable-on-right-click.patch
index a8d405392..d7c522855 100644
--- a/patches/server/0026-Signs-editable-on-right-click.patch
+++ b/patches/server/0027-Signs-editable-on-right-click.patch
@@ -1,4 +1,4 @@
-From 4e4a23e39281ccb5cc11de0010520655acabd6ec Mon Sep 17 00:00:00 2001
+From d724d49d366b35c1181dd2fc15e42daade8f1ce6 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 8a31054a1..d20849ce2 100644
+index 8a31054a1d..d20849ce2b 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 8a31054a1..d20849ce2 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 0e9a90b70..099d98e04 100644
+index 0e9a90b70f..099d98e04c 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 0e9a90b70..099d98e04 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 426e6f18b..f098a36b5 100644
+index 426e6f18bd..f098a36b51 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/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 91%
rename from patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index f9fd128f6..1dd0ffdbf 100644
--- a/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -1,4 +1,4 @@
-From a0e02325c7e83ed45be41dee9d2d987e1f25f16d Mon Sep 17 00:00:00 2001
+From be19ef44f61995d316120b8dd763c91cd8a2d56d 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 4bb21c48b..30f16db02 100644
+index 4bb21c48bd..30f16db02c 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/0028-Make-Iron-Golems-Swim.patch b/patches/server/0029-Make-Iron-Golems-Swim.patch
similarity index 93%
rename from patches/server/0028-Make-Iron-Golems-Swim.patch
rename to patches/server/0029-Make-Iron-Golems-Swim.patch
index ed652c427..bbb7a76fc 100644
--- a/patches/server/0028-Make-Iron-Golems-Swim.patch
+++ b/patches/server/0029-Make-Iron-Golems-Swim.patch
@@ -1,4 +1,4 @@
-From 45691659f26a3ab5b01aad9dd042a01f425313c0 Mon Sep 17 00:00:00 2001
+From 7091b58fda2ba308981493e7d38cb0d28e34b871 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 288a043fb..0cc3b8eb0 100644
+index 288a043fbd..0cc3b8eb01 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 288a043fb..0cc3b8eb0 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 f098a36b5..a07781929 100644
+index f098a36b51..a077819292 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/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0030-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 95%
rename from patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0030-Allow-soil-to-moisten-from-water-directly-under-it.patch
index c872690a2..fa6fd2196 100644
--- a/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0030-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -1,4 +1,4 @@
-From 1bfeca54570f6b815f10b6b266761cb8c6a18ccc Mon Sep 17 00:00:00 2001
+From 107b47e289b36fc4e4f9568dbf0958ed0cad3101 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 b6561f2c7..f2ab3ee01 100644
+index b6561f2c79..f2ab3ee011 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 b6561f2c7..f2ab3ee01 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a07781929..e2bda806e 100644
+index a077819292..e2bda806ec 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/0030-Controllable-Minecarts.patch b/patches/server/0031-Controllable-Minecarts.patch
similarity index 97%
rename from patches/server/0030-Controllable-Minecarts.patch
rename to patches/server/0031-Controllable-Minecarts.patch
index f08760876..791571383 100644
--- a/patches/server/0030-Controllable-Minecarts.patch
+++ b/patches/server/0031-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From 0d016d81edb562a793a0c1cf2a1f393e03f9509b Mon Sep 17 00:00:00 2001
+From 22464945049dd22fcd1a5ccf19c4985e6f8d011b 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 197953e19..5d39d86f0 100644
+index 197953e19f..5d39d86f0f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1346,6 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index 197953e19..5d39d86f0 100644
          return this.inLava;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 665bbe07f..1f3e5bd28 100644
+index 665bbe07fa..1f3e5bd288 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -78,7 +78,7 @@ index 665bbe07f..1f3e5bd28 100644
              this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
-index b73e317fb..e1337a9c0 100644
+index b73e317fbb..e1337a9c04 100644
 --- a/src/main/java/net/minecraft/server/ItemMinecart.java
 +++ b/src/main/java/net/minecraft/server/ItemMinecart.java
 @@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -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 e2bda806e..f8992136a 100644
+index e2bda806ec..f8992136a7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,10 +1,16 @@
diff --git a/patches/server/0031-Signs-allow-color-codes.patch b/patches/server/0032-Signs-allow-color-codes.patch
similarity index 97%
rename from patches/server/0031-Signs-allow-color-codes.patch
rename to patches/server/0032-Signs-allow-color-codes.patch
index 8bfc2f793..ce6005d52 100644
--- a/patches/server/0031-Signs-allow-color-codes.patch
+++ b/patches/server/0032-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 12574726d188132c0693a180083ff7b7370b46b8 Mon Sep 17 00:00:00 2001
+From 578bd4ebc2abd908e9f63ef91319e3a816115082 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
@@ -23,7 +23,7 @@ index dbdef3ad96..f0603a575c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b25b3b4816..ee961bc05c 100644
+index d52fbda79f..96161160bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2622,6 +2622,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0032-Campfires-have-regen-effect.patch b/patches/server/0033-Campfires-have-regen-effect.patch
similarity index 97%
rename from patches/server/0032-Campfires-have-regen-effect.patch
rename to patches/server/0033-Campfires-have-regen-effect.patch
index 999baf5dd..18c5f20dd 100644
--- a/patches/server/0032-Campfires-have-regen-effect.patch
+++ b/patches/server/0033-Campfires-have-regen-effect.patch
@@ -1,4 +1,4 @@
-From 3f8e50fb578ffdc4e0d49e38df733f949f090bbc Mon Sep 17 00:00:00 2001
+From d89c8591d4ebe87d0aeadf9a92f5a9ca85a1beba 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
@@ -12,7 +12,7 @@ Subject: [PATCH] Campfires have regen effect
  5 files changed, 92 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index 6303be944..65f8d803b 100644
+index 6303be944c..65f8d803b8 100644
 --- a/src/main/java/net/minecraft/server/BlockCampfire.java
 +++ b/src/main/java/net/minecraft/server/BlockCampfire.java
 @@ -8,7 +8,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -25,7 +25,7 @@ index 6303be944..65f8d803b 100644
      public static final BlockStateDirection e = BlockProperties.N;
      private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ea245de18..10c222ddb 100644
+index ea245de18c..10c222ddb2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2791,10 +2791,19 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index ea245de18..10c222ddb 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
-index b56b021b4..fcc5a5c23 100644
+index b56b021b4c..fcc5a5c234 100644
 --- a/src/main/java/net/minecraft/server/EntityPotion.java
 +++ b/src/main/java/net/minecraft/server/EntityPotion.java
 @@ -92,6 +92,7 @@ public class EntityPotion extends EntityProjectile {
@@ -96,7 +96,7 @@ index b56b021b4..fcc5a5c23 100644
          AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
          List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
 diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
-index a1580b8c6..618ca2d76 100644
+index a1580b8c6d..618ca2d763 100644
 --- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
 +++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
 @@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -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 94744c78b..d8d95d787 100644
+index 94744c78ba..d8d95d787f 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 {
diff --git a/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0034-Disable-loot-drops-on-death-by-cramming.patch
similarity index 95%
rename from patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0034-Disable-loot-drops-on-death-by-cramming.patch
index 1253b7a90..8ae8632c0 100644
--- a/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0034-Disable-loot-drops-on-death-by-cramming.patch
@@ -1,4 +1,4 @@
-From f38570aa3c24eec676986a9ee59d73cf8da88bd1 Mon Sep 17 00:00:00 2001
+From 446502ec75432982c848f4a2e84eb4c7824de048 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 fdc32d986..cf222a9a1 100644
+index 10c222ddb2..21b5bc47d7 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 fdc32d986..cf222a9a1 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 d8d95d787..8c84431e5 100644
+index d8d95d787f..8c84431e59 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/0034-Campfires-burn-out-in-rain.patch b/patches/server/0035-Campfires-burn-out-in-rain.patch
similarity index 96%
rename from patches/server/0034-Campfires-burn-out-in-rain.patch
rename to patches/server/0035-Campfires-burn-out-in-rain.patch
index cfc69f0ee..78e5227da 100644
--- a/patches/server/0034-Campfires-burn-out-in-rain.patch
+++ b/patches/server/0035-Campfires-burn-out-in-rain.patch
@@ -1,4 +1,4 @@
-From fff946598371ecb10e4108eed1ed7273099bae31 Mon Sep 17 00:00:00 2001
+From f8286ee301aafa334f5f547a3b0e2763dbaf79a7 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 8c8dc9d6b..13981967b 100644
+index 8c8dc9d6b8..13981967b3 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -394,7 +394,7 @@ public class Block implements IMaterial {
@@ -23,7 +23,7 @@ index 8c8dc9d6b..13981967b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index 65f8d803b..3b95dfaaa 100644
+index 65f8d803b8..3b95dfaaae 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 65f8d803b..3b95dfaaa 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 8c84431e5..a761b2c73 100644
+index 8c84431e59..a761b2c734 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/0035-Campfires-should-fall-with-gravity.patch b/patches/server/0036-Campfires-should-fall-with-gravity.patch
similarity index 97%
rename from patches/server/0035-Campfires-should-fall-with-gravity.patch
rename to patches/server/0036-Campfires-should-fall-with-gravity.patch
index 13b9e8673..56446726c 100644
--- a/patches/server/0035-Campfires-should-fall-with-gravity.patch
+++ b/patches/server/0036-Campfires-should-fall-with-gravity.patch
@@ -1,4 +1,4 @@
-From 4d2fbaefcc562726397224c34fe477dfb4e0f640 Mon Sep 17 00:00:00 2001
+From 94def13a47b03244a57d1da80c6a9839cd7a9fc3 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 3b95dfaaa..418fa6d1f 100644
+index 3b95dfaaae..418fa6d1fe 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 3b95dfaaa..418fa6d1f 100644
  
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a761b2c73..d6405b2ec 100644
+index a761b2c734..d6405b2ec5 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/0036-Dont-send-useless-entity-packets.patch b/patches/server/0037-Dont-send-useless-entity-packets.patch
similarity index 96%
rename from patches/server/0036-Dont-send-useless-entity-packets.patch
rename to patches/server/0037-Dont-send-useless-entity-packets.patch
index 7e4c00244..cd784092b 100644
--- a/patches/server/0036-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0037-Dont-send-useless-entity-packets.patch
@@ -1,4 +1,4 @@
-From 46c6b61048ea662203af345382ace73735a9e179 Mon Sep 17 00:00:00 2001
+From 041d671573323148c0992ea04a534ffe6beee106 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 5cc89c0cf..390cb8e76 100644
+index 5cc89c0cf9..390cb8e767 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -169,6 +169,7 @@ public class EntityTrackerEntry {
@@ -45,7 +45,7 @@ index 5cc89c0cf..390cb8e76 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 e5da2b19c..5b1d95935 100644
+index e5da2b19c1..5b1d959354 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 e5da2b19c..5b1d95935 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 d6f82d119..d3e1c8c40 100644
+index d6f82d119e..d3e1c8c407 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -139,6 +139,11 @@ public class PurpurConfig {
diff --git a/patches/server/0037-Implement-AFK-API.patch b/patches/server/0038-Implement-AFK-API.patch
similarity index 98%
rename from patches/server/0037-Implement-AFK-API.patch
rename to patches/server/0038-Implement-AFK-API.patch
index 1dfff57a2..3e7f01c77 100644
--- a/patches/server/0037-Implement-AFK-API.patch
+++ b/patches/server/0038-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 8cc701ec2d23eb18135b0914ba8c46d8051444c4 Mon Sep 17 00:00:00 2001
+From 742fb5171cd5cada47c66919b143981cc02598e9 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
@@ -171,7 +171,7 @@ index 1398c47a2f..0bf1a14b7c 100644
      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 ee961bc05c..17b23ed2fb 100644
+index 96161160bb..762aad378c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -250,10 +250,10 @@ index d6405b2ec5..41dd1b8616 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 dcbda5b35a..c144939291 100644
+index bd4d5184b6..7bd271d4c2 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 {
+@@ -2078,4 +2078,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
diff --git a/patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 94%
rename from patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
index 2cbc9e326..101574e67 100644
--- a/patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,4 +1,4 @@
-From cf80360efb42add4ff869ded9a9020bb15078434 Mon Sep 17 00:00:00 2001
+From 28b04ef1fe86e3426ce788782a77877c4ee6e792 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 6b255e09a..e1d3894ab 100644
+index 6b255e09ac..e1d3894ab7 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 6b255e09a..e1d3894ab 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 41dd1b861..7cbb1df7a 100644
+index 41dd1b8616..7cbb1df7ab 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/0039-Mending-mends-most-damages-equipment-first.patch b/patches/server/0040-Mending-mends-most-damages-equipment-first.patch
similarity index 96%
rename from patches/server/0039-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0040-Mending-mends-most-damages-equipment-first.patch
index d1230f2df..d5bda293b 100644
--- a/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0040-Mending-mends-most-damages-equipment-first.patch
@@ -1,4 +1,4 @@
-From 650646daddf4a1af505b0dd966ccc2414b583ffd Mon Sep 17 00:00:00 2001
+From 1a2bf40259378ed601f5aa34a4f834d412ac2e0e 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 d96c03a1a..da1cfc1d3 100644
+index d96c03a1a1..da1cfc1d3f 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 d96c03a1a..da1cfc1d3 100644
      }
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 53c6c3389..0fae3693c 100644
+index 53c6c33892..0fae3693c9 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 53c6c3389..0fae3693c 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 413b888a0..ce6a46685 100644
+index 413b888a04..ce6a466852 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -370,10 +370,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 413b888a0..ce6a46685 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 7cbb1df7a..b76a8c5be 100644
+index 7cbb1df7ab..b76a8c5bee 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/0040-Tulips-change-fox-type.patch b/patches/server/0041-Tulips-change-fox-type.patch
similarity index 96%
rename from patches/server/0040-Tulips-change-fox-type.patch
rename to patches/server/0041-Tulips-change-fox-type.patch
index b1965d4db..62d91c158 100644
--- a/patches/server/0040-Tulips-change-fox-type.patch
+++ b/patches/server/0041-Tulips-change-fox-type.patch
@@ -1,4 +1,4 @@
-From 901aac97fe69e840c4f2008dc91cdeb3fef88da3 Mon Sep 17 00:00:00 2001
+From fe135b5240b7ddecd167e01f167a86b2ee92892e 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 4f53090d3..13afd7bcd 100644
+index 4f53090d3d..13afd7bcde 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 4f53090d3..13afd7bcd 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 54670f64c..9c9b93f28 100644
+index 54670f64cf..9c9b93f280 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 54670f64c..9c9b93f28 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 b76a8c5be..a2fce0c63 100644
+index b76a8c5bee..a2fce0c635 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/0041-Pillager-limits-and-leaders-chance.patch b/patches/server/0042-Pillager-limits-and-leaders-chance.patch
similarity index 96%
rename from patches/server/0041-Pillager-limits-and-leaders-chance.patch
rename to patches/server/0042-Pillager-limits-and-leaders-chance.patch
index a6ace00fa..4f1d9c017 100644
--- a/patches/server/0041-Pillager-limits-and-leaders-chance.patch
+++ b/patches/server/0042-Pillager-limits-and-leaders-chance.patch
@@ -1,4 +1,4 @@
-From 491effa3370a085885f8d7a3032af41df7da454c Mon Sep 17 00:00:00 2001
+From 21c076c767f3a22e0ca03b2f0905eb8c6045920c 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 70f43c515..fa08b8e1a 100644
+index 70f43c5159..fa08b8e1ab 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 70f43c515..fa08b8e1a 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
-index f44334b9e..70559714a 100644
+index f44334b9e1..70559714ac 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,7 +47,7 @@ index f44334b9e..70559714a 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a2fce0c63..299b080c8 100644
+index a2fce0c635..299b080c89 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -525,10 +525,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0042-Make-the-GUI-better.patch b/patches/server/0043-Make-the-GUI-better.patch
similarity index 98%
rename from patches/server/0042-Make-the-GUI-better.patch
rename to patches/server/0043-Make-the-GUI-better.patch
index 78a052c7c..be68b3ae4 100644
--- a/patches/server/0042-Make-the-GUI-better.patch
+++ b/patches/server/0043-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From 045bfdd1709b11fa5befd268f29f18b5187e81eb Mon Sep 17 00:00:00 2001
+From d758a1fb984a3aeab4c5c266153006a8c254028c 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 cf5abd393..73d2b32c5 100644
+index cf5abd393e..73d2b32c5c 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 cf5abd393..73d2b32c5 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 92677b38b..f1266767e 100644
+index d7e29a59de..d9407aedbf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1366,6 +1366,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -101,7 +101,7 @@ index 92677b38b..f1266767e 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 000000000..973b5efef
+index 0000000000..973b5efef5
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 @@ -0,0 +1,123 @@
@@ -230,7 +230,7 @@ index 000000000..973b5efef
 +}
 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 000000000..55feec811
+index 0000000000..55feec811f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
 @@ -0,0 +1,81 @@
@@ -317,7 +317,7 @@ index 000000000..55feec811
 +}
 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 000000000..fb017a070
+index 0000000000..fb017a0708
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
 @@ -0,0 +1,128 @@
@@ -451,7 +451,7 @@ index 000000000..fb017a070
 +}
 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 000000000..4e0b80fdd
+index 0000000000..4e0b80fddb
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
 @@ -0,0 +1,21 @@
@@ -478,7 +478,7 @@ index 000000000..4e0b80fdd
 +}
 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 000000000..c4903c7db
+index 0000000000..c4903c7db6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 @@ -0,0 +1,42 @@
@@ -526,7 +526,7 @@ index 000000000..c4903c7db
 +}
 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 000000000..1e049d575
+index 0000000000..1e049d575b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 @@ -0,0 +1,59 @@
@@ -591,7 +591,7 @@ index 000000000..1e049d575
 +}
 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 000000000..2fdb9bdd0
+index 0000000000..2fdb9bdd0d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
 @@ -0,0 +1,44 @@
@@ -641,7 +641,7 @@ index 000000000..2fdb9bdd0
 +}
 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 000000000..85babad9c
+index 0000000000..85babad9cd
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
 @@ -0,0 +1,47 @@
@@ -694,7 +694,7 @@ index 000000000..85babad9c
 +}
 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 000000000..0c0c73bee
+index 0000000000..0c0c73beeb
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
 @@ -0,0 +1,144 @@
@@ -844,7 +844,7 @@ index 000000000..0c0c73bee
 +}
 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 000000000..17e75a207
+index 0000000000..17e75a2070
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
 @@ -0,0 +1,57 @@
@@ -907,7 +907,7 @@ index 000000000..17e75a207
 +}
 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 000000000..2f02e9adc
+index 0000000000..2f02e9adc7
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
 @@ -0,0 +1,22 @@
@@ -935,7 +935,7 @@ index 000000000..2f02e9adc
 +}
 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 000000000..edbf45416
+index 0000000000..edbf454163
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
 @@ -0,0 +1,47 @@
@@ -988,7 +988,7 @@ index 000000000..edbf45416
 +}
 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 000000000..13a5eb3ad
+index 0000000000..13a5eb3ad3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
 @@ -0,0 +1,32 @@
@@ -1026,7 +1026,7 @@ index 000000000..13a5eb3ad
 +}
 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 000000000..973c8ddf9
+index 0000000000..973c8ddf93
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
 @@ -0,0 +1,54 @@
@@ -1086,7 +1086,7 @@ index 000000000..973c8ddf9
 +}
 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 000000000..4b340b88a
+index 0000000000..4b340b88a2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 @@ -0,0 +1,86 @@
@@ -1177,7 +1177,7 @@ index 000000000..4b340b88a
 +
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a9bb98765..4be7613d0 100644
+index 476f4a5cbe..522048dc9e 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,8 +1,17 @@
diff --git a/patches/server/0043-Players-should-not-cram-to-death.patch b/patches/server/0044-Players-should-not-cram-to-death.patch
similarity index 94%
rename from patches/server/0043-Players-should-not-cram-to-death.patch
rename to patches/server/0044-Players-should-not-cram-to-death.patch
index b40b318f1..0c5dad4a4 100644
--- a/patches/server/0043-Players-should-not-cram-to-death.patch
+++ b/patches/server/0044-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From 6983533f3725df31adc9fce5c7e3adc55485a42e Mon Sep 17 00:00:00 2001
+From 9529db7062205568ba0d4dc05d0dd9fad730bddf 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
diff --git a/patches/server/0044-Add-EntityPortalReadyEvent.patch b/patches/server/0045-Add-EntityPortalReadyEvent.patch
similarity index 99%
rename from patches/server/0044-Add-EntityPortalReadyEvent.patch
rename to patches/server/0045-Add-EntityPortalReadyEvent.patch
index c98fd31e8..6cc1463d1 100644
--- a/patches/server/0044-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0045-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 79234404abf4dff72c9563f80ee54b351978ed62 Mon Sep 17 00:00:00 2001
+From b57d0b74f8cafb178eada55ddc0ea8370bc9da1e 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
diff --git a/patches/server/0045-Implement-elytra-settings.patch b/patches/server/0046-Implement-elytra-settings.patch
similarity index 96%
rename from patches/server/0045-Implement-elytra-settings.patch
rename to patches/server/0046-Implement-elytra-settings.patch
index 508493fe8..7465a38fd 100644
--- a/patches/server/0045-Implement-elytra-settings.patch
+++ b/patches/server/0046-Implement-elytra-settings.patch
@@ -1,4 +1,4 @@
-From b27d4ef147b5bdf0411208613ae3b4a13dc914e2 Mon Sep 17 00:00:00 2001
+From 06d3e2899cea8bb9a7a4143b6acf6afc157e14f3 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 21b5bc47d..c1cc24cf1 100644
+index 21b5bc47d7..c1cc24cf11 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2658,9 +2658,16 @@ public abstract class EntityLiving extends Entity {
@@ -37,7 +37,7 @@ index 21b5bc47d..c1cc24cf1 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 bd524a35b..c0e8cd0cd 100644
+index bd524a35bb..c0e8cd0cdc 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 bd524a35b..c0e8cd0cd 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 ce6a46685..8c3bbef66 100644
+index ce6a466852..8c3bbef666 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -402,7 +402,7 @@ public final class ItemStack {
@@ -82,7 +82,7 @@ index ce6a46685..8c3bbef66 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 f571a1586..c26300eac 100644
+index f571a1586d..c26300eacd 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 f571a1586..c26300eac 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 62a081006..53e7e8268 100644
+index 62a0810062..53e7e82688 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 62a081006..53e7e8268 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 299b080c8..5318a8e32 100644
+index 299b080c89..5318a8e327 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/0046-Add-blacklist-option-for-grindstone.patch b/patches/server/0047-Add-blacklist-option-for-grindstone.patch
similarity index 96%
rename from patches/server/0046-Add-blacklist-option-for-grindstone.patch
rename to patches/server/0047-Add-blacklist-option-for-grindstone.patch
index 9f5867653..44c010fc3 100644
--- a/patches/server/0046-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0047-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From caa81e11598a014df82fe474f0dac6eaad0c4b39 Mon Sep 17 00:00:00 2001
+From d445f4a7df0a26d7805584ac4d5939b178a30062 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 ed88e208d..fcfb4abdc 100644
+index ed88e208d0..fcfb4abdc2 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 ed88e208d..fcfb4abdc 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 8c3bbef66..d5e0578b2 100644
+index 8c3bbef666..d5e0578b25 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -542,6 +542,12 @@ public final class ItemStack {
@@ -68,7 +68,7 @@ index 8c3bbef66..d5e0578b2 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 5318a8e32..9c60855d6 100644
+index 5318a8e327..9c60855d66 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/0047-Implement-lagging-threshold.patch b/patches/server/0048-Implement-lagging-threshold.patch
similarity index 94%
rename from patches/server/0047-Implement-lagging-threshold.patch
rename to patches/server/0048-Implement-lagging-threshold.patch
index 7439bef06..76165f4cb 100644
--- a/patches/server/0047-Implement-lagging-threshold.patch
+++ b/patches/server/0048-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From dec4e338ded47a5c9bbcfbc93899016dea718f4e Mon Sep 17 00:00:00 2001
+From 27637e65736ed89d854c2693de7352528be84b84 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 f1266767e..2b60ecde7 100644
+index d9407aedbf..5baeb156e1 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 f1266767e..2b60ecde7 100644
                      }
                      midTickChunksTasksRan = 0; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d3e1c8c40..ab20fa2fa 100644
+index d3e1c8c407..ab20fa2fae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -139,6 +139,11 @@ public class PurpurConfig {
@@ -46,7 +46,7 @@ index d3e1c8c40..ab20fa2fa 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 64f1190b0..e890a1f81 100644
+index 64f1190b03..e890a1f815 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2286,4 +2286,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0048-Implement-configurable-villager-brain-ticks.patch b/patches/server/0049-Implement-configurable-villager-brain-ticks.patch
similarity index 98%
rename from patches/server/0048-Implement-configurable-villager-brain-ticks.patch
rename to patches/server/0049-Implement-configurable-villager-brain-ticks.patch
index 708e72710..4b485c711 100644
--- a/patches/server/0048-Implement-configurable-villager-brain-ticks.patch
+++ b/patches/server/0049-Implement-configurable-villager-brain-ticks.patch
@@ -1,4 +1,4 @@
-From 074446feb4df94dc7e1a086805c30953ba0e5888 Mon Sep 17 00:00:00 2001
+From c7c80f357a335240d763c8f9a0306e2541d151e3 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
diff --git a/patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0050-Add-option-for-zombies-targetting-turtle-eggs.patch
similarity index 94%
rename from patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch
rename to patches/server/0050-Add-option-for-zombies-targetting-turtle-eggs.patch
index 14a43dd66..264b1b9d6 100644
--- a/patches/server/0049-Add-option-for-zombies-targetting-turtle-eggs.patch
+++ b/patches/server/0050-Add-option-for-zombies-targetting-turtle-eggs.patch
@@ -1,4 +1,4 @@
-From 9fff2923f2cbf3a4d1dc4a5a798fb64955352e1f Mon Sep 17 00:00:00 2001
+From d096e6768ecf1714afac203d91cb4b0609e7ae90 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 8d1f04415..95ae6f349 100644
+index 8d1f04415e..95ae6f3494 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,7 +22,7 @@ index 8d1f04415..95ae6f349 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 f1ed653b3..114cd3f80 100644
+index f1ed653b3a..114cd3f808 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -806,10 +806,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0050-Implement-bamboo-growth-settings.patch b/patches/server/0051-Implement-bamboo-growth-settings.patch
similarity index 97%
rename from patches/server/0050-Implement-bamboo-growth-settings.patch
rename to patches/server/0051-Implement-bamboo-growth-settings.patch
index fd4696528..231d3bcce 100644
--- a/patches/server/0050-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0051-Implement-bamboo-growth-settings.patch
@@ -1,4 +1,4 @@
-From 5b9bc011ab97ef7aa3239b6d6bfc6bf078348768 Mon Sep 17 00:00:00 2001
+From 6653c569a030023fcef774eb65bd80e36c5380fe 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 02c548dd9..016ceebb9 100644
+index 02c548dd9c..016ceebb9d 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 02c548dd9..016ceebb9 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 114cd3f80..61c19661c 100644
+index 114cd3f808..61c19661c3 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/0051-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0052-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 95%
rename from patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0052-Climbing-should-not-bypass-cramming-gamerule.patch
index f05d46b18..21e6a2d38 100644
--- a/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0052-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 7692271288d67f40ec95da714f6d6b33fa4da4b2 Mon Sep 17 00:00:00 2001
+From 1f7d701d09511913123d84fabb0e93c65b92352c 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 39bd34ab3..ce0821a65 100644
+index 39bd34ab34..ce0821a656 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1573,6 +1573,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +34,7 @@ index 39bd34ab3..ce0821a65 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index d35a0b2d9..d4aa9b24f 100644
+index d35a0b2d94..d4aa9b24f7 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 {
@@ -47,7 +47,7 @@ index d35a0b2d9..d4aa9b24f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 592408bac..7a740f676 100644
+index 592408bac9..7a740f6768 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -85,7 +85,7 @@ public class EntityBat extends EntityAmbient {
@@ -60,7 +60,7 @@ index 592408bac..7a740f676 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index fdf306e80..563fc8ced 100644
+index fdf306e80a..563fc8ced0 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -73,7 +73,7 @@ index fdf306e80..563fc8ced 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index f31cb0554..0ecdea671 100644
+index f31cb05542..0ecdea6710 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -181,7 +181,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -86,7 +86,7 @@ index f31cb0554..0ecdea671 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c1cc24cf1..0f8ba92a8 100644
+index c1cc24cf11..0f8ba92a84 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2692,7 +2692,7 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index c1cc24cf1..0f8ba92a8 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 1f3e5bd28..ae4758f25 100644
+index 1f3e5bd288..ae4758f251 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -105,7 +105,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -125,7 +125,7 @@ index 1f3e5bd28..ae4758f25 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 7ba2f3a35..dd2cd7b21 100644
+index 7ba2f3a351..dd2cd7b219 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -392,7 +392,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -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 0bf1a14b7..9f5860ca8 100644
+index 0bf1a14b7c..9f5860ca8b 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 0bf1a14b7..9f5860ca8 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 61c19661c..1a2512b52 100644
+index 61c19661c3..1a2512b528 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 {
diff --git a/patches/server/0052-Option-for-slimes-not-pushable.patch b/patches/server/0053-Option-for-slimes-not-pushable.patch
similarity index 94%
rename from patches/server/0052-Option-for-slimes-not-pushable.patch
rename to patches/server/0053-Option-for-slimes-not-pushable.patch
index 94d977cec..e37b015df 100644
--- a/patches/server/0052-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0053-Option-for-slimes-not-pushable.patch
@@ -1,4 +1,4 @@
-From cf638798f15948a19cdb28890f59418cd3234fa3 Mon Sep 17 00:00:00 2001
+From 1897ed89852ab0037f27f345b3f908c8cfff0e3d 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 b29525c40..1e72b3bbc 100644
+index b29525c40d..1e72b3bbc5 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 b29525c40..1e72b3bbc 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 01f32659d..52ab86f0b 100644
+index 01f32659d9..52ab86f0b1 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 01f32659d..52ab86f0b 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ab20fa2fa..72ad9dce7 100644
+index ab20fa2fae..72ad9dce7d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -149,6 +149,11 @@ public class PurpurConfig {
diff --git a/patches/server/0053-Bring-back-server-name.patch b/patches/server/0054-Bring-back-server-name.patch
similarity index 93%
rename from patches/server/0053-Bring-back-server-name.patch
rename to patches/server/0054-Bring-back-server-name.patch
index 1f4d836d0..16794a4a0 100644
--- a/patches/server/0053-Bring-back-server-name.patch
+++ b/patches/server/0054-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From c26c5993da3fb17e8d5cdb2335d45e8cabcb0363 Mon Sep 17 00:00:00 2001
+From e82128bc8f0e4381e117ea7d5546b7afd661791c 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 0c3ec8357..309f5562b 100644
+index 0c3ec83570..309f5562b8 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 0c3ec8357..309f5562b 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 e890a1f81..b488d1848 100644
+index e890a1f815..b488d18486 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2288,6 +2288,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0054-Dispenser-curse-of-binding-protection.patch b/patches/server/0055-Dispenser-curse-of-binding-protection.patch
similarity index 94%
rename from patches/server/0054-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0055-Dispenser-curse-of-binding-protection.patch
index 055911999..631342d05 100644
--- a/patches/server/0054-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0055-Dispenser-curse-of-binding-protection.patch
@@ -1,4 +1,4 @@
-From ab6859b1dd1b906b4c268ae29f01824618083f52 Mon Sep 17 00:00:00 2001
+From 3ba680a8a7fb7db101ca8b54a7e26eff2193d0f5 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 a35459d09..84f208b8c 100644
+index fbca429090..bf9d044b0b 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 a35459d09..84f208b8c 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 df8c42bfb..a4b3d0c29 100644
+index df8c42bfbd..a4b3d0c298 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 df8c42bfb..a4b3d0c29 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 1a2512b52..b8754ba2d 100644
+index 1a2512b528..b8754ba2d2 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/0055-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0056-Implement-LivingEntity-safeFallDistance.patch
similarity index 94%
rename from patches/server/0055-Implement-LivingEntity-safeFallDistance.patch
rename to patches/server/0056-Implement-LivingEntity-safeFallDistance.patch
index 9d6f40334..d0182c30b 100644
--- a/patches/server/0055-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0056-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From 30b16e3582f794fd004dc65a83a91cef2951cc93 Mon Sep 17 00:00:00 2001
+From 5b5ba5db23982d2d32640b026f8e837318a7a5fd 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 4296aaa07..a2e3e6001 100644
+index 4296aaa074..a2e3e60012 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 4296aaa07..a2e3e6001 100644
  
      // Purpur start
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 0ecdea671..e099ef9a0 100644
+index 0ecdea6710..e099ef9a06 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -222,7 +222,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -38,7 +38,7 @@ index 0ecdea671..e099ef9a0 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 0f8ba92a8..d6751e3cc 100644
+index 0f8ba92a84..d6751e3cce 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 0f8ba92a8..d6751e3cc 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 245bd116d..4c16f96ab 100644
+index a461ac3614..4874c2242f 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/0056-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 94%
rename from patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
index f427f963c..7b5ea3dc4 100644
--- a/patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,4 +1,4 @@
-From 03c1819b749fc733b4a3a502286e33037187f2b8 Mon Sep 17 00:00:00 2001
+From 160daef535fc94a099255c2f409c92028bcee7e7 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 563fc8ced..479ed7c7b 100644
+index 563fc8ced0..479ed7c7bc 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 563fc8ced..479ed7c7b 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 b8754ba2d..2271d13f1 100644
+index b8754ba2d2..2271d13f11 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/0057-Advancement-API-Additions.patch b/patches/server/0058-Advancement-API-Additions.patch
similarity index 96%
rename from patches/server/0057-Advancement-API-Additions.patch
rename to patches/server/0058-Advancement-API-Additions.patch
index 1c7ef8f8d..5c37137bc 100644
--- a/patches/server/0057-Advancement-API-Additions.patch
+++ b/patches/server/0058-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From d62e303f4790eeb5bed000ee1149ffbd093642bc Mon Sep 17 00:00:00 2001
+From a85e45062879867543939848629375d400158d31 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 4b85551fa..4cba4187a 100644
+index 4b85551faf..4cba4187a0 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 4b85551fa..4cba4187a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
-index e8172d56f..976c85ef1 100644
+index e8172d56fe..976c85ef1b 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 e8172d56f..976c85ef1 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 a9c49a434..551a84547 100644
+index a9c49a4348..551a845476 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 a9c49a434..551a84547 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 4fe732447..6e5d81daf 100644
+index 4fe7324475..6e5d81daf1 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 4fe732447..6e5d81daf 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 a5aadf285..b0a7092d6 100644
+index a5aadf2850..b0a7092d62 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 a5aadf285..b0a7092d6 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 000000000..1cbb1e67b
+index 0000000000..1cbb1e67b6
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 @@ -0,0 +1,47 @@
diff --git a/patches/server/0058-Add-option-to-set-armorstand-step-height.patch b/patches/server/0059-Add-option-to-set-armorstand-step-height.patch
similarity index 95%
rename from patches/server/0058-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0059-Add-option-to-set-armorstand-step-height.patch
index 80457d7af..c954d20ea 100644
--- a/patches/server/0058-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0059-Add-option-to-set-armorstand-step-height.patch
@@ -1,4 +1,4 @@
-From 97d8a3bb6a940699fdd07db6c75d5ac8d6122f03 Mon Sep 17 00:00:00 2001
+From 2566c488642ec8177cda2802bc760f30dccdaa37 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 d4aa9b24f..d65544953 100644
+index d4aa9b24f7..d655449534 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 d4aa9b24f..d65544953 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 2271d13f1..4bb5ddea4 100644
+index 2271d13f11..4bb5ddea44 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/0059-Implement-ItemFactory-getMonsterEgg.patch b/patches/server/0060-Implement-ItemFactory-getMonsterEgg.patch
similarity index 94%
rename from patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/server/0060-Implement-ItemFactory-getMonsterEgg.patch
index dadc0f499..e197043e8 100644
--- a/patches/server/0059-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0060-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From c647a91f3e4077945915c9be571fa76205454887 Mon Sep 17 00:00:00 2001
+From 271dc5e77dee7646380eb8b909e5570731ba83cf 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 24af4c11d..8ef2c3223 100644
+index 24af4c11d6..8ef2c32236 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 24af4c11d..8ef2c3223 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 23d775645..29161032c 100644
+index 23d7756456..29161032c3 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/0060-Alternative-Keepalive-Handling.patch b/patches/server/0061-Alternative-Keepalive-Handling.patch
similarity index 96%
rename from patches/server/0060-Alternative-Keepalive-Handling.patch
rename to patches/server/0061-Alternative-Keepalive-Handling.patch
index 038a53305..a1e9e1a95 100644
--- a/patches/server/0060-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0061-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From f9d2d62f4fe967fa09e9a03798c4cf3d53a9cb53 Mon Sep 17 00:00:00 2001
+From 0f59e2f777292ba288e3488eae06324d7e5159c7 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 8e93f1540..470f92c4f 100644
+index 8e93f1540b..470f92c4fb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 17b23ed2f..d3b4f0bea 100644
+index 762aad378c..0cd012dfc3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,7 +74,7 @@ index 17b23ed2f..d3b4f0bea 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 72ad9dce7..ed2a31277 100644
+index 72ad9dce7d..ed2a312773 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -144,6 +144,11 @@ public class PurpurConfig {
diff --git a/patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 95%
rename from patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index 8c1735dbb..87357edf1 100644
--- a/patches/server/0061-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From a5d30ae75a2e55a3450e8a09537268ea07b479b6 Mon Sep 17 00:00:00 2001
+From f7c3b76fd6493e7e4105d8a3da92f101f60c0187 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 8ef2c3223..237fdeda5 100644
+index 8ef2c32236..237fdeda5c 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/0062-Add-moon-phase-API.patch b/patches/server/0063-Add-moon-phase-API.patch
similarity index 91%
rename from patches/server/0062-Add-moon-phase-API.patch
rename to patches/server/0063-Add-moon-phase-API.patch
index cce87612b..ee409efcf 100644
--- a/patches/server/0062-Add-moon-phase-API.patch
+++ b/patches/server/0063-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From 634656de202a96a0b4004e5a7820b014b315641c Mon Sep 17 00:00:00 2001
+From b3b4d02dc668165685959f67e420b92033d8b438 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 7230ddbf6..2c2176919 100644
+index d3c5b7d190..66f3e9393e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2462,6 +2462,14 @@ public class CraftWorld implements World {
diff --git a/patches/server/0063-Add-getPlacementBlockData-to-World.patch b/patches/server/0064-Add-getPlacementBlockData-to-World.patch
similarity index 95%
rename from patches/server/0063-Add-getPlacementBlockData-to-World.patch
rename to patches/server/0064-Add-getPlacementBlockData-to-World.patch
index 928ef4018..d5f2866f0 100644
--- a/patches/server/0063-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0064-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From dc561d5d0f39071ea710f243bfe8581ebb71de5d Mon Sep 17 00:00:00 2001
+From e566feaf03a63249eef301206503eaf5a3226a17 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 69d04f6cb..901d45f28 100644
+index 69d04f6cbf..901d45f284 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 69d04f6cb..901d45f28 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 000000000..7dc68ffe9
+index 0000000000..7dc68ffe92
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -53,7 +53,7 @@ index 000000000..7dc68ffe9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 9c9b93f28..74a722cce 100644
+index 9c9b93f280..74a722cce5 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 9c9b93f28..74a722cce 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 2c2176919..1524d0ed2 100644
+index 66f3e9393e..414fc4baf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2468,6 +2468,11 @@ public class CraftWorld implements World {
diff --git a/patches/server/0064-Barrels-have-6-rows.patch b/patches/server/0065-Barrels-have-6-rows.patch
similarity index 95%
rename from patches/server/0064-Barrels-have-6-rows.patch
rename to patches/server/0065-Barrels-have-6-rows.patch
index 2e9e77c55..239068bb8 100644
--- a/patches/server/0064-Barrels-have-6-rows.patch
+++ b/patches/server/0065-Barrels-have-6-rows.patch
@@ -1,4 +1,4 @@
-From ab494bc1eda2af20f615c0834599d80c855c7cc2 Mon Sep 17 00:00:00 2001
+From d699dd8a2b720e6e0347e104b319cf7d071e6277 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 1e27abbea..ca3b6c9aa 100644
+index 1e27abbea0..ca3b6c9aae 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 1e27abbea..ca3b6c9aa 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ed2a31277..581e8eebe 100644
+index ed2a312773..581e8eebe7 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 ed2a31277..581e8eebe 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 454ec3c76..d295821c5 100644
+index 454ec3c76e..d295821c57 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/0065-Enderchest-6-rows-plus-permissions.patch b/patches/server/0066-Enderchest-6-rows-plus-permissions.patch
similarity index 96%
rename from patches/server/0065-Enderchest-6-rows-plus-permissions.patch
rename to patches/server/0066-Enderchest-6-rows-plus-permissions.patch
index 80ec992c4..a3db427ed 100644
--- a/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
+++ b/patches/server/0066-Enderchest-6-rows-plus-permissions.patch
@@ -1,4 +1,4 @@
-From 483872160dc3cbc799420a8c1db32ef5e4bbe143 Mon Sep 17 00:00:00 2001
+From c40ba4d5095176ca9829df4cb2fd01b230253093 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 0a892a5f1..e7ef571dc 100644
+index 0a892a5f1a..e7ef571dc5 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 0a892a5f1..e7ef571dc 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 fd31b9a6d..903c02e9e 100644
+index fd31b9a6dc..903c02e9ef 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 fd31b9a6d..903c02e9e 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 581e8eebe..c3ecd6fc7 100644
+index 581e8eebe7..c3ecd6fc70 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -157,14 +157,22 @@ public class PurpurConfig {
@@ -85,7 +85,7 @@ index 581e8eebe..c3ecd6fc7 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index d295821c5..610cbbe85 100644
+index d295821c57..610cbbe858 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 d295821c5..610cbbe85 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 47827fbf1..0f5819a40 100644
+index 47827fbf1b..0f5819a409 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 47827fbf1..0f5819a40 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 a4a809f30..e7d19d67c 100644
+index a4a809f302..e7d19d67c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 @@ -18,6 +18,14 @@ public final class CraftDefaultPermissions {
diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0067-Add-5-second-tps-average-in-tps.patch
similarity index 96%
rename from patches/server/0066-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0067-Add-5-second-tps-average-in-tps.patch
index 9d5ba0c16..00010a2b6 100644
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0067-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From 6ef5ae3357460132d80230bb96c2457ac9f65e0e Mon Sep 17 00:00:00 2001
+From c683613085a34fe526901d81be374b0404f56f3a 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 2b60ecde7..378fd60db 100644
+index 5baeb156e1..426cde31a1 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 2b60ecde7..378fd60db 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 b488d1848..b2db22413 100644
+index b488d18486..b2db22413e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2092,6 +2092,7 @@ public final class CraftServer implements Server {
@@ -64,7 +64,7 @@ index b488d1848..b2db22413 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 387af9d5c..650f74ba3 100644
+index 387af9d5c0..650f74ba3e 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/0067-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0068-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 90%
rename from patches/server/0067-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0068-Add-playPickupItemAnimation-to-LivingEntity.patch
index 43eb58347..bc9f2e205 100644
--- a/patches/server/0067-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0068-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 2752e497629793d493d817e168f6a3d3b7bb3146 Mon Sep 17 00:00:00 2001
+From 3485939d0379b4d6a547046d14e2fa817b8286f6 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 3dd0faea7..48f66b0c1 100644
+index 4874c2242f..d8207b3221 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/0068-Add-more-evoker-API.patch b/patches/server/0069-Add-more-evoker-API.patch
similarity index 94%
rename from patches/server/0068-Add-more-evoker-API.patch
rename to patches/server/0069-Add-more-evoker-API.patch
index a666bcdf6..e33640948 100644
--- a/patches/server/0068-Add-more-evoker-API.patch
+++ b/patches/server/0069-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From 158909227dd0d495ece2f61db7adb8a4b16bee65 Mon Sep 17 00:00:00 2001
+From f1e55c375cfbb848f5c9c28fee325ef31fdc88cc 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 179a26129..e7d0d0f5e 100644
+index 179a261296..e7d0d0f5e3 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 179a26129..e7d0d0f5e 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-index 0636d2647..4ccb93890 100644
+index 0636d26473..4ccb938909 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/0069-Add-API-for-Villager-resetOffers.patch b/patches/server/0070-Add-API-for-Villager-resetOffers.patch
similarity index 96%
rename from patches/server/0069-Add-API-for-Villager-resetOffers.patch
rename to patches/server/0070-Add-API-for-Villager-resetOffers.patch
index 8fb9cc2b6..59e773567 100644
--- a/patches/server/0069-Add-API-for-Villager-resetOffers.patch
+++ b/patches/server/0070-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From f6990233d70e6ac2e007d5428f08015f30dee685 Mon Sep 17 00:00:00 2001
+From 3186ae96aa6c7d86c23f409de90bdcd99030f179 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()
diff --git a/patches/server/0070-Add-more-llama-API.patch b/patches/server/0071-Add-more-llama-API.patch
similarity index 97%
rename from patches/server/0070-Add-more-llama-API.patch
rename to patches/server/0071-Add-more-llama-API.patch
index 7d8b6330e..0f83499ee 100644
--- a/patches/server/0070-Add-more-llama-API.patch
+++ b/patches/server/0071-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From 1aec2aadfca3245b44957a3484e6d1343a17c2f6 Mon Sep 17 00:00:00 2001
+From e73d8edd323159d1d7d36b0ea0b512ed93f86d42 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 c5f87cbdd..082aac258 100644
+index c5f87cbdd2..082aac258e 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 c5f87cbdd..082aac258 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index e181d8350..8376f1dc4 100644
+index e181d83505..8376f1dc4e 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 e181d8350..8376f1dc4 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 3f94c5a92..a02763480 100644
+index 3f94c5a920..a027634801 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/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0072-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
similarity index 93%
rename from patches/server/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
rename to patches/server/0072-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
index 7b0167e87..94ad8f279 100644
--- a/patches/server/0071-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
+++ b/patches/server/0072-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
@@ -1,4 +1,4 @@
-From 2f6624651e9da6e2678422f7d7e2b1f9488182dc Mon Sep 17 00:00:00 2001
+From 15ac10c2b91503b47285be76744115eff2e5e5ca 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 d5432bfeb..91ef7ac60 100644
+index d5432bfeb7..91ef7ac60f 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/0072-Implement-infinite-lava.patch b/patches/server/0073-Implement-infinite-lava.patch
similarity index 94%
rename from patches/server/0072-Implement-infinite-lava.patch
rename to patches/server/0073-Implement-infinite-lava.patch
index 9033b1a5a..64c6d1124 100644
--- a/patches/server/0072-Implement-infinite-lava.patch
+++ b/patches/server/0073-Implement-infinite-lava.patch
@@ -1,4 +1,4 @@
-From c5f0bfa6ad647ce02b358ec73c626c7764cc31f9 Mon Sep 17 00:00:00 2001
+From 4332d7e3f964bec57c37c29485fc30c5c8e27972 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 376dca188..1a14fe4a2 100644
+index 376dca1889..1a14fe4a24 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 376dca188..1a14fe4a2 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 d25368d03..09f82c2d9 100644
+index d25368d032..09f82c2d92 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 d25368d03..09f82c2d9 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 9eba9a12c..39252e687 100644
+index 9eba9a12c0..39252e6873 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 9eba9a12c..39252e687 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 4bb5ddea4..5b042a609 100644
+index 4bb5ddea44..5b042a6098 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/0073-Expose-getItemStack-for-Trident.patch b/patches/server/0074-Expose-getItemStack-for-Trident.patch
similarity index 91%
rename from patches/server/0073-Expose-getItemStack-for-Trident.patch
rename to patches/server/0074-Expose-getItemStack-for-Trident.patch
index 00e0dd9ce..83310e96c 100644
--- a/patches/server/0073-Expose-getItemStack-for-Trident.patch
+++ b/patches/server/0074-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From fb44db28da16cad32d682bea2cf5f862d2b97c14 Mon Sep 17 00:00:00 2001
+From 1aa60ccb54ba04884e1d3f0a1f911049e79be5eb 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 59bb039ad..ed8e26aa4 100644
+index 59bb039ad7..ed8e26aa45 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 59bb039ad..ed8e26aa4 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index 0518e6c68..63287a9b6 100644
+index 0518e6c683..63287a9b65 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/0074-Despawn-egg-hatches-chicken.patch b/patches/server/0075-Despawn-egg-hatches-chicken.patch
similarity index 95%
rename from patches/server/0074-Despawn-egg-hatches-chicken.patch
rename to patches/server/0075-Despawn-egg-hatches-chicken.patch
index 0b2cb8db5..ba1f08703 100644
--- a/patches/server/0074-Despawn-egg-hatches-chicken.patch
+++ b/patches/server/0075-Despawn-egg-hatches-chicken.patch
@@ -1,4 +1,4 @@
-From 7c95ef89786835589980d6a568dadcc9157a710c Mon Sep 17 00:00:00 2001
+From afadc70dec5429c8b819d659687f20feb6bc0f6c 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 2926fbb95..bbb9ca1ef 100644
+index 2926fbb957..bbb9ca1efc 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 2926fbb95..bbb9ca1ef 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 5b042a609..647bece31 100644
+index 5b042a6098..647bece31f 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/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index d5a7f32ef..d523d0b16 100644
--- a/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From 6704cc0493c13354f0705204c67d2ba951253d6b Mon Sep 17 00:00:00 2001
+From e1db66a264e8af597da193a69805291c90b56df5 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 c3a862fea..ed7b85dc2 100644
+index d2fac7f296..838fc97843 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1437,8 +1437,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -25,7 +25,7 @@ index c3a862fea..ed7b85dc2 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 414fc4baf..e54cff571 100644
+index 414fc4baf9..e54cff571c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -384,12 +384,16 @@ public class CraftWorld implements World {
diff --git a/patches/server/0076-Add-sleep-options.patch b/patches/server/0077-Add-sleep-options.patch
similarity index 96%
rename from patches/server/0076-Add-sleep-options.patch
rename to patches/server/0077-Add-sleep-options.patch
index 91327c606..283a0b33a 100644
--- a/patches/server/0076-Add-sleep-options.patch
+++ b/patches/server/0077-Add-sleep-options.patch
@@ -1,4 +1,4 @@
-From 79f43a500717fdc8e061212aff96adaaf6f543a8 Mon Sep 17 00:00:00 2001
+From 19d0ab926c3370693cc732613d287e0160eac56e 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 d62174e9c..22e17e3de 100644
+index d62174e9c7..22e17e3de3 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 d62174e9c..22e17e3de 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 647bece31..08fb0bae3 100644
+index 647bece31f..08fb0bae3a 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/0077-Option-for-hay-block-fall-damage.patch b/patches/server/0078-Option-for-hay-block-fall-damage.patch
similarity index 91%
rename from patches/server/0077-Option-for-hay-block-fall-damage.patch
rename to patches/server/0078-Option-for-hay-block-fall-damage.patch
index a450a49d6..b78977638 100644
--- a/patches/server/0077-Option-for-hay-block-fall-damage.patch
+++ b/patches/server/0078-Option-for-hay-block-fall-damage.patch
@@ -1,4 +1,4 @@
-From a6f7c9e48a65b0bee86ae28043c625c52ffd5975 Mon Sep 17 00:00:00 2001
+From 23fe49e9e75d1c3ba6d60df0a81f1cc5d363f25e 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 ca81c49f0..1f8f60542 100644
+index ca81c49f0a..1f8f60542f 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 ca81c49f0..1f8f60542 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 08fb0bae3..a4a09874f 100644
+index 08fb0bae3a..a4a09874fe 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/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 95%
rename from patches/server/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index 37346df1e..64d47db43 100644
--- a/patches/server/0078-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From 5bcccabbaed8c0dad6d1540355a1671c84857868 Mon Sep 17 00:00:00 2001
+From 299391072b30918e1560767e8bbdc5e6746e6b10 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 37626f925..f8fd2d99c 100644
+index 37626f925f..f8fd2d99cc 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/0079-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0080-Add-LootableInventoryFirstFillEvent.patch
similarity index 94%
rename from patches/server/0079-Add-LootableInventoryFirstFillEvent.patch
rename to patches/server/0080-Add-LootableInventoryFirstFillEvent.patch
index 45026a6e9..2d8470610 100644
--- a/patches/server/0079-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/server/0080-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From 777ed70875da2cdd96612f950004769d586d1271 Mon Sep 17 00:00:00 2001
+From 2430d722450bbd7540f860b986524d670f9b0c49 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 b5401eaf9..1decf0e89 100644
+index b5401eaf97..1decf0e895 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 b5401eaf9..1decf0e89 100644
          }
  
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index d50410532..2f24e5a70 100644
+index d50410532c..2f24e5a702 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/0080-Villagers-follow-emerald-blocks.patch b/patches/server/0081-Villagers-follow-emerald-blocks.patch
similarity index 95%
rename from patches/server/0080-Villagers-follow-emerald-blocks.patch
rename to patches/server/0081-Villagers-follow-emerald-blocks.patch
index a2e30e67f..0dac60850 100644
--- a/patches/server/0080-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0081-Villagers-follow-emerald-blocks.patch
@@ -1,4 +1,4 @@
-From 0f4f4180db3ff70afccd1610aa4de88a2fbd9aaa Mon Sep 17 00:00:00 2001
+From a25b27dda3e668cb6ff10b7c2e50040951413170 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 65cd5f53c..b31f614e6 100644
+index 843f22260b..a30ac7cc0b 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 65cd5f53c..b31f614e6 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index ddd19aa2f..44947be83 100644
+index 5fbd13512f..13063f0068 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 ddd19aa2f..44947be83 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 4e9c5e84a..14ca5fc36 100644
+index 4e9c5e84a9..14ca5fc367 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,7 +48,7 @@ index 4e9c5e84a..14ca5fc36 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 a4a09874f..7d2c51a2f 100644
+index a4a09874fe..7d2c51a2fa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -775,21 +775,25 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0081-Add-player-death-exp-control-options.patch b/patches/server/0082-Add-player-death-exp-control-options.patch
similarity index 96%
rename from patches/server/0081-Add-player-death-exp-control-options.patch
rename to patches/server/0082-Add-player-death-exp-control-options.patch
index 3a3f3c0ba..af3d80243 100644
--- a/patches/server/0081-Add-player-death-exp-control-options.patch
+++ b/patches/server/0082-Add-player-death-exp-control-options.patch
@@ -1,4 +1,4 @@
-From add580a44ba97074cfef1eab62e1175a452beea2 Mon Sep 17 00:00:00 2001
+From 3cf910339695f40b5ed42563f9c8686edbe777f3 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 22e17e3de..14b57d678 100644
+index 22e17e3de3..14b57d678e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,7 +35,7 @@ index 22e17e3de..14b57d678 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d2c51a2f..caf7f0e84 100644
+index 7d2c51a2fa..caf7f0e84f 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/0082-Add-permission-for-F3-N-debug.patch b/patches/server/0083-Add-permission-for-F3-N-debug.patch
similarity index 89%
rename from patches/server/0082-Add-permission-for-F3-N-debug.patch
rename to patches/server/0083-Add-permission-for-F3-N-debug.patch
index 8619e373f..1efe3bf0f 100644
--- a/patches/server/0082-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0083-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From 45fcb3a76ce633365bb5974a8486d1e3f2bd6007 Mon Sep 17 00:00:00 2001
+From 49434b74bc69f64d58278a2a18b33ecfd3c78e87 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 9b726de6d..60f3df16e 100644
+index 7bb46cc7c6..55cda3dd66 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -976,6 +976,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0083-Allow-leashing-villagers.patch b/patches/server/0084-Allow-leashing-villagers.patch
similarity index 98%
rename from patches/server/0083-Allow-leashing-villagers.patch
rename to patches/server/0084-Allow-leashing-villagers.patch
index 3f60ab739..2f322c406 100644
--- a/patches/server/0083-Allow-leashing-villagers.patch
+++ b/patches/server/0084-Allow-leashing-villagers.patch
@@ -1,4 +1,4 @@
-From 14aebd18444a594133cc91ef49ff872e8134bcc4 Mon Sep 17 00:00:00 2001
+From db97b9b5b03450f6ab223ddd1db35fc85bdcf914 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
diff --git a/patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 97%
rename from patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch
index 15ae64e15..28c5719cf 100644
--- a/patches/server/0084-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch
@@ -1,4 +1,4 @@
-From ca8de54be4a0841046f39331f7195585f3182389 Mon Sep 17 00:00:00 2001
+From 0ed0c2c3d8c57f8dbba946096e73323155c4292e 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
diff --git a/patches/server/0085-Make-lava-flow-speed-configurable.patch b/patches/server/0086-Make-lava-flow-speed-configurable.patch
similarity index 93%
rename from patches/server/0085-Make-lava-flow-speed-configurable.patch
rename to patches/server/0086-Make-lava-flow-speed-configurable.patch
index debea11cc..2bf918906 100644
--- a/patches/server/0085-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0086-Make-lava-flow-speed-configurable.patch
@@ -1,4 +1,4 @@
-From bb5eee99341679c5a44a93551162e96258b1ca54 Mon Sep 17 00:00:00 2001
+From cd754245bf6eccc824291a97f9db8386851c3541 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 09f82c2d9..470e9bfd0 100644
+index 09f82c2d92..470e9bfd01 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 09f82c2d9..470e9bfd0 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 39252e687..75f8441ab 100644
+index 39252e6873..75f8441ab6 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 39252e687..75f8441ab 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 f60c4b629..c238607ac 100644
+index f60c4b6291..c238607acb 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/0086-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 94%
rename from patches/server/0086-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch
index c5e7d8b7b..220e7cf6c 100644
--- a/patches/server/0086-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,4 +1,4 @@
-From 5034a283a01628e4258f61e294d1b10ff5d28d43 Mon Sep 17 00:00:00 2001
+From 687abc1b1ff8e4e40a4e2c3fed099e302b081e4f 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 8aa0a6699..0fd740e71 100644
+index 8aa0a6699f..0fd740e717 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,7 +21,7 @@ index 8aa0a6699..0fd740e71 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c238607ac..d4b4dfdd3 100644
+index c238607acb..d4b4dfdd3b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -844,10 +844,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0087-UPnP-Port-Forwarding-Service.patch b/patches/server/0088-UPnP-Port-Forwarding-Service.patch
similarity index 96%
rename from patches/server/0087-UPnP-Port-Forwarding-Service.patch
rename to patches/server/0088-UPnP-Port-Forwarding-Service.patch
index e9769d14f..f6f2aa016 100644
--- a/patches/server/0087-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0088-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From 3fbe26f37974416a29492fdb5d055a87e68eec9c Mon Sep 17 00:00:00 2001
+From 8f6c7225516af03ef09c572bb0476341939dd523 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 d5709e670..43d6bed36 100644
+index d5709e670b..43d6bed366 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,12 @@
@@ -42,7 +42,7 @@ index d5709e670..43d6bed36 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 73d2b32c5..a522ed5c3 100644
+index 73d2b32c5c..a522ed5c36 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 73d2b32c5..a522ed5c3 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 303778dcd..03dc148ad 100644
+index 426cde31a1..50922dd367 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 303778dcd..03dc148ad 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 c3ecd6fc7..fe38b3ce9 100644
+index c3ecd6fc70..fe38b3ce90 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -150,6 +150,11 @@ public class PurpurConfig {
@@ -122,7 +122,7 @@ index c3ecd6fc7..fe38b3ce9 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 c4903c7db..ee4f022fc 100644
+index c4903c7db6..ee4f022fc5 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 c4903c7db..ee4f022fc 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 000000000..b0465d360
+index 0000000000..b0465d3608
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 @@ -0,0 +1,47 @@
diff --git a/patches/server/0088-Implement-EntityMoveEvent.patch b/patches/server/0089-Implement-EntityMoveEvent.patch
similarity index 94%
rename from patches/server/0088-Implement-EntityMoveEvent.patch
rename to patches/server/0089-Implement-EntityMoveEvent.patch
index d18c664d8..9dd2795cf 100644
--- a/patches/server/0088-Implement-EntityMoveEvent.patch
+++ b/patches/server/0089-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From 301bd8817bb0f8d018ec49bba53191ed155acd56 Mon Sep 17 00:00:00 2001
+From c19f79eec707f8dbbb3676acf82506efceba0b9d 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 d6751e3cc..08ae190b0 100644
+index d6751e3cce..08ae190b07 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/0089-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 95%
rename from patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch
index 4e50408e8..d93bf6ea7 100644
--- a/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 91ce35606f22d364618692367be15758f0b27e56 Mon Sep 17 00:00:00 2001
+From 028b721bbfb72653155b305072cc5a9a08c77d67 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
@@ -15,7 +15,7 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
  8 files changed, 58 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 1685237df..a8c0f9216 100644
+index 1685237dfd..a8c0f9216a 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -468,6 +468,7 @@ public class ChunkRegionLoader {
@@ -27,7 +27,7 @@ index 1685237df..a8c0f9216 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 ce0821a65..b92e956e6 100644
+index ce0821a656..b92e956e6c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1590,6 +1590,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -44,7 +44,7 @@ index ce0821a65..b92e956e6 100644
          String s = this.getSaveID();
  
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 9c97edf9c..48da1e662 100644
+index 9c97edf9c9..48da1e662a 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -68,6 +68,13 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -62,7 +62,7 @@ index 9c97edf9c..48da1e662 100644
          this.av = soundeffect;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
-index 7ebd7da1c..74f8257ec 100644
+index 7ebd7da1c5..74f8257ecd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
 @@ -19,6 +19,13 @@ public class EntityEnderSignal extends Entity {
@@ -80,7 +80,7 @@ index 7ebd7da1c..74f8257ec 100644
          if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) {
              this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Purpur - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 5c3731f68..ce3168e5d 100644
+index 5c3731f68a..ce3168e5de 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -21,6 +21,13 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -98,7 +98,7 @@ index 5c3731f68..ce3168e5d 100644
      @Override
      public void inactiveTick() {
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
-index b7a92e100..b95ee50a4 100644
+index b7a92e1002..b95ee50a4e 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 @@ -19,6 +19,13 @@ public class EntityLlamaSpit extends Entity implements IProjectile {
@@ -116,7 +116,7 @@ index b7a92e100..b95ee50a4 100644
      public void tick() {
          super.tick();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index f5c8074dc..674f2ccc7 100644
+index f5c8074dcf..674f2ccc7f 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -35,6 +35,13 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -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 d4b4dfdd3..51585a7d8 100644
+index d4b4dfdd3b..51585a7d80 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 {
diff --git a/patches/server/0090-Implement-bed-explosion-options.patch b/patches/server/0091-Implement-bed-explosion-options.patch
similarity index 96%
rename from patches/server/0090-Implement-bed-explosion-options.patch
rename to patches/server/0091-Implement-bed-explosion-options.patch
index 0f1feb81f..d235c29ba 100644
--- a/patches/server/0090-Implement-bed-explosion-options.patch
+++ b/patches/server/0091-Implement-bed-explosion-options.patch
@@ -1,4 +1,4 @@
-From d5e74234cbcaa2f8394a03b9ccf2ded145af8274 Mon Sep 17 00:00:00 2001
+From 58554dd11fd8b7913babb85ce4e63118433b7d9a 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 74e915c21..aadd8902a 100644
+index e0bc6080ef..61a5e06a25 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 74e915c21..aadd8902a 100644
                  // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 51585a7d8..0e34414a7 100644
+index 51585a7d80..0e34414a7e 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/0091-Add-item-entity-options.patch b/patches/server/0092-Add-item-entity-options.patch
similarity index 97%
rename from patches/server/0091-Add-item-entity-options.patch
rename to patches/server/0092-Add-item-entity-options.patch
index ad84b5571..cfde5bb27 100644
--- a/patches/server/0091-Add-item-entity-options.patch
+++ b/patches/server/0092-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From 9768c60b60fe0bc632bd397c4037e14692e30394 Mon Sep 17 00:00:00 2001
+From 89ea4e8b3b6cb824adb6f23057e9177d3b66e006 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 b92e956e6..69983550b 100644
+index b92e956e6c..69983550bb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1321,6 +1321,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index b92e956e6..69983550b 100644
          return this.a(tag, false);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index bbb9ca1ef..262a7935e 100644
+index bbb9ca1efc..262a7935e7 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -71,7 +71,7 @@ public class EntityItem extends Entity {
@@ -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 0e34414a7..4cb856ebb 100644
+index 0e34414a7e..4cb856ebbb 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;
diff --git a/patches/server/0092-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0093-Make-natural-spawns-per-biome-configurable.patch
similarity index 98%
rename from patches/server/0092-Make-natural-spawns-per-biome-configurable.patch
rename to patches/server/0093-Make-natural-spawns-per-biome-configurable.patch
index f892a9c99..1eae911e3 100644
--- a/patches/server/0092-Make-natural-spawns-per-biome-configurable.patch
+++ b/patches/server/0093-Make-natural-spawns-per-biome-configurable.patch
@@ -1,4 +1,4 @@
-From f1512eded7547496cbb990baf24531852aa65837 Mon Sep 17 00:00:00 2001
+From 0feb6fdfb92a6949ab0224cc4d0d4f05a4fe5278 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 9c38f8907..3980504d9 100644
+index 9c38f8907a..3980504d9c 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 9c38f8907..3980504d9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
-index 2a6dafccd..501314da9 100644
+index 2a6dafccdd..501314da9a 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 2a6dafccd..501314da9 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0102a170d..6e0627fdc 100644
+index 0102a170dc..6e0627fdca 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 0102a170d..6e0627fdc 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 f4e9345ae..d8ff2c9a2 100644
+index f4e9345aeb..d8ff2c9a21 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 f4e9345ae..d8ff2c9a2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
-index 58c30f652..710726742 100644
+index 58c30f6523..7107267421 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 58c30f652..710726742 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
-index 9437438c8..1749c258b 100644
+index 9437438c82..1749c258b9 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 9437438c8..1749c258b 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
-index 3e5c23d31..5d262c971 100644
+index 3e5c23d31e..5d262c9712 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 3e5c23d31..5d262c971 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
-index d5eb5c91c..de048fb48 100644
+index d5eb5c91c4..de048fb480 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 d5eb5c91c..de048fb48 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
-index e805f9568..2115b05ca 100644
+index e805f9568e..2115b05caa 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 e805f9568..2115b05ca 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
-index 1b92f4567..210226e19 100644
+index 1b92f4567d..210226e19f 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 1b92f4567..210226e19 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
-index b9a5cb63a..3622ef669 100644
+index b9a5cb63a4..3622ef6690 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 b9a5cb63a..3622ef669 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
-index 571c3d139..c640aa9ee 100644
+index 571c3d139d..c640aa9eeb 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 571c3d139..c640aa9ee 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
-index 88400e77b..caaa8ec99 100644
+index 88400e77bf..caaa8ec999 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 88400e77b..caaa8ec99 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
-index 8a8fc7dbd..323f20452 100644
+index 8a8fc7dbd2..323f20452d 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 8a8fc7dbd..323f20452 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
-index 327e6847f..973eb8eeb 100644
+index 327e6847f0..973eb8eeb6 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 327e6847f..973eb8eeb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
-index 651d44cb3..7088603b1 100644
+index 651d44cb37..7088603b15 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 651d44cb3..7088603b1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
-index 257732dad..168614fe5 100644
+index 257732dad7..168614fe59 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 257732dad..168614fe5 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
-index 3752fc450..4df443701 100644
+index 3752fc4509..4df4437013 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 3752fc450..4df443701 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
-index 1a0b56932..ac565c382 100644
+index 1a0b569322..ac565c3822 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 1a0b56932..ac565c382 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
-index 8e19e0688..93f9c55bb 100644
+index 8e19e06889..93f9c55bb2 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 8e19e0688..93f9c55bb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
-index 69d4880c7..5c73ee4fb 100644
+index 69d4880c74..5c73ee4fb8 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 69d4880c7..5c73ee4fb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
-index 7661d5316..7bc4631db 100644
+index 7661d53161..7bc4631db0 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 7661d5316..7bc4631db 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
-index 05418f8fa..b618c7e33 100644
+index 05418f8fa1..b618c7e336 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 05418f8fa..b618c7e33 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
-index 1d3f62432..1d0809c2c 100644
+index 1d3f624323..1d0809c2cc 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 1d3f62432..1d0809c2c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
-index e849b411c..2b69a128a 100644
+index e849b411c6..2b69a128a6 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 e849b411c..2b69a128a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
-index f7dea38eb..57c709181 100644
+index f7dea38eb3..57c7091816 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 f7dea38eb..57c709181 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
-index 67d120bef..f1ab35f2f 100644
+index 67d120bef2..f1ab35f2fa 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 67d120bef..f1ab35f2f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
-index 2772bc6da..3941438d9 100644
+index 2772bc6dac..3941438d92 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 2772bc6da..3941438d9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
-index 4be53fc0f..f5d98bcac 100644
+index 4be53fc0f6..f5d98bcac9 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 4be53fc0f..f5d98bcac 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
-index 888dfcd8d..dd3375ef8 100644
+index 888dfcd8d4..dd3375ef84 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 888dfcd8d..dd3375ef8 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
-index ad9b4efe0..0e98efb9e 100644
+index ad9b4efe09..0e98efb9e9 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 ad9b4efe0..0e98efb9e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
-index 71606b0a7..ba0a16faa 100644
+index 71606b0a71..ba0a16faa6 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 71606b0a7..ba0a16faa 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
-index 984f94bb5..375ccf9c4 100644
+index 984f94bb59..375ccf9c45 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 984f94bb5..375ccf9c4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 95e501996..2b154a276 100644
+index 95e5019968..2b154a2761 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 95e501996..2b154a276 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
-index e624f9764..e6cf5d853 100644
+index e624f9764f..e6cf5d8539 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 e624f9764..e6cf5d853 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
-index 1fe9c840a..d4c9907b2 100644
+index 1fe9c840a7..d4c9907b28 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 1fe9c840a..d4c9907b2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
-index e2970ab00..9e7b702c8 100644
+index e2970ab00e..9e7b702c8a 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 e2970ab00..9e7b702c8 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
-index ffe6b4344..f308e0dd4 100644
+index ffe6b4344e..f308e0dd45 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 ffe6b4344..f308e0dd4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
-index b23c43305..092233c50 100644
+index b23c43305b..092233c50c 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 b23c43305..092233c50 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
-index efcb11bbe..1cebd5ce7 100644
+index efcb11bbe8..1cebd5ce74 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 efcb11bbe..1cebd5ce7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
-index 328e939a6..d0fe6c449 100644
+index 328e939a6f..d0fe6c4493 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 328e939a6..d0fe6c449 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
-index 36bea710a..e3aad431e 100644
+index 36bea710a0..e3aad431e2 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 36bea710a..e3aad431e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
-index 22474d682..2ef445ce6 100644
+index 22474d682a..2ef445ce64 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 22474d682..2ef445ce6 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index 65d606d51..8906115d4 100644
+index 65d606d51c..8906115d47 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 65d606d51..8906115d4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
-index 5ecec62f1..401fbd2d1 100644
+index 5ecec62f18..401fbd2d16 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 5ecec62f1..401fbd2d1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
-index 14d4bd312..77a5828f0 100644
+index 14d4bd312e..77a5828f07 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 14d4bd312..77a5828f0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
-index b5dab9d2a..a88831255 100644
+index b5dab9d2aa..a888312556 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 b5dab9d2a..a88831255 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
-index d05cc38b5..be0738713 100644
+index d05cc38b5e..be07387135 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 d05cc38b5..be0738713 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
-index 21a77ee81..2a213025b 100644
+index 21a77ee812..2a213025b9 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 21a77ee81..2a213025b 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
-index 0302efbdc..f0be681aa 100644
+index 0302efbdc7..f0be681aaf 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 0302efbdc..f0be681aa 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
-index 51f92584b..0118df023 100644
+index 51f92584b8..0118df023f 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 51f92584b..0118df023 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
-index ad9628b2a..5f4617c0a 100644
+index ad9628b2aa..5f4617c0a6 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 ad9628b2a..5f4617c0a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
-index ff6090e3c..266f4165a 100644
+index ff6090e3c1..266f4165a4 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 ff6090e3c..266f4165a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
-index a28222eb1..f35557dfd 100644
+index a28222eb1d..f35557dfdf 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 a28222eb1..f35557dfd 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
-index b84b868b1..405cc2bff 100644
+index b84b868b1a..405cc2bff4 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 b84b868b1..405cc2bff 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
-index 16bcf9bff..f02a8a03c 100644
+index 16bcf9bff0..f02a8a03c7 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 16bcf9bff..f02a8a03c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
-index 9fa84c87f..9ee0fc6a4 100644
+index 9fa84c87fa..9ee0fc6a43 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 9fa84c87f..9ee0fc6a4 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
-index c12a89016..a539fc362 100644
+index c12a890165..a539fc362d 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 c12a89016..a539fc362 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
-index db8b20a6c..e041fcd41 100644
+index db8b20a6c7..e041fcd412 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 db8b20a6c..e041fcd41 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
-index 2826c510d..08407ea3e 100644
+index 2826c510d8..08407ea3e0 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 2826c510d..08407ea3e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
-index e544a8f6b..337310263 100644
+index e544a8f6b9..337310263c 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 e544a8f6b..337310263 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
-index 34660f9f8..3a96c2aeb 100644
+index 34660f9f84..3a96c2aeba 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 34660f9f8..3a96c2aeb 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
-index 8815c9590..f971bc4bc 100644
+index 8815c95900..f971bc4bcb 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 8815c9590..f971bc4bc 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
-index 02584897e..011628fff 100644
+index 02584897e9..011628fff2 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 02584897e..011628fff 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
-index d85b01b95..10c6b4eb3 100644
+index d85b01b956..10c6b4eb39 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 d85b01b95..10c6b4eb3 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
-index ae6e6ca89..456b6b174 100644
+index ae6e6ca896..456b6b1747 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 ae6e6ca89..456b6b174 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
-index 4e19fe5ae..cc699e354 100644
+index 4e19fe5ae9..cc699e354d 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 4e19fe5ae..cc699e354 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
-index 05e833ffe..3c722f50a 100644
+index 05e833ffed..3c722f50a9 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 05e833ffe..3c722f50a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
-index 22e9789a3..6a5a8a991 100644
+index 22e9789a36..6a5a8a991a 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 22e9789a3..6a5a8a991 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
-index 5b068299c..07d72737b 100644
+index 5b068299c8..07d72737b5 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 5b068299c..07d72737b 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
-index a26d56aa4..839d3e616 100644
+index a26d56aa45..839d3e616a 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 a26d56aa4..839d3e616 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
-index e47add3e4..53aa6243d 100644
+index e47add3e43..53aa6243de 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 e47add3e4..53aa6243d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
-index ec92a8457..2452f1801 100644
+index ec92a84579..2452f18013 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 ec92a8457..2452f1801 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
-index c9ba33453..5549d6142 100644
+index c9ba334535..5549d61421 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 c9ba33453..5549d6142 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
-index 11dc5f637..c3fc79fb3 100644
+index 11dc5f6374..c3fc79fb31 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 11dc5f637..c3fc79fb3 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
-index e4dc7d198..00f94b906 100644
+index e4dc7d198c..00f94b906b 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 e4dc7d198..00f94b906 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
-index 12742870c..a448c7726 100644
+index 12742870ca..a448c77264 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 12742870c..a448c7726 100644
  
 diff --git a/src/main/resources/biomes.yml b/src/main/resources/biomes.yml
 new file mode 100644
-index 000000000..f0ea65299
+index 0000000000..f0ea65299f
 --- /dev/null
 +++ b/src/main/resources/biomes.yml
 @@ -0,0 +1,1042 @@
diff --git a/patches/server/0093-Configurable-void-damage-height.patch b/patches/server/0094-Configurable-void-damage-height.patch
similarity index 94%
rename from patches/server/0093-Configurable-void-damage-height.patch
rename to patches/server/0094-Configurable-void-damage-height.patch
index 588315986..5e387b208 100644
--- a/patches/server/0093-Configurable-void-damage-height.patch
+++ b/patches/server/0094-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 3e6308383144e7642e6ad7d78ebe0cce25bb38fe Mon Sep 17 00:00:00 2001
+From 952255e563565af1c226c5d886251a2ff1fcc590 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 69983550b..86e244e06 100644
+index 69983550bb..86e244e068 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -504,7 +504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 69983550b..86e244e06 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 4cb856ebb..53c8782b5 100644
+index 4cb856ebbb..53c8782b59 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/0094-Fix-the-dead-lagging-the-server.patch b/patches/server/0095-Fix-the-dead-lagging-the-server.patch
similarity index 92%
rename from patches/server/0094-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0095-Fix-the-dead-lagging-the-server.patch
index 6293b8df9..8b232bb37 100644
--- a/patches/server/0094-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0095-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From 362b4517b13cfae71cedc57042ef661503295566 Mon Sep 17 00:00:00 2001
+From 2bef94930f06417351be84330589567fa5363bc0 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 86e244e06..c72b4fbd0 100644
+index 86e244e068..c72b4fbd0e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1407,7 +1407,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 86e244e06..c72b4fbd0 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 08ae190b0..e9ef6d00c 100644
+index 08ae190b07..e9ef6d00c8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2398,7 +2398,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0095-Add-ping-command.patch b/patches/server/0096-Add-ping-command.patch
similarity index 96%
rename from patches/server/0095-Add-ping-command.patch
rename to patches/server/0096-Add-ping-command.patch
index b80ec7204..464766fe0 100644
--- a/patches/server/0095-Add-ping-command.patch
+++ b/patches/server/0096-Add-ping-command.patch
@@ -1,4 +1,4 @@
-From 33b3a1802b3ec6fe87ef39a9273203b75d5b4d4c Mon Sep 17 00:00:00 2001
+From adb43d0023fe0bc1e3fbb46cf03f342b13c8a7b3 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 39a6a9ac0..5568649b7 100644
+index 39a6a9ac00..5568649b7e 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 39a6a9ac0..5568649b7 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 2d512aa4f..5aa10d16b 100644
+index 2d512aa4f9..5aa10d16bc 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 2d512aa4f..5aa10d16b 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 c988c929f..5c980b70c 100644
+index c988c929f1..5c980b70cd 100644
 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 @@ -178,6 +178,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
@@ -77,7 +77,7 @@ index c988c929f..5c980b70c 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 000000000..dac3083bf
+index 0000000000..dac3083bf0
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
 @@ -0,0 +1,33 @@
@@ -115,7 +115,7 @@ index 000000000..dac3083bf
 +    }
 +}
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index e925e1374..e81beea7f 100644
+index e925e1374d..e81beea7fa 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0096-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/0096-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 5e23ab45e..bb6c8f177 100644
--- a/patches/server/0096-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 bbfe3cf9cb6abd67a230035f4fabf1c29d8c48de Mon Sep 17 00:00:00 2001
+From c5f926362fe165454e0b60d2efad7bda9a58b2ec Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index ed8e26aa4..ca6c0ec29 100644
+index ed8e26aa45..ca6c0ec299 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 ed8e26aa4..ca6c0ec29 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 53c8782b5..01b8fffe1 100644
+index 53c8782b59..01b8fffe14 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/0097-Configurable-server-mod-name.patch b/patches/server/0098-Configurable-server-mod-name.patch
similarity index 89%
rename from patches/server/0097-Configurable-server-mod-name.patch
rename to patches/server/0098-Configurable-server-mod-name.patch
index 57a3f7996..c43eb30db 100644
--- a/patches/server/0097-Configurable-server-mod-name.patch
+++ b/patches/server/0098-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From f3df53b9df37f26ab2e230b8141b7cff832a549d Mon Sep 17 00:00:00 2001
+From d212c0e4b58360d4ebd4846cabfcebdba7f13b3c 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,10 +9,10 @@ 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 d00852a12..9b3df983f 100644
+index 50922dd367..fb066bc10b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1577,7 +1577,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -22,7 +22,7 @@ index d00852a12..9b3df983f 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 fe38b3ce9..a729e7d20 100644
+index fe38b3ce90..a729e7d204 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -181,6 +181,11 @@ public class PurpurConfig {
diff --git a/patches/server/0098-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/0098-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 2c762cb06..034c1be2f 100644
--- a/patches/server/0098-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 47bffde99a17985487370477c181654f72419fde Mon Sep 17 00:00:00 2001
+From dda5fc5ad51706c33ad1cc5a98bb2c9012e64aac 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 87aef515c..55294b5df 100644
+index 87aef515c6..55294b5dfa 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -122,6 +122,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/patches/server/0099-Configurable-TPS-Catchup.patch b/patches/server/0100-Configurable-TPS-Catchup.patch
similarity index 94%
rename from patches/server/0099-Configurable-TPS-Catchup.patch
rename to patches/server/0100-Configurable-TPS-Catchup.patch
index ddce4ae3f..1172ac7d4 100644
--- a/patches/server/0099-Configurable-TPS-Catchup.patch
+++ b/patches/server/0100-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From 7fe871ca0c6d15341afae88e1a9fbc9a6cfaa868 Mon Sep 17 00:00:00 2001
+From 2f9aa14218b11fc630058ae1c087e41530a665f0 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 9b3df983f..3b9d27b6c 100644
+index fb066bc10b..6d7e919495 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -980,6 +980,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -27,7 +27,7 @@ index 9b3df983f..3b9d27b6c 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 a729e7d20..7bea36213 100644
+index a729e7d204..7bea362132 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -155,6 +155,11 @@ public class PurpurConfig {
diff --git a/patches/server/0100-Breedable-Polar-Bears.patch b/patches/server/0101-Breedable-Polar-Bears.patch
similarity index 96%
rename from patches/server/0100-Breedable-Polar-Bears.patch
rename to patches/server/0101-Breedable-Polar-Bears.patch
index afc226f98..26b86a385 100644
--- a/patches/server/0100-Breedable-Polar-Bears.patch
+++ b/patches/server/0101-Breedable-Polar-Bears.patch
@@ -1,4 +1,4 @@
-From 10b40f405d9f0066cc195e16f9350063505246a7 Mon Sep 17 00:00:00 2001
+From 2436ad77c0fa1957dd44c346fc09ced8b1eb7372 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 0a3906bde..42fef3aba 100644
+index 0a3906bde0..42fef3abaa 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,7 +64,7 @@ index 0a3906bde..42fef3aba 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 01b8fffe1..ced9edf82 100644
+index 01b8fffe14..ced9edf827 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -666,10 +666,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0101-Configurable-jockey-options.patch b/patches/server/0102-Configurable-jockey-options.patch
similarity index 97%
rename from patches/server/0101-Configurable-jockey-options.patch
rename to patches/server/0102-Configurable-jockey-options.patch
index 0e76f8d24..82352efba 100644
--- a/patches/server/0101-Configurable-jockey-options.patch
+++ b/patches/server/0102-Configurable-jockey-options.patch
@@ -1,4 +1,4 @@
-From 7b2819198b6658649fbe0a72ba58bf8adf0676fb Mon Sep 17 00:00:00 2001
+From 6ecf6cadc009dd4b5a17f0fa21271b80c54b07fc 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 63f5969b1..f32950cc9 100644
+index 63f5969b10..f32950cc9b 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 63f5969b1..f32950cc9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index fb9ef88ea..90bf12c73 100644
+index fb9ef88ea3..90bf12c735 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 fb9ef88ea..90bf12c73 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 95ae6f349..e60e4adc1 100644
+index 95ae6f3494..e60e4adc1d 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 95ae6f349..e60e4adc1 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 db252ba4e..e8b099d6c 100644
+index db252ba4e0..e8b099d6c8 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 db252ba4e..e8b099d6c 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 ebbfcb75a..8532385d8 100644
+index ebbfcb75a4..8532385d8d 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 ebbfcb75a..8532385d8 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ced9edf82..adcdc6b8f 100644
+index ced9edf827..adcdc6b8f4 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 {
diff --git a/patches/server/0102-Configurable-enchantment-max-level.patch b/patches/server/0103-Configurable-enchantment-max-level.patch
similarity index 96%
rename from patches/server/0102-Configurable-enchantment-max-level.patch
rename to patches/server/0103-Configurable-enchantment-max-level.patch
index 744767bd3..e12e8bef7 100644
--- a/patches/server/0102-Configurable-enchantment-max-level.patch
+++ b/patches/server/0103-Configurable-enchantment-max-level.patch
@@ -1,4 +1,4 @@
-From 116e110a51058adb55971fed51c8ba09e441de7d Mon Sep 17 00:00:00 2001
+From 8db2d5025aab7f822846298a5ad6534f14f259cb 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 70cd4a483..0ab96ea34 100644
+index 70cd4a4837..0ab96ea34e 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 70cd4a483..0ab96ea34 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 ffa1d19cb..1040e7e08 100644
+index ffa1d19cb9..1040e7e08b 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 ffa1d19cb..1040e7e08 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java b/src/main/java/net/minecraft/server/EnchantmentArrowKnockback.java
-index 9103f3c61..67f487b9e 100644
+index 9103f3c614..67f487b9e4 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 9103f3c61..67f487b9e 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentBinding.java b/src/main/java/net/minecraft/server/EnchantmentBinding.java
-index b49154b13..ec4dad3cf 100644
+index b49154b13e..ec4dad3cf2 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 b49154b13..ec4dad3cf 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 669fbd268..07d566cd9 100644
+index 669fbd2685..07d566cd9e 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 669fbd268..07d566cd9 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 798b3c250..16a7c38bc 100644
+index 798b3c250c..16a7c38bc0 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 798b3c250..16a7c38bc 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 c946326fb..6deccef55 100644
+index c946326fbc..6deccef554 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 c946326fb..6deccef55 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 c4da4378c..f2664c18e 100644
+index c4da4378cb..f2664c18e2 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 c4da4378c..f2664c18e 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java b/src/main/java/net/minecraft/server/EnchantmentFlameArrows.java
-index a0b4da25b..af3db770f 100644
+index a0b4da25b8..af3db770f8 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 a0b4da25b..af3db770f 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java b/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java
-index b5de6c740..8c4fd331c 100644
+index b5de6c740c..8c4fd331c8 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 b5de6c740..8c4fd331c 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 408cfa460..1dbedc0ad 100644
+index 408cfa4609..1dbedc0adb 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 408cfa460..1dbedc0ad 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 362ce7bc4..04062c255 100644
+index 362ce7bc47..04062c2557 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 362ce7bc4..04062c255 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentLootBonus.java b/src/main/java/net/minecraft/server/EnchantmentLootBonus.java
-index b5232facc..c27e20e06 100644
+index b5232faccc..c27e20e066 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 b5232facc..c27e20e06 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 1ffb91c57..c5a9e61f9 100644
+index 1ffb91c570..c5a9e61f9a 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 1ffb91c57..c5a9e61f9 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentMending.java b/src/main/java/net/minecraft/server/EnchantmentMending.java
-index dafc29399..ace2e19a6 100644
+index dafc29399f..ace2e19a6f 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 dafc29399..ace2e19a6 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentMultishot.java b/src/main/java/net/minecraft/server/EnchantmentMultishot.java
-index 6f423e753..5fb8a624c 100644
+index 6f423e7536..5fb8a624c2 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 6f423e753..5fb8a624c 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 c1bc97f6e..a5726d36d 100644
+index c1bc97f6ef..a5726d36df 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 c1bc97f6e..a5726d36d 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentPiercing.java b/src/main/java/net/minecraft/server/EnchantmentPiercing.java
-index 1a2e8e31f..0e8993e86 100644
+index 1a2e8e31f9..0e8993e86e 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 1a2e8e31f..0e8993e86 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 416e57caa..b29cb5467 100644
+index 416e57caa0..b29cb54677 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 416e57caa..b29cb5467 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 e624b63aa..762642ce5 100644
+index e624b63aaf..762642ce5a 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 e624b63aa..762642ce5 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java b/src/main/java/net/minecraft/server/EnchantmentSilkTouch.java
-index 04aa8e1d5..d0eac6dbc 100644
+index 04aa8e1d5d..d0eac6dbc1 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 04aa8e1d5..d0eac6dbc 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 a20b1c8f5..7804e0a0a 100644
+index a20b1c8f5b..7804e0a0a8 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 a20b1c8f5..7804e0a0a 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 fd0255c89..df7c9b24b 100644
+index fd0255c890..df7c9b24b5 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 fd0255c89..df7c9b24b 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 14115ecc7..2533b2cab 100644
+index 14115ecc78..2533b2cab2 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 14115ecc7..2533b2cab 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 f64fc401e..b47d8284f 100644
+index f64fc401e8..b47d8284f8 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 f64fc401e..b47d8284f 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 dd91bed6e..826f4d875 100644
+index dd91bed6e4..826f4d8750 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 dd91bed6e..826f4d875 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 0f669dc7a..81d6ccc35 100644
+index 0f669dc7ac..81d6ccc35b 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 0f669dc7a..81d6ccc35 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 4ef59d7f1..5d7b6ca57 100644
+index 4ef59d7f17..5d7b6ca57a 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 4ef59d7f1..5d7b6ca57 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 cf0999095..bea57861b 100644
+index cf0999095e..bea57861bf 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 cf0999095..bea57861b 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java b/src/main/java/net/minecraft/server/EnchantmentWeaponDamage.java
-index 4571cdf02..aa3cbd523 100644
+index 4571cdf021..aa3cbd523a 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 4571cdf02..aa3cbd523 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 7bea36213..68bad6a13 100644
+index 7bea362132..68bad6a13a 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 7bea36213..68bad6a13 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 64ceeda1a..0e9fa3441 100644
+index 64ceeda1af..0e9fa34411 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/0103-Optimize-Chunk-Ticks.patch b/patches/server/0104-Optimize-Chunk-Ticks.patch
similarity index 99%
rename from patches/server/0103-Optimize-Chunk-Ticks.patch
rename to patches/server/0104-Optimize-Chunk-Ticks.patch
index 835fb3181..cad02c28f 100644
--- a/patches/server/0103-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0104-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From a86a2da2c5932ea73094f9e8612250867ae7b89c Mon Sep 17 00:00:00 2001
+From d6198f2a5c16e6f40e43168cd9bc6c385bb5df15 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
diff --git a/patches/server/0104-Add-configurable-beehive-generation-chance.patch b/patches/server/0105-Add-configurable-beehive-generation-chance.patch
similarity index 97%
rename from patches/server/0104-Add-configurable-beehive-generation-chance.patch
rename to patches/server/0105-Add-configurable-beehive-generation-chance.patch
index 2326565b0..5ece3cca9 100644
--- a/patches/server/0104-Add-configurable-beehive-generation-chance.patch
+++ b/patches/server/0105-Add-configurable-beehive-generation-chance.patch
@@ -1,4 +1,4 @@
-From d38651d25c27259325825dbce895586947a00ca4 Mon Sep 17 00:00:00 2001
+From a99ba89586464acd48a75d259bf99576e70b678f 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 5827b1ba1..5ef9ae16e 100644
+index 5827b1ba1a..5ef9ae16e3 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 5827b1ba1..5ef9ae16e 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 b9dee0e25..9e9d9e643 100644
+index b9dee0e255..9e9d9e6437 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 b9dee0e25..9e9d9e643 100644
          BlockPosition blockposition1;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index adcdc6b8f..0347b729c 100644
+index adcdc6b8f4..0347b729c0 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/0105-Add-more-timings-timers.patch b/patches/server/0106-Add-more-timings-timers.patch
similarity index 99%
rename from patches/server/0105-Add-more-timings-timers.patch
rename to patches/server/0106-Add-more-timings-timers.patch
index 3b02c5523..6df907190 100644
--- a/patches/server/0105-Add-more-timings-timers.patch
+++ b/patches/server/0106-Add-more-timings-timers.patch
@@ -1,4 +1,4 @@
-From 0d1892aab03c9d9cfd0402e584734bd177349546 Mon Sep 17 00:00:00 2001
+From 078370ffd5a5cb03267ec7b44e38fa68501b371a 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 37341d2d2e..918eaf0c6b 100644
+index 84b1f068ad..fefc2433c6 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 {
diff --git a/patches/server/0106-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/0106-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0107-Skip-events-if-there-s-no-listeners.patch
index b7c2c5a2b..2372bc479 100644
--- a/patches/server/0106-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 2d10905145f57d597c943aead99cb8b78640c650 Mon Sep 17 00:00:00 2001
+From 804503f72039c811819ea6fb177b910a95bd2f74 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 5aa10d16b..3b61298fa 100644
+index 5aa10d16bc..3b61298fa6 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -275,6 +275,7 @@ public class CommandDispatcher {
diff --git a/patches/server/0107-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/0107-Debug-stick-should-not-update-neighbors.patch
rename to patches/server/0108-Debug-stick-should-not-update-neighbors.patch
index 51136d3af..7ed668238 100644
--- a/patches/server/0107-Debug-stick-should-not-update-neighbors.patch
+++ b/patches/server/0108-Debug-stick-should-not-update-neighbors.patch
@@ -1,4 +1,4 @@
-From c9aeecf1d55f5b9f6a9589128d59a63eafc07642 Mon Sep 17 00:00:00 2001
+From 37187b6a7d4cee5c40f86fff824f0552d74229e5 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 d5e0578b2..bc465a47d 100644
+index d5e0578b25..bc465a47d8 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -186,6 +186,11 @@ public final class ItemStack {
diff --git a/patches/server/0108-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch
similarity index 96%
rename from patches/server/0108-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch
index 13904b91f..0c2b88b43 100644
--- a/patches/server/0108-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch
@@ -1,4 +1,4 @@
-From 19ce8c3dfb27464eeb4a11406ee973e096bd0e9e Mon Sep 17 00:00:00 2001
+From dc0bfde19e023666817183cd7571025e23c218d3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Apr 2020 16:28:38 -0500
 Subject: [PATCH] Add enderman and creeper griefing controls
@@ -10,7 +10,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
  3 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index ce366f401..93efc7977 100644
+index ce366f401f..93efc79774 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -237,7 +237,7 @@ public class EntityCreeper extends EntityMonster {
@@ -23,7 +23,7 @@ index ce366f401..93efc7977 100644
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index de30ce483..68165d72d 100644
+index de30ce483f..68165d72dd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -354,6 +354,7 @@ public class EntityEnderman extends EntityMonster {
@@ -43,7 +43,7 @@ index de30ce483..68165d72d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0347b729c..e6ab2fde4 100644
+index 0347b729c0..e6ab2fde43 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -394,11 +394,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0109-Chickens-can-retaliate.patch b/patches/server/0110-Chickens-can-retaliate.patch
similarity index 96%
rename from patches/server/0109-Chickens-can-retaliate.patch
rename to patches/server/0110-Chickens-can-retaliate.patch
index 027026a35..875900c6d 100644
--- a/patches/server/0109-Chickens-can-retaliate.patch
+++ b/patches/server/0110-Chickens-can-retaliate.patch
@@ -1,4 +1,4 @@
-From a3387f88acd84e5be42b387639edf010bb06c102 Mon Sep 17 00:00:00 2001
+From 51b33f8d3829e9fa3553bea216c0f8a654da942c 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 5505b7ee9..1c9b0ce61 100644
+index 5505b7ee94..1c9b0ce61b 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 5505b7ee9..1c9b0ce61 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e6ab2fde4..6962d17b9 100644
+index e6ab2fde43..6962d17b9b 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/0110-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
similarity index 95%
rename from patches/server/0110-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
rename to patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
index 99fcec063..128312340 100644
--- a/patches/server/0110-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@@ -1,4 +1,4 @@
-From 7ca338c32001686b5395fe2f6d2deae6fe0f4bb1 Mon Sep 17 00:00:00 2001
+From c7d025bf454a4fb24cf1f9e79331aed59692ddeb 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 eb0befb35..4e5b71046 100644
+index eb0befb357..4e5b71046a 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 eb0befb35..4e5b71046 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 6962d17b9..e57299f1e 100644
+index 6962d17b9b..e57299f1e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -200,6 +200,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0111-More-anvil-controls.patch b/patches/server/0112-More-anvil-controls.patch
similarity index 97%
rename from patches/server/0111-More-anvil-controls.patch
rename to patches/server/0112-More-anvil-controls.patch
index 225ab1095..d2eb35a25 100644
--- a/patches/server/0111-More-anvil-controls.patch
+++ b/patches/server/0112-More-anvil-controls.patch
@@ -1,4 +1,4 @@
-From f4c550232866ac0383d7d372af38a29c87928cf2 Mon Sep 17 00:00:00 2001
+From ce8a02f259fb4f0a02d036c03f84af8fe2334399 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 286b930dd..c34f1e02c 100644
+index 286b930ddb..c34f1e02cb 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 286b930dd..c34f1e02c 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 9374c2706..db5e4f2bd 100644
+index 9374c27061..db5e4f2bd1 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/0112-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
similarity index 94%
rename from patches/server/0112-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
rename to patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
index 7d850e3e5..9329deadc 100644
--- a/patches/server/0112-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
@@ -1,4 +1,4 @@
-From 5ed79fd249b8fb416a89aae7162fee15109e15d1 Mon Sep 17 00:00:00 2001
+From 88168edf436d0a561fdca9966cf70b29a476c736 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 e05e97727..cf3126a65 100644
+index e05e977271..cf3126a657 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,7 +22,7 @@ index e05e97727..cf3126a65 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 e57299f1e..efdc176e6 100644
+index e57299f1e4..efdc176e64 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -892,6 +892,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0113-Player-invulnerabilities.patch b/patches/server/0114-Player-invulnerabilities.patch
similarity index 96%
rename from patches/server/0113-Player-invulnerabilities.patch
rename to patches/server/0114-Player-invulnerabilities.patch
index 893caf70d..f0ef1da65 100644
--- a/patches/server/0113-Player-invulnerabilities.patch
+++ b/patches/server/0114-Player-invulnerabilities.patch
@@ -1,4 +1,4 @@
-From 749f0eda4c810b3a7071abfc8337322f9220c3d2 Mon Sep 17 00:00:00 2001
+From b7f030b1ffc4c53737500f213803d6a7e6f2628c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:44 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -75,7 +75,7 @@ index 18a74607fc..90305b61fc 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d3b4f0beaf..2f047d8ec7 100644
+index 0cd012dfc3..91e6952f4c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1530,6 +1530,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -87,7 +87,7 @@ index d3b4f0beaf..2f047d8ec7 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1b9d6b2ecb..f749f131f4 100644
+index 55cda3dd66..d2ab05b51e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -824,6 +824,8 @@ public abstract class PlayerList {
@@ -122,10 +122,10 @@ index efdc176e64..81969d2dc9 100644
          playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition);
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c144939291..a3ffa34e0a 100644
+index 7bd271d4c2..24e35ffeaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2095,5 +2095,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2094,5 +2094,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }
diff --git a/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
similarity index 95%
rename from patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
rename to patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
index 8c43892e9..1c36e48f8 100644
--- a/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
+++ b/patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
@@ -1,4 +1,4 @@
-From 542fb083595c2b7f4cb3c30d0a3f11783f825e50 Mon Sep 17 00:00:00 2001
+From 355f6b170c3e1cb367f53ab93d8c10c0694f1329 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 48da1e662..11d1dc876 100644
+index 48da1e662a..11d1dc8763 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/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 95%
rename from patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch
index e12fe96d5..56afffb3b 100644
--- a/patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch
+++ b/patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch
@@ -1,4 +1,4 @@
-From fc67e01c4f086c30805c616b3da8a0011408f766 Mon Sep 17 00:00:00 2001
+From 9b43b8d6100c89708ca556051ff8b5df0bdec753 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 cb36334e4..aa83ef169 100644
+index cb36334e41..aa83ef1699 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 cb36334e4..aa83ef169 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 81969d2dc..296274896 100644
+index 81969d2dc9..296274896e 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/0116-MC-4-Fix-Item-position-desync.patch b/patches/server/0117-MC-4-Fix-Item-position-desync.patch
similarity index 95%
rename from patches/server/0116-MC-4-Fix-Item-position-desync.patch
rename to patches/server/0117-MC-4-Fix-Item-position-desync.patch
index 1ad036164..7ef4649f9 100644
--- a/patches/server/0116-MC-4-Fix-Item-position-desync.patch
+++ b/patches/server/0117-MC-4-Fix-Item-position-desync.patch
@@ -1,4 +1,4 @@
-From 1e342f9021a2174b50add0d9518f062d2721d6ad Mon Sep 17 00:00:00 2001
+From 1e6d612a1824e5709bda2199218af4610166a678 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 390cb8e76..4e63fd83e 100644
+index 390cb8e767..4e63fd83e0 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -131,6 +131,12 @@ public class EntityTrackerEntry {
@@ -27,7 +27,7 @@ index 390cb8e76..4e63fd83e 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 5b1d95935..0010448e3 100644
+index 5b1d959354..0010448e3a 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 5b1d95935..0010448e3 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 68bad6a13..ab88636ca 100644
+index 68bad6a13a..ab88636cad 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -163,8 +163,10 @@ public class PurpurConfig {
diff --git a/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch
similarity index 96%
rename from patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch
rename to patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch
index 971b60a02..4ca18c461 100644
--- a/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch
+++ b/patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch
@@ -1,4 +1,4 @@
-From 9a2775903486689ae7032da239f1a557fccb8902 Mon Sep 17 00:00:00 2001
+From da674165b50d62d2d433c19f4b50941e06b01782 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 90bf12c73..c78876fc4 100644
+index 90bf12c735..c78876fc42 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,7 +43,7 @@ index 90bf12c73..c78876fc4 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 296274896..7e7f10351 100644
+index 296274896e..7e7f10351b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1013,6 +1013,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0118-EMC-MonsterEggSpawn-Event.patch b/patches/server/0119-EMC-MonsterEggSpawn-Event.patch
similarity index 97%
rename from patches/server/0118-EMC-MonsterEggSpawn-Event.patch
rename to patches/server/0119-EMC-MonsterEggSpawn-Event.patch
index ab4c31f61..aaf4b9576 100644
--- a/patches/server/0118-EMC-MonsterEggSpawn-Event.patch
+++ b/patches/server/0119-EMC-MonsterEggSpawn-Event.patch
@@ -1,4 +1,4 @@
-From ddbc85e7eef2d1144873414f6800925475599a09 Mon Sep 17 00:00:00 2001
+From cdd3086978fd12ec425adef6ae3a21d20230352e 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 8e8d392a1..ff11baa7c 100644
+index 8e8d392a15..ff11baa7c5 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/0119-PaperPR-Add-BellRingEvent.patch b/patches/server/0120-PaperPR-Add-BellRingEvent.patch
similarity index 96%
rename from patches/server/0119-PaperPR-Add-BellRingEvent.patch
rename to patches/server/0120-PaperPR-Add-BellRingEvent.patch
index 634bb664b..9232e25ef 100644
--- a/patches/server/0119-PaperPR-Add-BellRingEvent.patch
+++ b/patches/server/0120-PaperPR-Add-BellRingEvent.patch
@@ -1,4 +1,4 @@
-From 1ed7f5fbc363311fbc87a785b48b100aec8d0b92 Mon Sep 17 00:00:00 2001
+From dd59c9d44aa90f5ee82eaa1ce53a4273584bc21c 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 dbdbfb8ad..0bbd1e159 100644
+index dbdbfb8ad9..0bbd1e1594 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/0120-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0121-PaperPR-Per-World-Spawn-limits.patch
similarity index 93%
rename from patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
rename to patches/server/0121-PaperPR-Per-World-Spawn-limits.patch
index 21ea90538..e1dc959ff 100644
--- a/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
+++ b/patches/server/0121-PaperPR-Per-World-Spawn-limits.patch
@@ -1,4 +1,4 @@
-From 24c75bc95d5b36139730c743f4d32357295f90c6 Mon Sep 17 00:00:00 2001
+From 1b796add1a226554384471e84cfbd7f39f253e92 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 7e7f10351..f2281d325 100644
+index 7e7f10351b..f2281d3259 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -313,6 +313,17 @@ public class PurpurWorldConfig {
@@ -31,7 +31,7 @@ index 7e7f10351..f2281d325 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 4ba2ec7df..066b07f5a 100644
+index e54cff571c..cc1fb7108a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -333,6 +333,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0122-PaperPR-PlayerItemCooldownEvent.patch
similarity index 93%
rename from patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch
rename to patches/server/0122-PaperPR-PlayerItemCooldownEvent.patch
index 49bb22049..189ac9ba5 100644
--- a/patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch
+++ b/patches/server/0122-PaperPR-PlayerItemCooldownEvent.patch
@@ -1,4 +1,4 @@
-From 58783d6634714ffc4850f6dae6d208315db0a4b4 Mon Sep 17 00:00:00 2001
+From 0d10025c6a251f2c362d2adaf372fce754ac92fb Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:06 +0200
 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-index 27cde8c15..3c3bcc7f9 100644
+index 27cde8c155..3c3bcc7f91 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;
diff --git a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch b/patches/server/0123-Tuinity-Delay-chunk-unloads.patch
similarity index 99%
rename from patches/server/0122-Tuinity-Delay-chunk-unloads.patch
rename to patches/server/0123-Tuinity-Delay-chunk-unloads.patch
index dd70b8d2a..c33d3f4f0 100644
--- a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch
+++ b/patches/server/0123-Tuinity-Delay-chunk-unloads.patch
@@ -1,4 +1,4 @@
-From 144050f232129d11c7b35d33d71b9a9951dab870 Mon Sep 17 00:00:00 2001
+From c84c8fd87b181d5fa8c3d6b1623e38d00aeb96cc 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
@@ -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 8a319f6e60..6e7a1c3386 100644
+index a4a4235f42..5d0789813f 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance {
diff --git a/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
similarity index 91%
rename from patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
rename to patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
index bd38cf02f..a9990dbbf 100644
--- a/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
+++ b/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
@@ -1,4 +1,4 @@
-From 787d40c6eecd49aeeb2cb303ad38faccd1f2e4b3 Mon Sep 17 00:00:00 2001
+From 276aed65a5bd72dc0027fbd4cc481a866d050d2d 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 3b9d27b6c..555374f13 100644
+index 6d7e919495..e02a7134a9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1106,7 +1106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0124-YAPFA-Disable-mojang-profiler.patch b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch
similarity index 95%
rename from patches/server/0124-YAPFA-Disable-mojang-profiler.patch
rename to patches/server/0125-YAPFA-Disable-mojang-profiler.patch
index ca11471db..34f744d3d 100644
--- a/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
+++ b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch
@@ -1,4 +1,4 @@
-From 7f6f02a2a89bc1a6c3cd16cbdcb65871b5bda7f5 Mon Sep 17 00:00:00 2001
+From 694666c623c2e4fb12ed88f9b706a20321bd7445 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 f0d72ea39..e38a68406 100644
+index f0d72ea39d..e38a684060 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 f0d72ea39..e38a68406 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 555374f13..69b2eb0e0 100644
+index e02a7134a9..10845ff8fd 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
@@ -64,7 +64,7 @@ index 555374f13..69b2eb0e0 100644
              /*
              dedicatedserver.i((String) optionset.valueOf(optionspec7));
              dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
-@@ -1885,6 +1887,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1887,6 +1889,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);
  
@@ -74,7 +74,7 @@ index 555374f13..69b2eb0e0 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 000000000..b32a5418f
+index 0000000000..b32a5418f2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/GameProfilerNoop.java
 @@ -0,0 +1,68 @@
@@ -147,7 +147,7 @@ index 000000000..b32a5418f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 717c2759f..2b34eb03b 100644
+index ced4acc5f5..371f7b2794 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -145,6 +145,8 @@ public class Main {
@@ -160,7 +160,7 @@ index 717c2759f..2b34eb03b 100644
  
                  // Paper start
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index e81beea7f..5c3536b26 100644
+index e81beea7fa..5c3536b26b 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,5 +1,6 @@