From 6edf4624a8076e22003799dc482a92075223a4fb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Mar 2020 03:07:56 -0500
Subject: [PATCH] Fix vanilla command permission handler

---
 ...x-vanilla-command-permission-handler.patch | 37 +++++++++++++++++++
 ....patch => 0007-Host-our-own-timings.patch} |  2 +-
 ...007-Ridables.patch => 0008-Ridables.patch} |  2 +-
 ...settings-suppressing-pointless-logs.patch} |  2 +-
 ...> 0010-Disable-outdated-build-check.patch} |  2 +-
 ... 0011-Add-obfhelpers-for-plugin-use.patch} |  2 +-
 ...s.patch => 0012-Silk-touch-spawners.patch} |  2 +-
 ...nts-AI.patch => 0013-Give-giants-AI.patch} |  2 +-
 ...tch => 0014-Illusioners-AI-settings.patch} |  2 +-
 ...> 0015-Zombie-horse-naturally-spawn.patch} |  4 +-
 ...016-Charged-creeper-naturally-spawn.patch} |  2 +-
 ...it-naturally-spawn-toast-and-killer.patch} |  2 +-
 ....patch => 0018-Cat-spawning-options.patch} |  2 +-
 ...ck-cat-types-spawning-in-swamp-huts.patch} |  2 +-
 ...ms.patch => 0020-Cows-eat-mushrooms.patch} |  2 +-
 ...ow-rotation-when-shearing-mooshroom.patch} |  2 +-
 ...patch => 0022-Pigs-give-saddle-back.patch} |  2 +-
 ...ms-do-not-spawn-on-creative-players.patch} |  2 +-
 ...024-Phantoms-only-attack-insomniacs.patch} |  2 +-
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  2 +-
 ...6-Snowman-drop-and-put-back-pumpkin.patch} |  2 +-
 ...> 0027-Ender-dragon-always-drop-egg.patch} |  2 +-
 ...8-Ender-dragon-always-drop-full-exp.patch} |  4 +-
 ... 0029-Signs-editable-on-right-click.patch} |  2 +-
 ...er-showing-in-ping-before-server-fu.patch} |  2 +-
 ...e-egg-block-options-fixes-MC-168772.patch} |  2 +-
 ...patch => 0032-Make-Iron-Golems-Swim.patch} |  2 +-
 ...oisten-from-water-directly-under-it.patch} |  2 +-
 ...atch => 0034-Controllable-Minecarts.patch} |  2 +-
 ...tch => 0035-Signs-allow-color-codes.patch} |  2 +-
 ...=> 0036-Campfires-have-regen-effect.patch} |  2 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |  4 +-
 ... => 0038-Campfires-burn-out-in-rain.patch} |  2 +-
 ...-Campfires-should-fall-with-gravity.patch} |  2 +-
 ...40-Dont-send-useless-entity-packets.patch} |  2 +-
 ... 0041-Fix-item-position-desync-MC-4.patch} |  2 +-
 ...ch => 0042-Fix-pig-zombies-MC-56653.patch} |  2 +-
 ...API.patch => 0043-Implement-AFK-API.patch} |  2 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |  2 +-
 ...-mends-most-damages-equipment-first.patch} |  2 +-
 ...atch => 0046-Tulips-change-fox-type.patch} |  2 +-
 ...d-limit-for-pillager-outpost-spawns.patch} |  2 +-
 ...r.patch => 0048-Make-the-GUI-better.patch} |  2 +-
 ...49-Players-should-not-cram-to-death.patch} |  4 +-
 ... => 0050-Add-EntityPortalReadyEvent.patch} |  2 +-
 ...h => 0051-Implement-elytra-settings.patch} |  4 +-
 ...PI.patch => 0052-Add-tick-times-API.patch} |  2 +-
 ...Add-blacklist-option-for-grindstone.patch} |  2 +-
 ...=> 0054-Implement-lagging-threshold.patch} |  2 +-
 ...t-configurable-villager-brain-ticks.patch} |  2 +-
 ...-for-zombies-targetting-turtle-eggs.patch} |  2 +-
 ...57-Implement-bamboo-growth-settings.patch} |  2 +-
 ...should-not-bypass-cramming-gamerule.patch} |  2 +-
 ...0059-Option-for-slimes-not-pushable.patch} |  2 +-
 ...atch => 0060-Bring-back-server-name.patch} |  2 +-
 ...spenser-curse-of-binding-protection.patch} |  2 +-
 ...ement-LivingEntity-safeFallDistance.patch} |  4 +-
 ...-for-boats-to-eject-players-on-land.patch} |  2 +-
 ...h => 0064-Advancement-API-Additions.patch} |  2 +-
 ...ption-to-set-armorstand-step-height.patch} |  2 +-
 ...Implement-ItemFactory-getMonsterEgg.patch} |  2 +-
 ...0067-Alternative-Keepalive-Handling.patch} |  2 +-
 ...nt-PlayerSetSpawnerTypeWithEggEvent.patch} |  2 +-
 ...ch => 0069-Add-MonsterEggSpawnEvent.patch} |  2 +-
 ...PI.patch => 0070-Add-moon-phase-API.patch} |  2 +-
 ...-Add-getPlacementBlockData-to-World.patch} |  2 +-
 ...s.patch => 0072-Barrels-have-6-rows.patch} |  2 +-
 ...ch => 0073-Ender-chests-have-6-rows.patch} |  2 +-
 ...074-Add-5-second-tps-average-in-tps.patch} |  2 +-
 ...-permissions-for-players-on-world-c.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  2 +-
 ...I.patch => 0077-Add-more-evoker-API.patch} |  2 +-
 ...78-Add-API-for-Villager-resetOffers.patch} |  2 +-
 ...PI.patch => 0079-Add-more-llama-API.patch} |  2 +-
 ...speed-multiplier-using-values-betwe.patch} |  2 +-
 ...tch => 0081-Implement-infinite-lava.patch} |  2 +-
 ...082-Expose-getItemStack-for-Trident.patch} |  2 +-
 ...=> 0083-Despawn-egg-hatches-chicken.patch} |  2 +-
 ...eEvent-not-firing-for-all-use-cases.patch} |  2 +-
 ...ons.patch => 0085-Add-sleep-options.patch} |  2 +-
 ...86-Option-for-hay-block-fall-damage.patch} |  2 +-
 ...getPlayer-to-SkeletonHorseTrapEvent.patch} |  2 +-
 ...Add-LootableInventoryFirstFillEvent.patch} |  2 +-
 ...089-Villagers-follow-emerald-blocks.patch} |  2 +-
 ...dd-player-death-exp-control-options.patch} |  2 +-
 ... 0091-Add-permission-for-F3-N-debug.patch} |  2 +-
 ...ch => 0092-Allow-leashing-villagers.patch} |  2 +-
 ...rable-search-radius-for-villagers-t.patch} |  2 +-
 ...4-Make-lava-flow-speed-configurable.patch} |  2 +-
 ...skeleton-takes-wither-damage-option.patch} |  2 +-
 ...> 0096-UPnP-Port-Forwarding-Service.patch} |  2 +-
 ...h => 0097-Implement-EntityMoveEvent.patch} |  4 +-
 ...-disable-saving-projectiles-to-disk.patch} |  2 +-
 ...arrow-despawn-counter-fixes-MC-1257.patch} |  2 +-
 ...100-Implement-bed-explosion-options.patch} |  2 +-
 ...tch => 0101-Add-item-entity-options.patch} |  2 +-
 ...tural-spawns-per-biome-configurable.patch} |  2 +-
 ...103-Configurable-void-damage-height.patch} |  2 +-
 ...104-Fix-the-dead-lagging-the-server.patch} |  2 +-
 ...to-entity-activation-range-settings.patch} |  2 +-
 ...mand.patch => 0106-Add-mspt-command.patch} | 17 ++++-----
 ...mand.patch => 0107-Add-ping-command.patch} | 19 +++++-----
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |  2 +-
 ...> 0109-Configurable-server-mod-name.patch} |  2 +-
 ...atch => 0110-Per-World-Spawn-limits.patch} |  2 +-
 ...ould-check-if-entity-can-use-portal.patch} |  2 +-
 ...ent.patch => 0112-Add-BellRingEvent.patch} |  2 +-
 ...tch => 0113-Disable-mojang-profiler.patch} |  2 +-
 ...ch => 0114-Configurable-TPS-Catchup.patch} |  2 +-
 ...patch => 0115-Breedable-Polar-Bears.patch} |  2 +-
 ...=> 0116-Configurable-jockey-options.patch} |  2 +-
 111 files changed, 169 insertions(+), 134 deletions(-)
 create mode 100644 patches/server/0006-Fix-vanilla-command-permission-handler.patch
 rename patches/server/{0006-Host-our-own-timings.patch => 0007-Host-our-own-timings.patch} (92%)
 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} (98%)
 rename patches/server/{0009-Disable-outdated-build-check.patch => 0010-Disable-outdated-build-check.patch} (94%)
 rename patches/server/{0010-Add-obfhelpers-for-plugin-use.patch => 0011-Add-obfhelpers-for-plugin-use.patch} (97%)
 rename patches/server/{0011-Silk-touch-spawners.patch => 0012-Silk-touch-spawners.patch} (98%)
 rename patches/server/{0012-Give-giants-AI.patch => 0013-Give-giants-AI.patch} (99%)
 rename patches/server/{0013-Illusioners-AI-settings.patch => 0014-Illusioners-AI-settings.patch} (97%)
 rename patches/server/{0014-Zombie-horse-naturally-spawn.patch => 0015-Zombie-horse-naturally-spawn.patch} (97%)
 rename patches/server/{0015-Charged-creeper-naturally-spawn.patch => 0016-Charged-creeper-naturally-spawn.patch} (97%)
 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} (98%)
 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} (99%)
 rename patches/server/{0020-Fix-cow-rotation-when-shearing-mooshroom.patch => 0021-Fix-cow-rotation-when-shearing-mooshroom.patch} (95%)
 rename patches/server/{0021-Pigs-give-saddle-back.patch => 0022-Pigs-give-saddle-back.patch} (97%)
 rename patches/server/{0022-Phantoms-do-not-spawn-on-creative-players.patch => 0023-Phantoms-do-not-spawn-on-creative-players.patch} (97%)
 rename patches/server/{0023-Phantoms-only-attack-insomniacs.patch => 0024-Phantoms-only-attack-insomniacs.patch} (98%)
 rename patches/server/{0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0025-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (99%)
 rename patches/server/{0025-Snowman-drop-and-put-back-pumpkin.patch => 0026-Snowman-drop-and-put-back-pumpkin.patch} (98%)
 rename patches/server/{0026-Ender-dragon-always-drop-egg.patch => 0027-Ender-dragon-always-drop-egg.patch} (97%)
 rename patches/server/{0027-Ender-dragon-always-drop-full-exp.patch => 0028-Ender-dragon-always-drop-full-exp.patch} (96%)
 rename patches/server/{0028-Signs-editable-on-right-click.patch => 0029-Signs-editable-on-right-click.patch} (97%)
 rename patches/server/{0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (94%)
 rename patches/server/{0030-Add-turtle-egg-block-options-fixes-MC-168772.patch => 0031-Add-turtle-egg-block-options-fixes-MC-168772.patch} (97%)
 rename patches/server/{0031-Make-Iron-Golems-Swim.patch => 0032-Make-Iron-Golems-Swim.patch} (97%)
 rename patches/server/{0032-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0033-Allow-soil-to-moisten-from-water-directly-under-it.patch} (97%)
 rename patches/server/{0033-Controllable-Minecarts.patch => 0034-Controllable-Minecarts.patch} (99%)
 rename patches/server/{0034-Signs-allow-color-codes.patch => 0035-Signs-allow-color-codes.patch} (98%)
 rename patches/server/{0035-Campfires-have-regen-effect.patch => 0036-Campfires-have-regen-effect.patch} (99%)
 rename patches/server/{0036-Disable-loot-drops-on-death-by-cramming.patch => 0037-Disable-loot-drops-on-death-by-cramming.patch} (96%)
 rename patches/server/{0037-Campfires-burn-out-in-rain.patch => 0038-Campfires-burn-out-in-rain.patch} (98%)
 rename patches/server/{0038-Campfires-should-fall-with-gravity.patch => 0039-Campfires-should-fall-with-gravity.patch} (98%)
 rename patches/server/{0039-Dont-send-useless-entity-packets.patch => 0040-Dont-send-useless-entity-packets.patch} (98%)
 rename patches/server/{0040-Fix-item-position-desync-MC-4.patch => 0041-Fix-item-position-desync-MC-4.patch} (98%)
 rename patches/server/{0041-Fix-pig-zombies-MC-56653.patch => 0042-Fix-pig-zombies-MC-56653.patch} (98%)
 rename patches/server/{0042-Implement-AFK-API.patch => 0043-Implement-AFK-API.patch} (99%)
 rename patches/server/{0043-Option-to-toggle-milk-curing-bad-omen.patch => 0044-Option-to-toggle-milk-curing-bad-omen.patch} (97%)
 rename patches/server/{0044-Mending-mends-most-damages-equipment-first.patch => 0045-Mending-mends-most-damages-equipment-first.patch} (98%)
 rename patches/server/{0045-Tulips-change-fox-type.patch => 0046-Tulips-change-fox-type.patch} (98%)
 rename patches/server/{0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch => 0047-Implement-a-hard-limit-for-pillager-outpost-spawns.patch} (97%)
 rename patches/server/{0047-Make-the-GUI-better.patch => 0048-Make-the-GUI-better.patch} (99%)
 rename patches/server/{0048-Players-should-not-cram-to-death.patch => 0049-Players-should-not-cram-to-death.patch} (91%)
 rename patches/server/{0049-Add-EntityPortalReadyEvent.patch => 0050-Add-EntityPortalReadyEvent.patch} (99%)
 rename patches/server/{0050-Implement-elytra-settings.patch => 0051-Implement-elytra-settings.patch} (98%)
 rename patches/server/{0051-Add-tick-times-API.patch => 0052-Add-tick-times-API.patch} (98%)
 rename patches/server/{0052-Add-blacklist-option-for-grindstone.patch => 0053-Add-blacklist-option-for-grindstone.patch} (98%)
 rename patches/server/{0053-Implement-lagging-threshold.patch => 0054-Implement-lagging-threshold.patch} (97%)
 rename patches/server/{0054-Implement-configurable-villager-brain-ticks.patch => 0055-Implement-configurable-villager-brain-ticks.patch} (98%)
 rename patches/server/{0055-Add-option-for-zombies-targetting-turtle-eggs.patch => 0056-Add-option-for-zombies-targetting-turtle-eggs.patch} (97%)
 rename patches/server/{0056-Implement-bamboo-growth-settings.patch => 0057-Implement-bamboo-growth-settings.patch} (98%)
 rename patches/server/{0057-Climbing-should-not-bypass-cramming-gamerule.patch => 0058-Climbing-should-not-bypass-cramming-gamerule.patch} (99%)
 rename patches/server/{0058-Option-for-slimes-not-pushable.patch => 0059-Option-for-slimes-not-pushable.patch} (97%)
 rename patches/server/{0059-Bring-back-server-name.patch => 0060-Bring-back-server-name.patch} (96%)
 rename patches/server/{0060-Dispenser-curse-of-binding-protection.patch => 0061-Dispenser-curse-of-binding-protection.patch} (98%)
 rename patches/server/{0061-Implement-LivingEntity-safeFallDistance.patch => 0062-Implement-LivingEntity-safeFallDistance.patch} (97%)
 rename patches/server/{0062-Add-option-for-boats-to-eject-players-on-land.patch => 0063-Add-option-for-boats-to-eject-players-on-land.patch} (97%)
 rename patches/server/{0063-Advancement-API-Additions.patch => 0064-Advancement-API-Additions.patch} (99%)
 rename patches/server/{0064-Add-option-to-set-armorstand-step-height.patch => 0065-Add-option-to-set-armorstand-step-height.patch} (97%)
 rename patches/server/{0065-Implement-ItemFactory-getMonsterEgg.patch => 0066-Implement-ItemFactory-getMonsterEgg.patch} (97%)
 rename patches/server/{0066-Alternative-Keepalive-Handling.patch => 0067-Alternative-Keepalive-Handling.patch} (98%)
 rename patches/server/{0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch => 0068-Implement-PlayerSetSpawnerTypeWithEggEvent.patch} (97%)
 rename patches/server/{0068-Add-MonsterEggSpawnEvent.patch => 0069-Add-MonsterEggSpawnEvent.patch} (98%)
 rename patches/server/{0069-Add-moon-phase-API.patch => 0070-Add-moon-phase-API.patch} (94%)
 rename patches/server/{0070-Add-getPlacementBlockData-to-World.patch => 0071-Add-getPlacementBlockData-to-World.patch} (98%)
 rename patches/server/{0071-Barrels-have-6-rows.patch => 0072-Barrels-have-6-rows.patch} (98%)
 rename patches/server/{0072-Ender-chests-have-6-rows.patch => 0073-Ender-chests-have-6-rows.patch} (98%)
 rename patches/server/{0073-Add-5-second-tps-average-in-tps.patch => 0074-Add-5-second-tps-average-in-tps.patch} (98%)
 rename patches/server/{0074-Don-t-recalculate-permissions-for-players-on-world-c.patch => 0075-Don-t-recalculate-permissions-for-players-on-world-c.patch} (98%)
 rename patches/server/{0075-Add-playPickupItemAnimation-to-LivingEntity.patch => 0076-Add-playPickupItemAnimation-to-LivingEntity.patch} (94%)
 rename patches/server/{0076-Add-more-evoker-API.patch => 0077-Add-more-evoker-API.patch} (97%)
 rename patches/server/{0077-Add-API-for-Villager-resetOffers.patch => 0078-Add-API-for-Villager-resetOffers.patch} (97%)
 rename patches/server/{0078-Add-more-llama-API.patch => 0079-Add-more-llama-API.patch} (99%)
 rename patches/server/{0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch => 0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch} (95%)
 rename patches/server/{0080-Implement-infinite-lava.patch => 0081-Implement-infinite-lava.patch} (98%)
 rename patches/server/{0081-Expose-getItemStack-for-Trident.patch => 0082-Expose-getItemStack-for-Trident.patch} (96%)
 rename patches/server/{0082-Despawn-egg-hatches-chicken.patch => 0083-Despawn-egg-hatches-chicken.patch} (98%)
 rename patches/server/{0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (97%)
 rename patches/server/{0084-Add-sleep-options.patch => 0085-Add-sleep-options.patch} (98%)
 rename patches/server/{0085-Option-for-hay-block-fall-damage.patch => 0086-Option-for-hay-block-fall-damage.patch} (96%)
 rename patches/server/{0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (96%)
 rename patches/server/{0087-Add-LootableInventoryFirstFillEvent.patch => 0088-Add-LootableInventoryFirstFillEvent.patch} (97%)
 rename patches/server/{0088-Villagers-follow-emerald-blocks.patch => 0089-Villagers-follow-emerald-blocks.patch} (98%)
 rename patches/server/{0089-Add-player-death-exp-control-options.patch => 0090-Add-player-death-exp-control-options.patch} (98%)
 rename patches/server/{0090-Add-permission-for-F3-N-debug.patch => 0091-Add-permission-for-F3-N-debug.patch} (93%)
 rename patches/server/{0091-Allow-leashing-villagers.patch => 0092-Allow-leashing-villagers.patch} (98%)
 rename patches/server/{0092-Implement-configurable-search-radius-for-villagers-t.patch => 0093-Implement-configurable-search-radius-for-villagers-t.patch} (97%)
 rename patches/server/{0093-Make-lava-flow-speed-configurable.patch => 0094-Make-lava-flow-speed-configurable.patch} (97%)
 rename patches/server/{0094-Add-wither-skeleton-takes-wither-damage-option.patch => 0095-Add-wither-skeleton-takes-wither-damage-option.patch} (97%)
 rename patches/server/{0095-UPnP-Port-Forwarding-Service.patch => 0096-UPnP-Port-Forwarding-Service.patch} (99%)
 rename patches/server/{0096-Implement-EntityMoveEvent.patch => 0097-Implement-EntityMoveEvent.patch} (94%)
 rename patches/server/{0097-Add-option-to-disable-saving-projectiles-to-disk.patch => 0098-Add-option-to-disable-saving-projectiles-to-disk.patch} (99%)
 rename patches/server/{0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch => 0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch} (96%)
 rename patches/server/{0099-Implement-bed-explosion-options.patch => 0100-Implement-bed-explosion-options.patch} (98%)
 rename patches/server/{0100-Add-item-entity-options.patch => 0101-Add-item-entity-options.patch} (98%)
 rename patches/server/{0101-Make-natural-spawns-per-biome-configurable.patch => 0102-Make-natural-spawns-per-biome-configurable.patch} (99%)
 rename patches/server/{0102-Configurable-void-damage-height.patch => 0103-Configurable-void-damage-height.patch} (97%)
 rename patches/server/{0103-Fix-the-dead-lagging-the-server.patch => 0104-Fix-the-dead-lagging-the-server.patch} (96%)
 rename patches/server/{0104-Add-flying-mobs-to-entity-activation-range-settings.patch => 0105-Add-flying-mobs-to-entity-activation-range-settings.patch} (98%)
 rename patches/server/{0105-Add-mspt-command.patch => 0106-Add-mspt-command.patch} (91%)
 rename patches/server/{0106-Add-ping-command.patch => 0107-Add-ping-command.patch} (93%)
 rename patches/server/{0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0108-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (97%)
 rename patches/server/{0108-Configurable-server-mod-name.patch => 0109-Configurable-server-mod-name.patch} (96%)
 rename patches/server/{0109-Per-World-Spawn-limits.patch => 0110-Per-World-Spawn-limits.patch} (97%)
 rename patches/server/{0110-End-gateway-should-check-if-entity-can-use-portal.patch => 0111-End-gateway-should-check-if-entity-can-use-portal.patch} (94%)
 rename patches/server/{0111-Add-BellRingEvent.patch => 0112-Add-BellRingEvent.patch} (97%)
 rename patches/server/{0112-Disable-mojang-profiler.patch => 0113-Disable-mojang-profiler.patch} (99%)
 rename patches/server/{0113-Configurable-TPS-Catchup.patch => 0114-Configurable-TPS-Catchup.patch} (97%)
 rename patches/server/{0114-Breedable-Polar-Bears.patch => 0115-Breedable-Polar-Bears.patch} (98%)
 rename patches/server/{0115-Configurable-jockey-options.patch => 0116-Configurable-jockey-options.patch} (99%)

diff --git a/patches/server/0006-Fix-vanilla-command-permission-handler.patch b/patches/server/0006-Fix-vanilla-command-permission-handler.patch
new file mode 100644
index 000000000..ae4fa0db1
--- /dev/null
+++ b/patches/server/0006-Fix-vanilla-command-permission-handler.patch
@@ -0,0 +1,37 @@
+From c9d297c494ef23fad49aca61b4fb0c9228a411f7 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
+
+---
+ src/main/java/com/mojang/brigadier/tree/CommandNode.java         | 1 +
+ .../org/bukkit/craftbukkit/command/VanillaCommandWrapper.java    | 1 +
+ 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
+--- 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>> {
+     private final RedirectModifier<S> modifier;
+     private final boolean forks;
+     private Command<S> command;
++    private String permission = null; public String getPermission() { return permission; } public void setPermission(String permission) { this.permission = permission; } // Purpur
+     // CraftBukkit start
+     public void removeCommand(String name) {
+         children.remove(name);
+diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+index f344614600..8d89e671eb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
++++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+     }
+ 
+     public static String getPermission(CommandNode<CommandListenerWrapper> vanillaCommand) {
++        if (vanillaCommand.getPermission() != null) return vanillaCommand.getPermission(); // Purpur
+         return "minecraft.command." + ((vanillaCommand.getRedirect() == null) ? vanillaCommand.getName() : vanillaCommand.getRedirect().getName());
+     }
+ 
+-- 
+2.24.0
+
diff --git a/patches/server/0006-Host-our-own-timings.patch b/patches/server/0007-Host-our-own-timings.patch
similarity index 92%
rename from patches/server/0006-Host-our-own-timings.patch
rename to patches/server/0007-Host-our-own-timings.patch
index 9b1d7b320..0372600f2 100644
--- a/patches/server/0006-Host-our-own-timings.patch
+++ b/patches/server/0007-Host-our-own-timings.patch
@@ -1,4 +1,4 @@
-From 5a2d0e96173a5c2e25a5beca02725bf4d8aef7e3 Mon Sep 17 00:00:00 2001
+From 96c1153195c5b212dd3d2b6d44cbec160e95a941 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
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 f1b55ff8f..0cd797c8b 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -1,4 +1,4 @@
-From 6c50e23eae669929d0e556f98d3976f14defe339 Mon Sep 17 00:00:00 2001
+From c8dcf89a9b9727f1fbc8ca37fb1bb7ecf7407ff6 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
diff --git a/patches/server/0008-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
similarity index 98%
rename from patches/server/0008-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0009-Logger-settings-suppressing-pointless-logs.patch
index bbf429b4d..2ab4b6618 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 4a55a795e79248789fd711d7793d6c3d62d7e100 Mon Sep 17 00:00:00 2001
+From a7d9029cef2ec6fec59e82889051368acc664950 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)
diff --git a/patches/server/0009-Disable-outdated-build-check.patch b/patches/server/0010-Disable-outdated-build-check.patch
similarity index 94%
rename from patches/server/0009-Disable-outdated-build-check.patch
rename to patches/server/0010-Disable-outdated-build-check.patch
index 2eee9f5e7..b1be24de0 100644
--- a/patches/server/0009-Disable-outdated-build-check.patch
+++ b/patches/server/0010-Disable-outdated-build-check.patch
@@ -1,4 +1,4 @@
-From 04db975c6ba253f192a714ed54713d701b799180 Mon Sep 17 00:00:00 2001
+From bafd106ba1a149db0f474c140401c741403f68b6 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
diff --git a/patches/server/0010-Add-obfhelpers-for-plugin-use.patch b/patches/server/0011-Add-obfhelpers-for-plugin-use.patch
similarity index 97%
rename from patches/server/0010-Add-obfhelpers-for-plugin-use.patch
rename to patches/server/0011-Add-obfhelpers-for-plugin-use.patch
index 4f65ab12c..9533d8840 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 2cc54bc467b167771d2b2ce9d5f5401efc076e93 Mon Sep 17 00:00:00 2001
+From 32922b6b32b6694ebe0d1f69a021864d40bd7db0 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
diff --git a/patches/server/0011-Silk-touch-spawners.patch b/patches/server/0012-Silk-touch-spawners.patch
similarity index 98%
rename from patches/server/0011-Silk-touch-spawners.patch
rename to patches/server/0012-Silk-touch-spawners.patch
index 80a19b8bf..0d0c3c285 100644
--- a/patches/server/0011-Silk-touch-spawners.patch
+++ b/patches/server/0012-Silk-touch-spawners.patch
@@ -1,4 +1,4 @@
-From 0f8bc1ca962afee61c0d75d6fb9441174e5beac3 Mon Sep 17 00:00:00 2001
+From ca711cf83f6e21f469d2ca3df58dcfbe7dd71dc7 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
diff --git a/patches/server/0012-Give-giants-AI.patch b/patches/server/0013-Give-giants-AI.patch
similarity index 99%
rename from patches/server/0012-Give-giants-AI.patch
rename to patches/server/0013-Give-giants-AI.patch
index d95201bb9..cf29fdb13 100644
--- a/patches/server/0012-Give-giants-AI.patch
+++ b/patches/server/0013-Give-giants-AI.patch
@@ -1,4 +1,4 @@
-From 68aa291efeee7deee00f138837f8657216e05a4b Mon Sep 17 00:00:00 2001
+From 3bdfa2ee5b553f32da083b9420d71540409bab28 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
diff --git a/patches/server/0013-Illusioners-AI-settings.patch b/patches/server/0014-Illusioners-AI-settings.patch
similarity index 97%
rename from patches/server/0013-Illusioners-AI-settings.patch
rename to patches/server/0014-Illusioners-AI-settings.patch
index 42904ceec..8fbd2ba23 100644
--- a/patches/server/0013-Illusioners-AI-settings.patch
+++ b/patches/server/0014-Illusioners-AI-settings.patch
@@ -1,4 +1,4 @@
-From 0de182cc97edd94a0e19a585bc7315e97eed4560 Mon Sep 17 00:00:00 2001
+From 67ff8a43b84d1bbfd7ac8af7a088cb5e08d04dcb 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
diff --git a/patches/server/0014-Zombie-horse-naturally-spawn.patch b/patches/server/0015-Zombie-horse-naturally-spawn.patch
similarity index 97%
rename from patches/server/0014-Zombie-horse-naturally-spawn.patch
rename to patches/server/0015-Zombie-horse-naturally-spawn.patch
index d1a296082..f52d1a5d0 100644
--- a/patches/server/0014-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0015-Zombie-horse-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From 9fad2a85490a3dbb8b75b680ea97fe5e91f65364 Mon Sep 17 00:00:00 2001
+From 36ae1b2f8647646db83f34e9166df39faab626b5 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Zombie horse naturally spawn
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 92b79e3e71..f0a5d82a12 100644
+index 9fc38244aa..ff7ea5bed6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -922,12 +922,18 @@ public class WorldServer extends World {
diff --git a/patches/server/0015-Charged-creeper-naturally-spawn.patch b/patches/server/0016-Charged-creeper-naturally-spawn.patch
similarity index 97%
rename from patches/server/0015-Charged-creeper-naturally-spawn.patch
rename to patches/server/0016-Charged-creeper-naturally-spawn.patch
index f86f4daf4..20abd7fcc 100644
--- a/patches/server/0015-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0016-Charged-creeper-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From 99f25236954bb1f5ebf4259624620d9f2d343e16 Mon Sep 17 00:00:00 2001
+From 4aa3f2b108eb419de9510e2142bf4bf79d1a1a30 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
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 ab3fef9a4..d61b0d7c3 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 ece55f9066d93e552bcc71ecf02e88ef0695209e Mon Sep 17 00:00:00 2001
+From dfba5d4730df31c059b0742500b783279083a145 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 98%
rename from patches/server/0017-Cat-spawning-options.patch
rename to patches/server/0018-Cat-spawning-options.patch
index 94bb23645..79a6785de 100644
--- a/patches/server/0017-Cat-spawning-options.patch
+++ b/patches/server/0018-Cat-spawning-options.patch
@@ -1,4 +1,4 @@
-From a540d48b443418c6af9702016b98500754643999 Mon Sep 17 00:00:00 2001
+From 7775d7e381f2ad46b4bb1baf61d65f3162ff452f 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
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 d01086301..675169f53 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 09f9bab4945792e037ea709f8bb04d4d6e28563a Mon Sep 17 00:00:00 2001
+From 2b0602f9ea4430b1733f36fb165cb26d0f46b9ad 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 99%
rename from patches/server/0019-Cows-eat-mushrooms.patch
rename to patches/server/0020-Cows-eat-mushrooms.patch
index cef9d66d6..fbba54ec6 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0020-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 61cd16d1895e386eb39d43f16f533c6edd4508b2 Mon Sep 17 00:00:00 2001
+From c449389b829d954ca4f717d3466e6d3d2241b46b 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
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 95%
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 ff5bd6846..823363591 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 bb3fb730b87283229a93f29a8dbf9216d579773a Mon Sep 17 00:00:00 2001
+From 6f98b0f4a463d451d6bdfb739607a3fc189b78f9 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
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 c75c26cde..6d7b43c26 100644
--- a/patches/server/0021-Pigs-give-saddle-back.patch
+++ b/patches/server/0022-Pigs-give-saddle-back.patch
@@ -1,4 +1,4 @@
-From 9d007d6a04a298735ff3205f765d485f53e5187b Mon Sep 17 00:00:00 2001
+From 3cf0d17019dcae1a9ae231ea41cb10a7b6fbfaaa 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-do-not-spawn-on-creative-players.patch b/patches/server/0023-Phantoms-do-not-spawn-on-creative-players.patch
similarity index 97%
rename from patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch
rename to patches/server/0023-Phantoms-do-not-spawn-on-creative-players.patch
index 6371f26d0..006bbbab7 100644
--- a/patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch
+++ b/patches/server/0023-Phantoms-do-not-spawn-on-creative-players.patch
@@ -1,4 +1,4 @@
-From ccf03560068f393b01dec6381ef554a398fcca8b Mon Sep 17 00:00:00 2001
+From fd7c18ec55b8ff36d2209cff1c2e08212630b1a3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 18 May 2019 16:59:52 -0500
 Subject: [PATCH] Phantoms do not spawn on creative players
diff --git a/patches/server/0023-Phantoms-only-attack-insomniacs.patch b/patches/server/0024-Phantoms-only-attack-insomniacs.patch
similarity index 98%
rename from patches/server/0023-Phantoms-only-attack-insomniacs.patch
rename to patches/server/0024-Phantoms-only-attack-insomniacs.patch
index a9a8d3e5c..bad0f62bc 100644
--- a/patches/server/0023-Phantoms-only-attack-insomniacs.patch
+++ b/patches/server/0024-Phantoms-only-attack-insomniacs.patch
@@ -1,4 +1,4 @@
-From 6fba0afbcbb31b1a7ae57826b8482e80c774143f Mon Sep 17 00:00:00 2001
+From 93c7052db9377ed3c1f0be96966b48eae3978f3e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 20:33:41 -0600
 Subject: [PATCH] Phantoms only attack insomniacs
diff --git a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0025-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 99%
rename from patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0025-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 4c48b3c89..0159d4e82 100644
--- a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0025-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From 629d97330a5672e67b5f98d999542b6d3bd3f080 Mon Sep 17 00:00:00 2001
+From 33d5227e6db50db4f454d82293843bf0e1e6c13e 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
diff --git a/patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0026-Snowman-drop-and-put-back-pumpkin.patch
similarity index 98%
rename from patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0026-Snowman-drop-and-put-back-pumpkin.patch
index 0a9475f51..bf0689e71 100644
--- a/patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0026-Snowman-drop-and-put-back-pumpkin.patch
@@ -1,4 +1,4 @@
-From 225337ac29d2feab321dbd16378858d580390d34 Mon Sep 17 00:00:00 2001
+From 90f2892d4f52c6fdea92b79d33767eeb83b37f32 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
diff --git a/patches/server/0026-Ender-dragon-always-drop-egg.patch b/patches/server/0027-Ender-dragon-always-drop-egg.patch
similarity index 97%
rename from patches/server/0026-Ender-dragon-always-drop-egg.patch
rename to patches/server/0027-Ender-dragon-always-drop-egg.patch
index 4c2db5a66..e488d7333 100644
--- a/patches/server/0026-Ender-dragon-always-drop-egg.patch
+++ b/patches/server/0027-Ender-dragon-always-drop-egg.patch
@@ -1,4 +1,4 @@
-From e9271db5618f471d60085219f5a534a3b06947a0 Mon Sep 17 00:00:00 2001
+From 428b30a500d0e40c8748e2bcc3d2075e23b18741 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
diff --git a/patches/server/0027-Ender-dragon-always-drop-full-exp.patch b/patches/server/0028-Ender-dragon-always-drop-full-exp.patch
similarity index 96%
rename from patches/server/0027-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0028-Ender-dragon-always-drop-full-exp.patch
index fb9d4e45a..f64b0ec72 100644
--- a/patches/server/0027-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0028-Ender-dragon-always-drop-full-exp.patch
@@ -1,4 +1,4 @@
-From 65cef54fdf6cbcbaba7af01302c6afca847bb41a Mon Sep 17 00:00:00 2001
+From f61594530387b460372417127c3afd3ecc467129 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 1b523b0dae..fcfa4715c6 100644
+index 136f6b9ec8..06dedce18d 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 {
diff --git a/patches/server/0028-Signs-editable-on-right-click.patch b/patches/server/0029-Signs-editable-on-right-click.patch
similarity index 97%
rename from patches/server/0028-Signs-editable-on-right-click.patch
rename to patches/server/0029-Signs-editable-on-right-click.patch
index bdc893a9b..b97320458 100644
--- a/patches/server/0028-Signs-editable-on-right-click.patch
+++ b/patches/server/0029-Signs-editable-on-right-click.patch
@@ -1,4 +1,4 @@
-From e5ea7012426b87fd722637994c0e6a2cda21a44f Mon Sep 17 00:00:00 2001
+From 2a3cc64bf66f8728b7d8e826613ecdb77d33957f 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
diff --git a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 94%
rename from patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index 02ed63351..0373005df 100644
--- a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -1,4 +1,4 @@
-From 27dbb306c7a2771ec35c87c4632a61a16e02f1c6 Mon Sep 17 00:00:00 2001
+From 40dce3660164737a4c72674ce56358a981aba14d 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
diff --git a/patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch b/patches/server/0031-Add-turtle-egg-block-options-fixes-MC-168772.patch
similarity index 97%
rename from patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch
rename to patches/server/0031-Add-turtle-egg-block-options-fixes-MC-168772.patch
index f8f154099..d07856a03 100644
--- a/patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch
+++ b/patches/server/0031-Add-turtle-egg-block-options-fixes-MC-168772.patch
@@ -1,4 +1,4 @@
-From 8f7d5e29a85cd3270fa622fb6e5cbd9dd19f0a23 Mon Sep 17 00:00:00 2001
+From a96548d4bd61da1117fd783abc6a6dc5e5dcc7ea Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] Add turtle egg block options - fixes MC-168772
diff --git a/patches/server/0031-Make-Iron-Golems-Swim.patch b/patches/server/0032-Make-Iron-Golems-Swim.patch
similarity index 97%
rename from patches/server/0031-Make-Iron-Golems-Swim.patch
rename to patches/server/0032-Make-Iron-Golems-Swim.patch
index fe2e5695f..a5f1d4fe6 100644
--- a/patches/server/0031-Make-Iron-Golems-Swim.patch
+++ b/patches/server/0032-Make-Iron-Golems-Swim.patch
@@ -1,4 +1,4 @@
-From 8b7a72b5fc6b8facf08e950b362d6117f9bf2ae7 Mon Sep 17 00:00:00 2001
+From 6a1013b967b978638a8c62c107cfb593e27ef5f8 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
diff --git a/patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0033-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 97%
rename from patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0033-Allow-soil-to-moisten-from-water-directly-under-it.patch
index d4c102cd6..06e49c4ef 100644
--- a/patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0033-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -1,4 +1,4 @@
-From a3826309f40a5b7e8a9591f9f5989d1e71f70875 Mon Sep 17 00:00:00 2001
+From 492bb5a210f19b834f9c8839bbcd74bb382bbdbe 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
diff --git a/patches/server/0033-Controllable-Minecarts.patch b/patches/server/0034-Controllable-Minecarts.patch
similarity index 99%
rename from patches/server/0033-Controllable-Minecarts.patch
rename to patches/server/0034-Controllable-Minecarts.patch
index a621117b1..1449b2c7b 100644
--- a/patches/server/0033-Controllable-Minecarts.patch
+++ b/patches/server/0034-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From 9b4c2f18f0ae8e7daae3f3837755b302d4d7c807 Mon Sep 17 00:00:00 2001
+From b6bca5505339a781904390d62103ae378f35959d 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
diff --git a/patches/server/0034-Signs-allow-color-codes.patch b/patches/server/0035-Signs-allow-color-codes.patch
similarity index 98%
rename from patches/server/0034-Signs-allow-color-codes.patch
rename to patches/server/0035-Signs-allow-color-codes.patch
index f1433e0a2..b557d58b3 100644
--- a/patches/server/0034-Signs-allow-color-codes.patch
+++ b/patches/server/0035-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From b7e2398a24b0f0fd210fd49fe0f6f87971d5f715 Mon Sep 17 00:00:00 2001
+From 537601232a9526aaf1a041995d8bd8a69090a6f0 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
diff --git a/patches/server/0035-Campfires-have-regen-effect.patch b/patches/server/0036-Campfires-have-regen-effect.patch
similarity index 99%
rename from patches/server/0035-Campfires-have-regen-effect.patch
rename to patches/server/0036-Campfires-have-regen-effect.patch
index f7ddc1e55..df77c7af6 100644
--- a/patches/server/0035-Campfires-have-regen-effect.patch
+++ b/patches/server/0036-Campfires-have-regen-effect.patch
@@ -1,4 +1,4 @@
-From f05c9a18cccc10f3a8a00f707e6b1fe46d33e0ee Mon Sep 17 00:00:00 2001
+From 1d6c6b9ba8bb20d6671d129f2a85af98075ca63c 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
diff --git a/patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0037-Disable-loot-drops-on-death-by-cramming.patch
similarity index 96%
rename from patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0037-Disable-loot-drops-on-death-by-cramming.patch
index 2f5f077d8..b7922e8f1 100644
--- a/patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0037-Disable-loot-drops-on-death-by-cramming.patch
@@ -1,4 +1,4 @@
-From 53548208fe3fefe1ed7890937cf10686200f2249 Mon Sep 17 00:00:00 2001
+From 7e93b9b4f444561df55d15305d42ae0740b3f60b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 106fb5c027..0310e4ddd1 100644
+index 519b3499f6..6305b647dd 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 {
diff --git a/patches/server/0037-Campfires-burn-out-in-rain.patch b/patches/server/0038-Campfires-burn-out-in-rain.patch
similarity index 98%
rename from patches/server/0037-Campfires-burn-out-in-rain.patch
rename to patches/server/0038-Campfires-burn-out-in-rain.patch
index fb9d25ac4..01bd86f4d 100644
--- a/patches/server/0037-Campfires-burn-out-in-rain.patch
+++ b/patches/server/0038-Campfires-burn-out-in-rain.patch
@@ -1,4 +1,4 @@
-From 05886144a600b5aaffa1f451d61ae74d1e86f8d8 Mon Sep 17 00:00:00 2001
+From a59c3064035c3df486f874d3daedf5d22a5d7402 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
diff --git a/patches/server/0038-Campfires-should-fall-with-gravity.patch b/patches/server/0039-Campfires-should-fall-with-gravity.patch
similarity index 98%
rename from patches/server/0038-Campfires-should-fall-with-gravity.patch
rename to patches/server/0039-Campfires-should-fall-with-gravity.patch
index 460008f6c..36c3e085e 100644
--- a/patches/server/0038-Campfires-should-fall-with-gravity.patch
+++ b/patches/server/0039-Campfires-should-fall-with-gravity.patch
@@ -1,4 +1,4 @@
-From 36c0c6269cb8415a955b57567571dfa46ca7b69a Mon Sep 17 00:00:00 2001
+From 0c010ec5793c5892eff15df60f4828321572a275 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
diff --git a/patches/server/0039-Dont-send-useless-entity-packets.patch b/patches/server/0040-Dont-send-useless-entity-packets.patch
similarity index 98%
rename from patches/server/0039-Dont-send-useless-entity-packets.patch
rename to patches/server/0040-Dont-send-useless-entity-packets.patch
index d19466a56..630dd5dd4 100644
--- a/patches/server/0039-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0040-Dont-send-useless-entity-packets.patch
@@ -1,4 +1,4 @@
-From 7b2d402156cbc1ae5b09c6696e4b0483db5b8201 Mon Sep 17 00:00:00 2001
+From 7c3c4905df7a9c229444538018d4fb6fc8a747de 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
diff --git a/patches/server/0040-Fix-item-position-desync-MC-4.patch b/patches/server/0041-Fix-item-position-desync-MC-4.patch
similarity index 98%
rename from patches/server/0040-Fix-item-position-desync-MC-4.patch
rename to patches/server/0041-Fix-item-position-desync-MC-4.patch
index edce31934..96f7b60da 100644
--- a/patches/server/0040-Fix-item-position-desync-MC-4.patch
+++ b/patches/server/0041-Fix-item-position-desync-MC-4.patch
@@ -1,4 +1,4 @@
-From 00b412de367fcc162b799d0758d4df1346e42cf8 Mon Sep 17 00:00:00 2001
+From 9634dacfa4e2c9652b1c8daec2e1bb56128c6a03 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] Fix item position desync (MC-4)
diff --git a/patches/server/0041-Fix-pig-zombies-MC-56653.patch b/patches/server/0042-Fix-pig-zombies-MC-56653.patch
similarity index 98%
rename from patches/server/0041-Fix-pig-zombies-MC-56653.patch
rename to patches/server/0042-Fix-pig-zombies-MC-56653.patch
index 171d09ce5..23af2cf48 100644
--- a/patches/server/0041-Fix-pig-zombies-MC-56653.patch
+++ b/patches/server/0042-Fix-pig-zombies-MC-56653.patch
@@ -1,4 +1,4 @@
-From c8392bbe6cbc94fcdc12ba2737a58784e52b6260 Mon Sep 17 00:00:00 2001
+From d0750ec9986f47d706ab554cfef2e71a2872a583 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
diff --git a/patches/server/0042-Implement-AFK-API.patch b/patches/server/0043-Implement-AFK-API.patch
similarity index 99%
rename from patches/server/0042-Implement-AFK-API.patch
rename to patches/server/0043-Implement-AFK-API.patch
index b597eb3d8..884060ff9 100644
--- a/patches/server/0042-Implement-AFK-API.patch
+++ b/patches/server/0043-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 8ffed463c036969e9fd64b8caa10775caca14d40 Mon Sep 17 00:00:00 2001
+From 43d56e6918f00613c3080ba47d62b456d54bd0eb 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
diff --git a/patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 97%
rename from patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
index 7ddb66fb5..59c1af5be 100644
--- a/patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,4 +1,4 @@
-From f41de3d2785b4c83e7b5a51e975b8634d6ef04de Mon Sep 17 00:00:00 2001
+From f513bd99c196359bba36154897149e3454782200 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
diff --git a/patches/server/0044-Mending-mends-most-damages-equipment-first.patch b/patches/server/0045-Mending-mends-most-damages-equipment-first.patch
similarity index 98%
rename from patches/server/0044-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0045-Mending-mends-most-damages-equipment-first.patch
index 8dd57b44d..2feb4de49 100644
--- a/patches/server/0044-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0045-Mending-mends-most-damages-equipment-first.patch
@@ -1,4 +1,4 @@
-From 6b74772ae63b677d751eb9453f3ace21291c6323 Mon Sep 17 00:00:00 2001
+From d66b7f10e158a98e6e39a3f849398ab2c7814e8f 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
diff --git a/patches/server/0045-Tulips-change-fox-type.patch b/patches/server/0046-Tulips-change-fox-type.patch
similarity index 98%
rename from patches/server/0045-Tulips-change-fox-type.patch
rename to patches/server/0046-Tulips-change-fox-type.patch
index a19fdeba1..fae156b4e 100644
--- a/patches/server/0045-Tulips-change-fox-type.patch
+++ b/patches/server/0046-Tulips-change-fox-type.patch
@@ -1,4 +1,4 @@
-From ad24080ee09e8252f14fc5a68b3616ed3cf68839 Mon Sep 17 00:00:00 2001
+From 2ee51ebf1719ba365b215e4cda26e22aa2a2f017 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
diff --git a/patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch b/patches/server/0047-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
similarity index 97%
rename from patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
rename to patches/server/0047-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
index e20af7cc5..0678abf87 100644
--- a/patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
+++ b/patches/server/0047-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
@@ -1,4 +1,4 @@
-From 9386f1f4856f85a8b2f2153a9419fb554734b876 Mon Sep 17 00:00:00 2001
+From 9da683f7a8c8e92308212446af2816a735d4456e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns
diff --git a/patches/server/0047-Make-the-GUI-better.patch b/patches/server/0048-Make-the-GUI-better.patch
similarity index 99%
rename from patches/server/0047-Make-the-GUI-better.patch
rename to patches/server/0048-Make-the-GUI-better.patch
index 7f7259b16..5b01ca7a3 100644
--- a/patches/server/0047-Make-the-GUI-better.patch
+++ b/patches/server/0048-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From a0f03d381a3b6ca22baa147c923d9e587d9013fa Mon Sep 17 00:00:00 2001
+From ed5264e6626cae23ba0db29b618501f3375c9f46 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
diff --git a/patches/server/0048-Players-should-not-cram-to-death.patch b/patches/server/0049-Players-should-not-cram-to-death.patch
similarity index 91%
rename from patches/server/0048-Players-should-not-cram-to-death.patch
rename to patches/server/0049-Players-should-not-cram-to-death.patch
index a0a6cdeb3..8539c09ae 100644
--- a/patches/server/0048-Players-should-not-cram-to-death.patch
+++ b/patches/server/0049-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From ca4b53ff30ee60caee8b32da17b5cd9006107f09 Mon Sep 17 00:00:00 2001
+From ef19b569e23b1f4731aec93d4489b9c116ba1889 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,7 +8,7 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 919921c2d2..3d866f038d 100644
+index b023a7b198..7a8fa39493 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1136,7 +1136,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0049-Add-EntityPortalReadyEvent.patch b/patches/server/0050-Add-EntityPortalReadyEvent.patch
similarity index 99%
rename from patches/server/0049-Add-EntityPortalReadyEvent.patch
rename to patches/server/0050-Add-EntityPortalReadyEvent.patch
index 6574a95c5..7f6ea79f2 100644
--- a/patches/server/0049-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0050-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From d0fcd4fa5e28fce81ed0b07be035d1059c3da8f3 Mon Sep 17 00:00:00 2001
+From 85ecad4a65bc33e3ab3eca3a2fc16eb9483a802a 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/0050-Implement-elytra-settings.patch b/patches/server/0051-Implement-elytra-settings.patch
similarity index 98%
rename from patches/server/0050-Implement-elytra-settings.patch
rename to patches/server/0051-Implement-elytra-settings.patch
index cf073b776..d60b3a622 100644
--- a/patches/server/0050-Implement-elytra-settings.patch
+++ b/patches/server/0051-Implement-elytra-settings.patch
@@ -1,4 +1,4 @@
-From 4a16e6e50017470a014c6689c787918f28be94ae Mon Sep 17 00:00:00 2001
+From d9c8753552395098a971ca38181e3f719743a74a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
  6 files changed, 49 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0310e4ddd1..e85a7526a2 100644
+index 6305b647dd..e9c5d39622 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2645,9 +2645,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0051-Add-tick-times-API.patch b/patches/server/0052-Add-tick-times-API.patch
similarity index 98%
rename from patches/server/0051-Add-tick-times-API.patch
rename to patches/server/0052-Add-tick-times-API.patch
index 4e4f88286..51aab07bf 100644
--- a/patches/server/0051-Add-tick-times-API.patch
+++ b/patches/server/0052-Add-tick-times-API.patch
@@ -1,4 +1,4 @@
-From b73f4489831dfc1cb1855897306c6994af205d73 Mon Sep 17 00:00:00 2001
+From 9960c7a877d58988dcf77c2aae1026c66c51d14f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:24 -0600
 Subject: [PATCH] Add tick times API
diff --git a/patches/server/0052-Add-blacklist-option-for-grindstone.patch b/patches/server/0053-Add-blacklist-option-for-grindstone.patch
similarity index 98%
rename from patches/server/0052-Add-blacklist-option-for-grindstone.patch
rename to patches/server/0053-Add-blacklist-option-for-grindstone.patch
index 72bb07037..55245db50 100644
--- a/patches/server/0052-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0053-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From 9e7184e16fdc8d638d25b1018267dd312b96d3fb Mon Sep 17 00:00:00 2001
+From 61385327f6dc36309254875961d3aa950c3f66d8 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
diff --git a/patches/server/0053-Implement-lagging-threshold.patch b/patches/server/0054-Implement-lagging-threshold.patch
similarity index 97%
rename from patches/server/0053-Implement-lagging-threshold.patch
rename to patches/server/0054-Implement-lagging-threshold.patch
index 8c3a2e6fc..5b54ef693 100644
--- a/patches/server/0053-Implement-lagging-threshold.patch
+++ b/patches/server/0054-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From c8ee2e9bea58e8d432fc993c2e2742e96dc6ad14 Mon Sep 17 00:00:00 2001
+From f0005a30763b706451fb17b9b8de034ea701cdac 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
diff --git a/patches/server/0054-Implement-configurable-villager-brain-ticks.patch b/patches/server/0055-Implement-configurable-villager-brain-ticks.patch
similarity index 98%
rename from patches/server/0054-Implement-configurable-villager-brain-ticks.patch
rename to patches/server/0055-Implement-configurable-villager-brain-ticks.patch
index a1b3c5ab0..58b7bc460 100644
--- a/patches/server/0054-Implement-configurable-villager-brain-ticks.patch
+++ b/patches/server/0055-Implement-configurable-villager-brain-ticks.patch
@@ -1,4 +1,4 @@
-From e86d8824d8533d1d4bfc7520ff926b6376907161 Mon Sep 17 00:00:00 2001
+From 69283b5b511381b097d9840cbe13195b62ac62b6 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/0055-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0056-Add-option-for-zombies-targetting-turtle-eggs.patch
similarity index 97%
rename from patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch
rename to patches/server/0056-Add-option-for-zombies-targetting-turtle-eggs.patch
index d60abdbcf..ae8e8ac3a 100644
--- a/patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch
+++ b/patches/server/0056-Add-option-for-zombies-targetting-turtle-eggs.patch
@@ -1,4 +1,4 @@
-From 53321659ee1eaea04df841b1c068ffa20c69eee6 Mon Sep 17 00:00:00 2001
+From eef58ad830c673971d791318e5c483176eedd4d9 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
diff --git a/patches/server/0056-Implement-bamboo-growth-settings.patch b/patches/server/0057-Implement-bamboo-growth-settings.patch
similarity index 98%
rename from patches/server/0056-Implement-bamboo-growth-settings.patch
rename to patches/server/0057-Implement-bamboo-growth-settings.patch
index fa059553f..e46ac0b4b 100644
--- a/patches/server/0056-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0057-Implement-bamboo-growth-settings.patch
@@ -1,4 +1,4 @@
-From 55d8f0bc4b265ae99d182172fd50854f6fe48c9e Mon Sep 17 00:00:00 2001
+From ab39daaa467a8644e58ecb54bc61298d7d6ebf75 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
diff --git a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0058-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 99%
rename from patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0058-Climbing-should-not-bypass-cramming-gamerule.patch
index c7997ff9b..9d9137bac 100644
--- a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0058-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 4363c2aa79e619c9664b565ff938e0ebd5e1f031 Mon Sep 17 00:00:00 2001
+From 98dad70d079fe940dbe3edf193b099cd15ed0a9a 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
diff --git a/patches/server/0058-Option-for-slimes-not-pushable.patch b/patches/server/0059-Option-for-slimes-not-pushable.patch
similarity index 97%
rename from patches/server/0058-Option-for-slimes-not-pushable.patch
rename to patches/server/0059-Option-for-slimes-not-pushable.patch
index 33c98df07..a37fafa7c 100644
--- a/patches/server/0058-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0059-Option-for-slimes-not-pushable.patch
@@ -1,4 +1,4 @@
-From 25c179c746deb04dbcf29ea9983de57e03e7a47c Mon Sep 17 00:00:00 2001
+From 8376418dc432cbb04eaaafd3096d62f15dbefe9f 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
diff --git a/patches/server/0059-Bring-back-server-name.patch b/patches/server/0060-Bring-back-server-name.patch
similarity index 96%
rename from patches/server/0059-Bring-back-server-name.patch
rename to patches/server/0060-Bring-back-server-name.patch
index cea4075af..c035b4dd1 100644
--- a/patches/server/0059-Bring-back-server-name.patch
+++ b/patches/server/0060-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From 3543ac0ecae4947ebb9174d924de3db779362261 Mon Sep 17 00:00:00 2001
+From 55fe56ffb3a2e13ba21c4ad2091968d6df1ea6a2 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
diff --git a/patches/server/0060-Dispenser-curse-of-binding-protection.patch b/patches/server/0061-Dispenser-curse-of-binding-protection.patch
similarity index 98%
rename from patches/server/0060-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0061-Dispenser-curse-of-binding-protection.patch
index 14dc30a51..a98c6c313 100644
--- a/patches/server/0060-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0061-Dispenser-curse-of-binding-protection.patch
@@ -1,4 +1,4 @@
-From c8401ff8c19ecfe4ee4873942cb00852622d15e3 Mon Sep 17 00:00:00 2001
+From 38cff44a61c275df29b12f24fca866fde6d98285 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
diff --git a/patches/server/0061-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0062-Implement-LivingEntity-safeFallDistance.patch
similarity index 97%
rename from patches/server/0061-Implement-LivingEntity-safeFallDistance.patch
rename to patches/server/0062-Implement-LivingEntity-safeFallDistance.patch
index d0c60935f..0ac22eebd 100644
--- a/patches/server/0061-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0062-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From bb70f050b009760a9d261d2ed65a00c57bc044a8 Mon Sep 17 00:00:00 2001
+From 38ff1f30f95b13a8a0436680bdf360c7d710faa1 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
@@ -38,7 +38,7 @@ index 55e18e4c7a..b14f67b3a3 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2d85186254..a42d65ed7a 100644
+index 0590d2205d..c23e62a646 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 {
diff --git a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 97%
rename from patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch
index 9a2a1ab09..9ca6e6cc0 100644
--- a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,4 +1,4 @@
-From a76d0c78538736721a23158d318a1bf93629addb Mon Sep 17 00:00:00 2001
+From 37cf14b03633e1ac7fffaa768a112ed9a0fec8d4 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
diff --git a/patches/server/0063-Advancement-API-Additions.patch b/patches/server/0064-Advancement-API-Additions.patch
similarity index 99%
rename from patches/server/0063-Advancement-API-Additions.patch
rename to patches/server/0064-Advancement-API-Additions.patch
index aed9f299b..0c7a1228c 100644
--- a/patches/server/0063-Advancement-API-Additions.patch
+++ b/patches/server/0064-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 805a6ec389305ba0321375f24bab8dfcc0a8f72d Mon Sep 17 00:00:00 2001
+From 7985af538cbef17617f0aa410a6302cab9b593f8 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
diff --git a/patches/server/0064-Add-option-to-set-armorstand-step-height.patch b/patches/server/0065-Add-option-to-set-armorstand-step-height.patch
similarity index 97%
rename from patches/server/0064-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0065-Add-option-to-set-armorstand-step-height.patch
index 5ba6b3119..85fe411a2 100644
--- a/patches/server/0064-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0065-Add-option-to-set-armorstand-step-height.patch
@@ -1,4 +1,4 @@
-From 7771be9182ec2067b33f798b6184a0e935fca3e9 Mon Sep 17 00:00:00 2001
+From 047ce45c2a0f0b749bd8a6b8705a1a7fe373b713 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
diff --git a/patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch b/patches/server/0066-Implement-ItemFactory-getMonsterEgg.patch
similarity index 97%
rename from patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/server/0066-Implement-ItemFactory-getMonsterEgg.patch
index 61075b914..c5dd702e0 100644
--- a/patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0066-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From 655922dcd127f37efa484b26fdcacb2eb7bbdd69 Mon Sep 17 00:00:00 2001
+From 88ff88d5fbbe29441c5ef687f96d177706160b0f 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
diff --git a/patches/server/0066-Alternative-Keepalive-Handling.patch b/patches/server/0067-Alternative-Keepalive-Handling.patch
similarity index 98%
rename from patches/server/0066-Alternative-Keepalive-Handling.patch
rename to patches/server/0067-Alternative-Keepalive-Handling.patch
index cf60d5528..53e8be28e 100644
--- a/patches/server/0066-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0067-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 1f1e74c32ef2f12ca1f0b8ea10516bf101b939f5 Mon Sep 17 00:00:00 2001
+From 006fdc13e385c66e148fe21d81b3f67966a47bb5 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
diff --git a/patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0068-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 97%
rename from patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0068-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index bacd2e0ac..ac26c33e1 100644
--- a/patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0068-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From a94a24d5fe8c16401e9f1b17e06520c66c9152d8 Mon Sep 17 00:00:00 2001
+From b8c04a8d56d6dabcb090b048f46caef2c08c5431 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
diff --git a/patches/server/0068-Add-MonsterEggSpawnEvent.patch b/patches/server/0069-Add-MonsterEggSpawnEvent.patch
similarity index 98%
rename from patches/server/0068-Add-MonsterEggSpawnEvent.patch
rename to patches/server/0069-Add-MonsterEggSpawnEvent.patch
index 464212968..69c6265c1 100644
--- a/patches/server/0068-Add-MonsterEggSpawnEvent.patch
+++ b/patches/server/0069-Add-MonsterEggSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 2173fef605266ad306d4f623ec6a283ec859361c Mon Sep 17 00:00:00 2001
+From 3ad7f985f8d6bde88d5bc04d9723eb7543bd7dc0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:59 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent
diff --git a/patches/server/0069-Add-moon-phase-API.patch b/patches/server/0070-Add-moon-phase-API.patch
similarity index 94%
rename from patches/server/0069-Add-moon-phase-API.patch
rename to patches/server/0070-Add-moon-phase-API.patch
index 4b7a89d61..75bd5a437 100644
--- a/patches/server/0069-Add-moon-phase-API.patch
+++ b/patches/server/0070-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From 1f347d5cdc7517c74a5d7d09aed00457c9b1c075 Mon Sep 17 00:00:00 2001
+From fa270781d1f741eeac50168841b348bfe87bd1d2 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
diff --git a/patches/server/0070-Add-getPlacementBlockData-to-World.patch b/patches/server/0071-Add-getPlacementBlockData-to-World.patch
similarity index 98%
rename from patches/server/0070-Add-getPlacementBlockData-to-World.patch
rename to patches/server/0071-Add-getPlacementBlockData-to-World.patch
index 9fafa6e8d..619bcca43 100644
--- a/patches/server/0070-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0071-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 0464d28266e5b1cbe4ca4b1cf832da57600e77d6 Mon Sep 17 00:00:00 2001
+From a632d513add4198e32f1ba1ea272d0d605dae41d 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
diff --git a/patches/server/0071-Barrels-have-6-rows.patch b/patches/server/0072-Barrels-have-6-rows.patch
similarity index 98%
rename from patches/server/0071-Barrels-have-6-rows.patch
rename to patches/server/0072-Barrels-have-6-rows.patch
index 70d408e49..790ab6a20 100644
--- a/patches/server/0071-Barrels-have-6-rows.patch
+++ b/patches/server/0072-Barrels-have-6-rows.patch
@@ -1,4 +1,4 @@
-From 555740ef568b03ba528e1addefe7ec468001ec8d Mon Sep 17 00:00:00 2001
+From 4b3279b5da65dcffdfdf536636d412ec489c0229 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
diff --git a/patches/server/0072-Ender-chests-have-6-rows.patch b/patches/server/0073-Ender-chests-have-6-rows.patch
similarity index 98%
rename from patches/server/0072-Ender-chests-have-6-rows.patch
rename to patches/server/0073-Ender-chests-have-6-rows.patch
index f314f7348..192dc364c 100644
--- a/patches/server/0072-Ender-chests-have-6-rows.patch
+++ b/patches/server/0073-Ender-chests-have-6-rows.patch
@@ -1,4 +1,4 @@
-From 0dc1d985a8a31c90996061e07b9c7e028feaf892 Mon Sep 17 00:00:00 2001
+From 1f34762239549dcb0e48482dbdf48779c3ecec25 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] Ender chests have 6 rows
diff --git a/patches/server/0073-Add-5-second-tps-average-in-tps.patch b/patches/server/0074-Add-5-second-tps-average-in-tps.patch
similarity index 98%
rename from patches/server/0073-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0074-Add-5-second-tps-average-in-tps.patch
index 5b44b8dec..32d37e06b 100644
--- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0074-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From 52db11c962e61cd8f7289586391eb28692320742 Mon Sep 17 00:00:00 2001
+From f02a7926798c10bd08f66acbe6d658a2ce1cd4fc 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
diff --git a/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch
similarity index 98%
rename from patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch
rename to patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch
index 7ca46ca91..004c0a138 100644
--- a/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch
+++ b/patches/server/0075-Don-t-recalculate-permissions-for-players-on-world-c.patch
@@ -1,4 +1,4 @@
-From bbe942750043a0979b98e0c3938de221afd4c51d Mon Sep 17 00:00:00 2001
+From 83e17c570af947f1857922038e4a45f7babbc4d4 Mon Sep 17 00:00:00 2001
 From: Tom <cryptite@gmail.com>
 Date: Fri, 12 Jul 2019 07:59:35 -0500
 Subject: [PATCH] Don't recalculate permissions for players on world change
diff --git a/patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 94%
rename from patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch
index e78d59725..675f738d1 100644
--- a/patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From af6b0629c76f81fd4604fd578a9a9e0c63bb7cbe Mon Sep 17 00:00:00 2001
+From 1c0d92002c25f28fa28659bec8d62792e2b6b79d 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
diff --git a/patches/server/0076-Add-more-evoker-API.patch b/patches/server/0077-Add-more-evoker-API.patch
similarity index 97%
rename from patches/server/0076-Add-more-evoker-API.patch
rename to patches/server/0077-Add-more-evoker-API.patch
index 16085a6d7..6655b56d2 100644
--- a/patches/server/0076-Add-more-evoker-API.patch
+++ b/patches/server/0077-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From 82bc1a06ef5c8fc2328803685e0a03a85aea5a16 Mon Sep 17 00:00:00 2001
+From ad5e6ae26fac5c0807df84dd7767fed00eb6ae71 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
diff --git a/patches/server/0077-Add-API-for-Villager-resetOffers.patch b/patches/server/0078-Add-API-for-Villager-resetOffers.patch
similarity index 97%
rename from patches/server/0077-Add-API-for-Villager-resetOffers.patch
rename to patches/server/0078-Add-API-for-Villager-resetOffers.patch
index 1c1f95bd1..ca4241180 100644
--- a/patches/server/0077-Add-API-for-Villager-resetOffers.patch
+++ b/patches/server/0078-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From cecba0fdfbf36d9c45d0e90cbe21831c5c24f991 Mon Sep 17 00:00:00 2001
+From d4ff981b559db3cd4f6df4950e3fcf5feb06ad3d 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/0078-Add-more-llama-API.patch b/patches/server/0079-Add-more-llama-API.patch
similarity index 99%
rename from patches/server/0078-Add-more-llama-API.patch
rename to patches/server/0079-Add-more-llama-API.patch
index 8c9109acc..82cd0d793 100644
--- a/patches/server/0078-Add-more-llama-API.patch
+++ b/patches/server/0079-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From ab42025a0f531be96f571f8e9038ce7c7399b006 Mon Sep 17 00:00:00 2001
+From ae44c79f2e935bc9d99f93b9fc2af05ff6d58b31 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
diff --git a/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
similarity index 95%
rename from patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
rename to patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
index df39616c1..1bf6c4175 100644
--- a/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
+++ b/patches/server/0080-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
@@ -1,4 +1,4 @@
-From 083e15ebddc1a08e4b61fd651468e82f0f002805 Mon Sep 17 00:00:00 2001
+From c66288995c6d33ee3d0302ee08be0971302d8c0b 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
diff --git a/patches/server/0080-Implement-infinite-lava.patch b/patches/server/0081-Implement-infinite-lava.patch
similarity index 98%
rename from patches/server/0080-Implement-infinite-lava.patch
rename to patches/server/0081-Implement-infinite-lava.patch
index 1370198f8..0930ea0a4 100644
--- a/patches/server/0080-Implement-infinite-lava.patch
+++ b/patches/server/0081-Implement-infinite-lava.patch
@@ -1,4 +1,4 @@
-From c4413cd2de3d33740bb913667e70be1fc6981319 Mon Sep 17 00:00:00 2001
+From 7cd399e9125ba9f4bb41031ba44a2a08876e9f97 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
diff --git a/patches/server/0081-Expose-getItemStack-for-Trident.patch b/patches/server/0082-Expose-getItemStack-for-Trident.patch
similarity index 96%
rename from patches/server/0081-Expose-getItemStack-for-Trident.patch
rename to patches/server/0082-Expose-getItemStack-for-Trident.patch
index 43c3f65c4..5b13a0f57 100644
--- a/patches/server/0081-Expose-getItemStack-for-Trident.patch
+++ b/patches/server/0082-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From 8633f5becb52710a6ee223adcdc272082e7056e1 Mon Sep 17 00:00:00 2001
+From 919014910581591912bb9972cc5441948ad1f92d 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
diff --git a/patches/server/0082-Despawn-egg-hatches-chicken.patch b/patches/server/0083-Despawn-egg-hatches-chicken.patch
similarity index 98%
rename from patches/server/0082-Despawn-egg-hatches-chicken.patch
rename to patches/server/0083-Despawn-egg-hatches-chicken.patch
index 2160dd8b2..1f879efcd 100644
--- a/patches/server/0082-Despawn-egg-hatches-chicken.patch
+++ b/patches/server/0083-Despawn-egg-hatches-chicken.patch
@@ -1,4 +1,4 @@
-From ea53ffd282e5600d2a5d515148e4e8f6e7613657 Mon Sep 17 00:00:00 2001
+From f1ad27f46a5b5756be64ae26db23a9ea6d514d42 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
diff --git a/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 97%
rename from patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 96eb605ff..ba45e7a7a 100644
--- a/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From b63ed482ad80eed175c1761ca7eb6c1af1a1160d Mon Sep 17 00:00:00 2001
+From 5fdfd00ea6f8fb28074157d7701c7a97a4857ed1 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
diff --git a/patches/server/0084-Add-sleep-options.patch b/patches/server/0085-Add-sleep-options.patch
similarity index 98%
rename from patches/server/0084-Add-sleep-options.patch
rename to patches/server/0085-Add-sleep-options.patch
index 9ed32bfe4..f74a64d78 100644
--- a/patches/server/0084-Add-sleep-options.patch
+++ b/patches/server/0085-Add-sleep-options.patch
@@ -1,4 +1,4 @@
-From d79a8973ef332fb7f6a030389719d029205d06e1 Mon Sep 17 00:00:00 2001
+From 850e2e38dda8431a41386478b5cac314f3cb2d81 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
diff --git a/patches/server/0085-Option-for-hay-block-fall-damage.patch b/patches/server/0086-Option-for-hay-block-fall-damage.patch
similarity index 96%
rename from patches/server/0085-Option-for-hay-block-fall-damage.patch
rename to patches/server/0086-Option-for-hay-block-fall-damage.patch
index bf46426e5..aec525df4 100644
--- a/patches/server/0085-Option-for-hay-block-fall-damage.patch
+++ b/patches/server/0086-Option-for-hay-block-fall-damage.patch
@@ -1,4 +1,4 @@
-From 961f4f2944902957005ac29a38f0155c5c0f5add Mon Sep 17 00:00:00 2001
+From 041ed97b9990f943db6c7c6bddd79a42a4a1f00c 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
diff --git a/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 96%
rename from patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index e398bcd83..a73518e44 100644
--- a/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/server/0087-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From e452936ab8d3e0c59b6152916b7fe13412777c1a Mon Sep 17 00:00:00 2001
+From e464d2ac211be1dbaca54b24313ee62ffe0c3a6f 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
diff --git a/patches/server/0087-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0088-Add-LootableInventoryFirstFillEvent.patch
similarity index 97%
rename from patches/server/0087-Add-LootableInventoryFirstFillEvent.patch
rename to patches/server/0088-Add-LootableInventoryFirstFillEvent.patch
index 30f87733a..4218ddd07 100644
--- a/patches/server/0087-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/server/0088-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From cb27e73510ed20e2029db4c8d41a2d3ea49dd89a Mon Sep 17 00:00:00 2001
+From a0fa035471089d4d3e23c9499a04d886b02c545a 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
diff --git a/patches/server/0088-Villagers-follow-emerald-blocks.patch b/patches/server/0089-Villagers-follow-emerald-blocks.patch
similarity index 98%
rename from patches/server/0088-Villagers-follow-emerald-blocks.patch
rename to patches/server/0089-Villagers-follow-emerald-blocks.patch
index 81746da21..839605623 100644
--- a/patches/server/0088-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0089-Villagers-follow-emerald-blocks.patch
@@ -1,4 +1,4 @@
-From c387c04b894d70d392080ddcfcb52131ea0ad52a Mon Sep 17 00:00:00 2001
+From 17328d49a0bf329ebf4f9a679a6f43badec08219 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
diff --git a/patches/server/0089-Add-player-death-exp-control-options.patch b/patches/server/0090-Add-player-death-exp-control-options.patch
similarity index 98%
rename from patches/server/0089-Add-player-death-exp-control-options.patch
rename to patches/server/0090-Add-player-death-exp-control-options.patch
index 40665558f..f241acbf0 100644
--- a/patches/server/0089-Add-player-death-exp-control-options.patch
+++ b/patches/server/0090-Add-player-death-exp-control-options.patch
@@ -1,4 +1,4 @@
-From 8b551acbf9d37c0f03fa2d2869d7238f13aa9363 Mon Sep 17 00:00:00 2001
+From be06bb1cd7246707298cb3276f50c3dcc9344538 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
diff --git a/patches/server/0090-Add-permission-for-F3-N-debug.patch b/patches/server/0091-Add-permission-for-F3-N-debug.patch
similarity index 93%
rename from patches/server/0090-Add-permission-for-F3-N-debug.patch
rename to patches/server/0091-Add-permission-for-F3-N-debug.patch
index 939523174..087c040fe 100644
--- a/patches/server/0090-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0091-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From 54a88bf800d7d66309f5345dc7ee298f7d89521b Mon Sep 17 00:00:00 2001
+From 5158c2415859609cef3338d2ebed9a383cedea7a 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
diff --git a/patches/server/0091-Allow-leashing-villagers.patch b/patches/server/0092-Allow-leashing-villagers.patch
similarity index 98%
rename from patches/server/0091-Allow-leashing-villagers.patch
rename to patches/server/0092-Allow-leashing-villagers.patch
index 50410de86..08bd588c3 100644
--- a/patches/server/0091-Allow-leashing-villagers.patch
+++ b/patches/server/0092-Allow-leashing-villagers.patch
@@ -1,4 +1,4 @@
-From fe27c94a228ba7c96dabb202da4815769a7cda5d Mon Sep 17 00:00:00 2001
+From 42376fe3c04f4507dfa16ae3f6c38cfb994bbb13 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/0092-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 97%
rename from patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch
index 353939198..c24abe1f0 100644
--- a/patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch
@@ -1,4 +1,4 @@
-From bb5b30eaae071d0318045841228080adb3d8322a Mon Sep 17 00:00:00 2001
+From 9bc96334e57eca81b3d192a0364c3561546a821a 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/0093-Make-lava-flow-speed-configurable.patch b/patches/server/0094-Make-lava-flow-speed-configurable.patch
similarity index 97%
rename from patches/server/0093-Make-lava-flow-speed-configurable.patch
rename to patches/server/0094-Make-lava-flow-speed-configurable.patch
index 0e65b731e..93163b927 100644
--- a/patches/server/0093-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0094-Make-lava-flow-speed-configurable.patch
@@ -1,4 +1,4 @@
-From 9f6b65a56bd6fec50280bef3866029600e843107 Mon Sep 17 00:00:00 2001
+From db1cff12a408caed1f4e4d322bf73c90aeebbadf 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
diff --git a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 97%
rename from patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch
index f0cfea18b..df2ca8ad9 100644
--- a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,4 +1,4 @@
-From 631983224d9e2d228496b3f8620b6456c920b0c6 Mon Sep 17 00:00:00 2001
+From ffa4f19382e10608820c4edd5c59bf819c5de385 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
diff --git a/patches/server/0095-UPnP-Port-Forwarding-Service.patch b/patches/server/0096-UPnP-Port-Forwarding-Service.patch
similarity index 99%
rename from patches/server/0095-UPnP-Port-Forwarding-Service.patch
rename to patches/server/0096-UPnP-Port-Forwarding-Service.patch
index 3e2c78e32..0974bd39c 100644
--- a/patches/server/0095-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0096-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From 89cdf2087d88de614709ec089cdab90342c358a2 Mon Sep 17 00:00:00 2001
+From f185659d03fd032a319db70733338185793fa8eb 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
diff --git a/patches/server/0096-Implement-EntityMoveEvent.patch b/patches/server/0097-Implement-EntityMoveEvent.patch
similarity index 94%
rename from patches/server/0096-Implement-EntityMoveEvent.patch
rename to patches/server/0097-Implement-EntityMoveEvent.patch
index d1278c6fa..d40f0b990 100644
--- a/patches/server/0096-Implement-EntityMoveEvent.patch
+++ b/patches/server/0097-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From 614197becacc580fe8740ebc56597820c945f582 Mon Sep 17 00:00:00 2001
+From 37dc450ee076828813bc61ba3b45e105b0af47cc 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 a42d65ed7a..a624531e58 100644
+index c23e62a646..19cfb63f2a 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/0097-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 99%
rename from patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch
index df0e93144..7aa73c676 100644
--- a/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0098-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 889d30c9089b40be53d79087880294150e3fe6c1 Mon Sep 17 00:00:00 2001
+From dc6508f095ab926c583392c1254b719fa7648f1a 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
diff --git a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch b/patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
similarity index 96%
rename from patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
rename to patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
index 83beb593c..438879621 100644
--- a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
+++ b/patches/server/0099-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
@@ -1,4 +1,4 @@
-From 059404d1d68b6b7982b0a05f6ec5085afc73d99f Mon Sep 17 00:00:00 2001
+From ddd8ca7f009da9614b8d39f0c73eb5ddc896b97b 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] Always increment arrow despawn counter (fixes MC-125757)
diff --git a/patches/server/0099-Implement-bed-explosion-options.patch b/patches/server/0100-Implement-bed-explosion-options.patch
similarity index 98%
rename from patches/server/0099-Implement-bed-explosion-options.patch
rename to patches/server/0100-Implement-bed-explosion-options.patch
index 232865a71..cd5dc8dce 100644
--- a/patches/server/0099-Implement-bed-explosion-options.patch
+++ b/patches/server/0100-Implement-bed-explosion-options.patch
@@ -1,4 +1,4 @@
-From c83065f4de01dde8add406147f185115847ca18d Mon Sep 17 00:00:00 2001
+From bb39935754b5d5c3f3bf0e3a6878a9ba3267199c 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
diff --git a/patches/server/0100-Add-item-entity-options.patch b/patches/server/0101-Add-item-entity-options.patch
similarity index 98%
rename from patches/server/0100-Add-item-entity-options.patch
rename to patches/server/0101-Add-item-entity-options.patch
index 513491fa0..76d3a1a9e 100644
--- a/patches/server/0100-Add-item-entity-options.patch
+++ b/patches/server/0101-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From 2b3acad3230a0d5d5e575029ca54243b0f0b53c3 Mon Sep 17 00:00:00 2001
+From e06066da8e5138d8c89734168d195a519c957b51 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
diff --git a/patches/server/0101-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0102-Make-natural-spawns-per-biome-configurable.patch
similarity index 99%
rename from patches/server/0101-Make-natural-spawns-per-biome-configurable.patch
rename to patches/server/0102-Make-natural-spawns-per-biome-configurable.patch
index 4bdbfc9a0..8f011e21c 100644
--- a/patches/server/0101-Make-natural-spawns-per-biome-configurable.patch
+++ b/patches/server/0102-Make-natural-spawns-per-biome-configurable.patch
@@ -1,4 +1,4 @@
-From 3b64a4a173f59e5650aa4561cb6e7237a8fd35ea Mon Sep 17 00:00:00 2001
+From 4269aec65d1ae60c20ddcf68fd8ffbc76eb2820a 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
diff --git a/patches/server/0102-Configurable-void-damage-height.patch b/patches/server/0103-Configurable-void-damage-height.patch
similarity index 97%
rename from patches/server/0102-Configurable-void-damage-height.patch
rename to patches/server/0103-Configurable-void-damage-height.patch
index e7d8c7cb4..e3ea10198 100644
--- a/patches/server/0102-Configurable-void-damage-height.patch
+++ b/patches/server/0103-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 4de61283ea7a5628ead8d7e9b7e251a09c76760c Mon Sep 17 00:00:00 2001
+From e8a16385d6508d46f734fba559e768c2d9379394 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
diff --git a/patches/server/0103-Fix-the-dead-lagging-the-server.patch b/patches/server/0104-Fix-the-dead-lagging-the-server.patch
similarity index 96%
rename from patches/server/0103-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0104-Fix-the-dead-lagging-the-server.patch
index 55732c966..f1732b0ed 100644
--- a/patches/server/0103-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0104-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From c6df10af45241d3207f6ff7ee347b87464a1b876 Mon Sep 17 00:00:00 2001
+From 765d0bc08bd9a97d32027b47e0ec73999ff77aa3 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
diff --git a/patches/server/0104-Add-flying-mobs-to-entity-activation-range-settings.patch b/patches/server/0105-Add-flying-mobs-to-entity-activation-range-settings.patch
similarity index 98%
rename from patches/server/0104-Add-flying-mobs-to-entity-activation-range-settings.patch
rename to patches/server/0105-Add-flying-mobs-to-entity-activation-range-settings.patch
index 860ad3a34..90342fb78 100644
--- a/patches/server/0104-Add-flying-mobs-to-entity-activation-range-settings.patch
+++ b/patches/server/0105-Add-flying-mobs-to-entity-activation-range-settings.patch
@@ -1,4 +1,4 @@
-From b90df99f2ab60e848518dfabd30610bcadf0dffd Mon Sep 17 00:00:00 2001
+From 4245338f3564419aac89884e3f738d6ca1241248 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 8 Mar 2020 20:54:44 -0500
 Subject: [PATCH] Add flying mobs to entity activation range settings
diff --git a/patches/server/0105-Add-mspt-command.patch b/patches/server/0106-Add-mspt-command.patch
similarity index 91%
rename from patches/server/0105-Add-mspt-command.patch
rename to patches/server/0106-Add-mspt-command.patch
index f45ad2efa..4875c5ca5 100644
--- a/patches/server/0105-Add-mspt-command.patch
+++ b/patches/server/0106-Add-mspt-command.patch
@@ -1,13 +1,13 @@
-From 758a4766e22050f99c649f753b81b8e7b782ce55 Mon Sep 17 00:00:00 2001
+From 49d45e8b2dcb100f7161d007bafe87144b0308e4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:23:44 -0500
 Subject: [PATCH] Add /mspt command
 
 ---
  .../minecraft/server/CommandDispatcher.java   |  1 +
- .../net/pl3x/purpur/command/MSPTCommand.java  | 60 +++++++++++++++++++
+ .../net/pl3x/purpur/command/MSPTCommand.java  | 59 +++++++++++++++++++
  src/main/resources/purpur.lang                |  2 +
- 3 files changed, 63 insertions(+)
+ 3 files changed, 62 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/command/MSPTCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -24,14 +24,12 @@ index 37b1a7947c..c9d1f94100 100644
          this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
 diff --git a/src/main/java/net/pl3x/purpur/command/MSPTCommand.java b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
 new file mode 100644
-index 0000000000..c5ca03e48c
+index 0000000000..c3ffe528d4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,59 @@
 +package net.pl3x.purpur.command;
 +
-+
-+import net.minecraft.server.ChatMessage;
 +import net.minecraft.server.CommandDispatcher;
 +import net.minecraft.server.CommandListenerWrapper;
 +import net.minecraft.server.LocaleLanguage;
@@ -49,11 +47,12 @@ index 0000000000..c5ca03e48c
 +    public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) {
 +        dispatcher.register(CommandDispatcher.register("mspt")
 +                .requires((listener) -> {
-+                    return listener.hasPermission(2, "bukkit.command.mspt");
++                    return listener.hasPermission(2);
 +                })
 +                .executes((context) -> {
 +                    return execute(context.getSource());
-+                }));
++                })
++        ).setPermission("bukkit.command.mspt");
 +    }
 +
 +    private static int execute(CommandListenerWrapper sender) {
diff --git a/patches/server/0106-Add-ping-command.patch b/patches/server/0107-Add-ping-command.patch
similarity index 93%
rename from patches/server/0106-Add-ping-command.patch
rename to patches/server/0107-Add-ping-command.patch
index b7c14a5f8..1b3f67487 100644
--- a/patches/server/0106-Add-ping-command.patch
+++ b/patches/server/0107-Add-ping-command.patch
@@ -1,4 +1,4 @@
-From 33362dcb20d112ca6872c2da530d27a7f7ad36ff Mon Sep 17 00:00:00 2001
+From 325d92ab622e47bcfcecc27b3e254174b7c3a951 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
@@ -7,9 +7,9 @@ Subject: [PATCH] Add /ping command
  .../net/minecraft/server/ArgumentEntity.java  |  2 ++
  .../minecraft/server/CommandDispatcher.java   |  5 ++-
  .../server/CommandListenerWrapper.java        |  1 +
- .../net/pl3x/purpur/command/PingCommand.java  | 34 +++++++++++++++++++
+ .../net/pl3x/purpur/command/PingCommand.java  | 33 +++++++++++++++++++
  src/main/resources/purpur.lang                |  1 +
- 5 files changed, 42 insertions(+), 1 deletion(-)
+ 5 files changed, 41 insertions(+), 1 deletion(-)
  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
@@ -77,14 +77,12 @@ index 0b23a0548d..ab0cf8b561 100644
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java
 new file mode 100644
-index 0000000000..f85290888c
+index 0000000000..dac3083bf0
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +package net.pl3x.purpur.command;
 +
-+
-+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 +import net.minecraft.server.ArgumentEntity;
 +import net.minecraft.server.CommandDispatcher;
 +import net.minecraft.server.CommandListenerWrapper;
@@ -98,17 +96,18 @@ index 0000000000..f85290888c
 +    public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) {
 +        dispatcher.register(CommandDispatcher.register("ping")
 +                .requires((listener) -> {
-+                    return listener.hasPermission(2, "bukkit.command.ping");
++                    return listener.hasPermission(2);
 +                })
 +                .executes((context) -> {
 +                    return execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()));
 +                })
 +                .then(CommandDispatcher.argument("targets", ArgumentEntity.players()).executes((context) -> {
 +                    return execute(context.getSource(), ArgumentEntity.getPlayers(context, "targets"));
-+                })));
++                }))
++        ).setPermission("bukkit.command.ping");
 +    }
 +
-+    private static int execute(CommandListenerWrapper sender, Collection<EntityPlayer> targets) throws CommandSyntaxException {
++    private static int execute(CommandListenerWrapper sender, Collection<EntityPlayer> targets) {
 +        for (EntityPlayer player : targets) {
 +            sender.sendMessage(LocaleLanguage.translate("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false);
 +        }
diff --git a/patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0108-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 97%
rename from patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0108-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 216adf6be..6ae1e6d04 100644
--- a/patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0108-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -1,4 +1,4 @@
-From 65fca6e865ea63f611df748ef2f567bd414aa7f7 Mon Sep 17 00:00:00 2001
+From 764c2d0c3a4f2764a56c3b68155eb478fd8ff532 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
diff --git a/patches/server/0108-Configurable-server-mod-name.patch b/patches/server/0109-Configurable-server-mod-name.patch
similarity index 96%
rename from patches/server/0108-Configurable-server-mod-name.patch
rename to patches/server/0109-Configurable-server-mod-name.patch
index a54023457..6f97a4213 100644
--- a/patches/server/0108-Configurable-server-mod-name.patch
+++ b/patches/server/0109-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From a005b1f96651d4c63b4a4f5cd13d75918416edb1 Mon Sep 17 00:00:00 2001
+From 5193f535a226b90d020395aeb5f3524f6593a81b 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
diff --git a/patches/server/0109-Per-World-Spawn-limits.patch b/patches/server/0110-Per-World-Spawn-limits.patch
similarity index 97%
rename from patches/server/0109-Per-World-Spawn-limits.patch
rename to patches/server/0110-Per-World-Spawn-limits.patch
index 1cb7e4f61..6114c0e9a 100644
--- a/patches/server/0109-Per-World-Spawn-limits.patch
+++ b/patches/server/0110-Per-World-Spawn-limits.patch
@@ -1,4 +1,4 @@
-From 12dfa8a7283540bb50ee8a9960c3723edd35814e Mon Sep 17 00:00:00 2001
+From deb0579dfd970e92f093971575092d54f1679fe6 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] Per World Spawn limits
diff --git a/patches/server/0110-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0111-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 94%
rename from patches/server/0110-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0111-End-gateway-should-check-if-entity-can-use-portal.patch
index 72b8567ed..59d267b5f 100644
--- a/patches/server/0110-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0111-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,4 +1,4 @@
-From 779a0e9938ee711ed03b19dabf79dc0b636544a9 Mon Sep 17 00:00:00 2001
+From 87fa58e2eaa40c977475e10a639d1eaceb1eae66 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
diff --git a/patches/server/0111-Add-BellRingEvent.patch b/patches/server/0112-Add-BellRingEvent.patch
similarity index 97%
rename from patches/server/0111-Add-BellRingEvent.patch
rename to patches/server/0112-Add-BellRingEvent.patch
index b0b69e391..98650c974 100644
--- a/patches/server/0111-Add-BellRingEvent.patch
+++ b/patches/server/0112-Add-BellRingEvent.patch
@@ -1,4 +1,4 @@
-From ecc3e2323ee4c0eca11c76b6f4c0e4d4116299b9 Mon Sep 17 00:00:00 2001
+From 9158944f57fc798ca077f0fc0ab2c525f3c979ca Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] Add BellRingEvent
diff --git a/patches/server/0112-Disable-mojang-profiler.patch b/patches/server/0113-Disable-mojang-profiler.patch
similarity index 99%
rename from patches/server/0112-Disable-mojang-profiler.patch
rename to patches/server/0113-Disable-mojang-profiler.patch
index 90fe51182..d63c3d93a 100644
--- a/patches/server/0112-Disable-mojang-profiler.patch
+++ b/patches/server/0113-Disable-mojang-profiler.patch
@@ -1,4 +1,4 @@
-From b989cf2b34fd0be7f9a7db715941259329ba44fd Mon Sep 17 00:00:00 2001
+From 94732fc6b87331a6852b05f6bb2082e44b886242 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 12:48:02 -0500
 Subject: [PATCH] Disable mojang profiler
diff --git a/patches/server/0113-Configurable-TPS-Catchup.patch b/patches/server/0114-Configurable-TPS-Catchup.patch
similarity index 97%
rename from patches/server/0113-Configurable-TPS-Catchup.patch
rename to patches/server/0114-Configurable-TPS-Catchup.patch
index ffb21b60c..a7118f48e 100644
--- a/patches/server/0113-Configurable-TPS-Catchup.patch
+++ b/patches/server/0114-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From eb85eab76da3e25e7951c15c6a057df91b079ea1 Mon Sep 17 00:00:00 2001
+From 5eefb77fb1bc91088e70f17562264af959496e1c 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
diff --git a/patches/server/0114-Breedable-Polar-Bears.patch b/patches/server/0115-Breedable-Polar-Bears.patch
similarity index 98%
rename from patches/server/0114-Breedable-Polar-Bears.patch
rename to patches/server/0115-Breedable-Polar-Bears.patch
index d202345c3..20232e723 100644
--- a/patches/server/0114-Breedable-Polar-Bears.patch
+++ b/patches/server/0115-Breedable-Polar-Bears.patch
@@ -1,4 +1,4 @@
-From 32cd8dd303cda4d7c46aab58a5f43af08a003287 Mon Sep 17 00:00:00 2001
+From cac5ee12c02873d8f8e8d4e342865376236f15ee 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
diff --git a/patches/server/0115-Configurable-jockey-options.patch b/patches/server/0116-Configurable-jockey-options.patch
similarity index 99%
rename from patches/server/0115-Configurable-jockey-options.patch
rename to patches/server/0116-Configurable-jockey-options.patch
index 129ef1cb9..ba6e2381b 100644
--- a/patches/server/0115-Configurable-jockey-options.patch
+++ b/patches/server/0116-Configurable-jockey-options.patch
@@ -1,4 +1,4 @@
-From f3b011a29373ae1d027bcc23f1c376a1fa20fe3d Mon Sep 17 00:00:00 2001
+From c56d4ca7c9688e5990c5cee362893e2910b3283f 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