From 1c4687461d5a40c26cca1e1a0651c58301d1dd96 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 20:28:11 -0500
Subject: [PATCH] Rebuild patches

---
 Paper                                         |  2 +-
 patches/server/0003-decompile-fixes.patch     | 18 ++++++++-
 ...patch => 0030-Make-Iron-Golems-Swim.patch} |  8 ++--
 ...oisten-from-water-directly-under-it.patch} |  4 +-
 ...atch => 0032-Controllable-Minecarts.patch} | 10 ++---
 ...tch => 0033-Signs-allow-color-codes.patch} | 10 ++---
 ...=> 0034-Campfires-have-regen-effect.patch} |  4 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |  8 ++--
 ... => 0036-Campfires-burn-out-in-rain.patch} |  4 +-
 ...-Campfires-should-fall-with-gravity.patch} |  4 +-
 ...38-Dont-send-useless-entity-packets.patch} |  2 +-
 ...API.patch => 0039-Implement-AFK-API.patch} | 14 +++----
 ...tion-to-toggle-milk-curing-bad-omen.patch} |  8 ++--
 ...-mends-most-damages-equipment-first.patch} |  8 ++--
 ...atch => 0042-Tulips-change-fox-type.patch} |  6 +--
 ...d-limit-for-pillager-outpost-spawns.patch} |  6 +--
 ...r.patch => 0044-Make-the-GUI-better.patch} | 38 +++++++++----------
 ...45-Players-should-not-cram-to-death.patch} |  4 +-
 ... => 0046-Add-EntityPortalReadyEvent.patch} |  4 +-
 ...h => 0047-Implement-elytra-settings.patch} |  6 +--
 ...PI.patch => 0048-Add-tick-times-API.patch} |  2 +-
 ...Add-blacklist-option-for-grindstone.patch} |  4 +-
 ...=> 0050-Implement-lagging-threshold.patch} |  6 +--
 ...t-configurable-villager-brain-ticks.patch} |  6 +--
 ...-for-zombies-targetting-turtle-eggs.patch} |  6 +--
 ...53-Implement-bamboo-growth-settings.patch} |  4 +-
 ...should-not-bypass-cramming-gamerule.patch} | 10 ++---
 ...0055-Option-for-slimes-not-pushable.patch} |  8 ++--
 ...atch => 0056-Bring-back-server-name.patch} |  2 +-
 ...spenser-curse-of-binding-protection.patch} |  4 +-
 ...ement-LivingEntity-safeFallDistance.patch} |  2 +-
 ...-for-boats-to-eject-players-on-land.patch} | 10 ++---
 ...h => 0060-Advancement-API-Additions.patch} |  2 +-
 ...ption-to-set-armorstand-step-height.patch} | 16 ++++----
 ...Implement-ItemFactory-getMonsterEgg.patch} |  2 +-
 ...0063-Alternative-Keepalive-Handling.patch} |  6 +--
 ...nt-PlayerSetSpawnerTypeWithEggEvent.patch} |  2 +-
 ...PI.patch => 0065-Add-moon-phase-API.patch} |  2 +-
 ...-Add-getPlacementBlockData-to-World.patch} |  2 +-
 ...s.patch => 0067-Barrels-have-6-rows.patch} |  8 ++--
 ...-Enderchest-6-rows-plus-permissions.patch} |  6 +--
 ...069-Add-5-second-tps-average-in-tps.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  2 +-
 ...I.patch => 0071-Add-more-evoker-API.patch} |  2 +-
 ...72-Add-API-for-Villager-resetOffers.patch} |  2 +-
 ...PI.patch => 0073-Add-more-llama-API.patch} |  8 ++--
 ...speed-multiplier-using-values-betwe.patch} |  2 +-
 ...tch => 0075-Implement-infinite-lava.patch} |  4 +-
 ...076-Expose-getItemStack-for-Trident.patch} |  2 +-
 ...=> 0077-Despawn-egg-hatches-chicken.patch} |  6 +--
 ...eEvent-not-firing-for-all-use-cases.patch} |  2 +-
 ...ons.patch => 0079-Add-sleep-options.patch} | 12 +++---
 ...80-Option-for-hay-block-fall-damage.patch} |  4 +-
 ...getPlayer-to-SkeletonHorseTrapEvent.patch} |  2 +-
 ...Add-LootableInventoryFirstFillEvent.patch} |  2 +-
 ...083-Villagers-follow-emerald-blocks.patch} |  6 +--
 ...dd-player-death-exp-control-options.patch} | 10 ++---
 ... 0085-Add-permission-for-F3-N-debug.patch} |  6 +--
 ...ch => 0086-Allow-leashing-villagers.patch} |  8 ++--
 ...rable-search-radius-for-villagers-t.patch} |  8 ++--
 ...8-Make-lava-flow-speed-configurable.patch} |  4 +-
 ...skeleton-takes-wither-damage-option.patch} |  6 +--
 ...> 0090-UPnP-Port-Forwarding-Service.patch} |  8 ++--
 ...h => 0091-Implement-EntityMoveEvent.patch} |  2 +-
 ...-disable-saving-projectiles-to-disk.patch} | 12 +++---
 ...093-Implement-bed-explosion-options.patch} |  4 +-
 ...tch => 0094-Add-item-entity-options.patch} | 10 ++---
 ...tural-spawns-per-biome-configurable.patch} |  2 +-
 ...096-Configurable-void-damage-height.patch} | 12 +++---
 ...097-Fix-the-dead-lagging-the-server.patch} |  4 +-
 ...to-entity-activation-range-settings.patch} |  4 +-
 ...mand.patch => 0099-Add-mspt-command.patch} |  2 +-
 ...mand.patch => 0100-Add-ping-command.patch} |  2 +-
 ...ow-loyalty-on-tridents-to-work-in-t.patch} | 10 ++---
 ...> 0102-Configurable-server-mod-name.patch} |  8 ++--
 ...ould-check-if-entity-can-use-portal.patch} |  2 +-
 ...ch => 0104-Configurable-TPS-Catchup.patch} |  8 ++--
 ...patch => 0105-Breedable-Polar-Bears.patch} |  6 +--
 ...=> 0106-Configurable-jockey-options.patch} | 17 ++++-----
 ...-Configurable-enchantment-max-level.patch} |  6 +--
 ...Optimize-entity-pathfinder-selector.patch} |  2 +-
 ....patch => 0109-Optimize-Chunk-Ticks.patch} |  2 +-
 ...figurable-beehive-generation-chance.patch} |  4 +-
 ...tch => 0111-Add-more-timings-timers.patch} |  4 +-
 ...Skip-events-if-there-s-no-listeners.patch} |  2 +-
 ...g-stick-should-not-update-neighbors.patch} |  2 +-
 ...ays-increment-arrow-despawn-counter.patch} |  4 +-
 ...72-Fix-Add-turtle-egg-block-options.patch} | 14 +++----
 ... 0116-MC-4-Fix-Item-position-desync.patch} | 10 ++---
 ...0117-MC-56653-Fix-pig-zombies-aggro.patch} | 27 +++++++------
 ...h => 0118-EMC-MonsterEggSpawn-Event.patch} |  8 ++--
 ...ch => 0119-EMC-Optimize-Pathfinding.patch} |  4 +-
 ...h => 0120-PaperPR-Add-BellRingEvent.patch} |  4 +-
 ...alculate-permissions-for-players-on.patch} | 19 +++++-----
 ...0122-PaperPR-Per-World-Spawn-limits.patch} | 10 ++---
 ...=> 0123-Tuinity-Delay-chunk-unloads.patch} |  8 ++--
 ...-entity-collision-code-if-not-neede.patch} |  8 ++--
 ... 0125-YAPFA-Disable-mojang-profiler.patch} | 14 +++----
 98 files changed, 330 insertions(+), 313 deletions(-)
 rename patches/server/{0031-Make-Iron-Golems-Swim.patch => 0030-Make-Iron-Golems-Swim.patch} (91%)
 rename patches/server/{0032-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0031-Allow-soil-to-moisten-from-water-directly-under-it.patch} (96%)
 rename patches/server/{0033-Controllable-Minecarts.patch => 0032-Controllable-Minecarts.patch} (96%)
 rename patches/server/{0034-Signs-allow-color-codes.patch => 0033-Signs-allow-color-codes.patch} (95%)
 rename patches/server/{0035-Campfires-have-regen-effect.patch => 0034-Campfires-have-regen-effect.patch} (99%)
 rename patches/server/{0036-Disable-loot-drops-on-death-by-cramming.patch => 0035-Disable-loot-drops-on-death-by-cramming.patch} (92%)
 rename patches/server/{0037-Campfires-burn-out-in-rain.patch => 0036-Campfires-burn-out-in-rain.patch} (97%)
 rename patches/server/{0038-Campfires-should-fall-with-gravity.patch => 0037-Campfires-should-fall-with-gravity.patch} (98%)
 rename patches/server/{0039-Dont-send-useless-entity-packets.patch => 0038-Dont-send-useless-entity-packets.patch} (98%)
 rename patches/server/{0042-Implement-AFK-API.patch => 0039-Implement-AFK-API.patch} (97%)
 rename patches/server/{0043-Option-to-toggle-milk-curing-bad-omen.patch => 0040-Option-to-toggle-milk-curing-bad-omen.patch} (91%)
 rename patches/server/{0044-Mending-mends-most-damages-equipment-first.patch => 0041-Mending-mends-most-damages-equipment-first.patch} (96%)
 rename patches/server/{0045-Tulips-change-fox-type.patch => 0042-Tulips-change-fox-type.patch} (97%)
 rename patches/server/{0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch => 0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch} (93%)
 rename patches/server/{0047-Make-the-GUI-better.patch => 0044-Make-the-GUI-better.patch} (98%)
 rename patches/server/{0048-Players-should-not-cram-to-death.patch => 0045-Players-should-not-cram-to-death.patch} (91%)
 rename patches/server/{0049-Add-EntityPortalReadyEvent.patch => 0046-Add-EntityPortalReadyEvent.patch} (98%)
 rename patches/server/{0050-Implement-elytra-settings.patch => 0047-Implement-elytra-settings.patch} (98%)
 rename patches/server/{0051-Add-tick-times-API.patch => 0048-Add-tick-times-API.patch} (98%)
 rename patches/server/{0052-Add-blacklist-option-for-grindstone.patch => 0049-Add-blacklist-option-for-grindstone.patch} (98%)
 rename patches/server/{0053-Implement-lagging-threshold.patch => 0050-Implement-lagging-threshold.patch} (92%)
 rename patches/server/{0054-Implement-configurable-villager-brain-ticks.patch => 0051-Implement-configurable-villager-brain-ticks.patch} (95%)
 rename patches/server/{0055-Add-option-for-zombies-targetting-turtle-eggs.patch => 0052-Add-option-for-zombies-targetting-turtle-eggs.patch} (93%)
 rename patches/server/{0056-Implement-bamboo-growth-settings.patch => 0053-Implement-bamboo-growth-settings.patch} (98%)
 rename patches/server/{0057-Climbing-should-not-bypass-cramming-gamerule.patch => 0054-Climbing-should-not-bypass-cramming-gamerule.patch} (97%)
 rename patches/server/{0058-Option-for-slimes-not-pushable.patch => 0055-Option-for-slimes-not-pushable.patch} (90%)
 rename patches/server/{0059-Bring-back-server-name.patch => 0056-Bring-back-server-name.patch} (96%)
 rename patches/server/{0060-Dispenser-curse-of-binding-protection.patch => 0057-Dispenser-curse-of-binding-protection.patch} (97%)
 rename patches/server/{0061-Implement-LivingEntity-safeFallDistance.patch => 0058-Implement-LivingEntity-safeFallDistance.patch} (98%)
 rename patches/server/{0062-Add-option-for-boats-to-eject-players-on-land.patch => 0059-Add-option-for-boats-to-eject-players-on-land.patch} (86%)
 rename patches/server/{0063-Advancement-API-Additions.patch => 0060-Advancement-API-Additions.patch} (99%)
 rename patches/server/{0064-Add-option-to-set-armorstand-step-height.patch => 0061-Add-option-to-set-armorstand-step-height.patch} (85%)
 rename patches/server/{0065-Implement-ItemFactory-getMonsterEgg.patch => 0062-Implement-ItemFactory-getMonsterEgg.patch} (97%)
 rename patches/server/{0066-Alternative-Keepalive-Handling.patch => 0063-Alternative-Keepalive-Handling.patch} (95%)
 rename patches/server/{0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch => 0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch} (97%)
 rename patches/server/{0069-Add-moon-phase-API.patch => 0065-Add-moon-phase-API.patch} (94%)
 rename patches/server/{0070-Add-getPlacementBlockData-to-World.patch => 0066-Add-getPlacementBlockData-to-World.patch} (98%)
 rename patches/server/{0071-Barrels-have-6-rows.patch => 0067-Barrels-have-6-rows.patch} (94%)
 rename patches/server/{0072-Enderchest-6-rows-plus-permissions.patch => 0068-Enderchest-6-rows-plus-permissions.patch} (98%)
 rename patches/server/{0073-Add-5-second-tps-average-in-tps.patch => 0069-Add-5-second-tps-average-in-tps.patch} (98%)
 rename patches/server/{0075-Add-playPickupItemAnimation-to-LivingEntity.patch => 0070-Add-playPickupItemAnimation-to-LivingEntity.patch} (94%)
 rename patches/server/{0076-Add-more-evoker-API.patch => 0071-Add-more-evoker-API.patch} (97%)
 rename patches/server/{0077-Add-API-for-Villager-resetOffers.patch => 0072-Add-API-for-Villager-resetOffers.patch} (97%)
 rename patches/server/{0078-Add-more-llama-API.patch => 0073-Add-more-llama-API.patch} (97%)
 rename patches/server/{0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch => 0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch} (95%)
 rename patches/server/{0080-Implement-infinite-lava.patch => 0075-Implement-infinite-lava.patch} (97%)
 rename patches/server/{0081-Expose-getItemStack-for-Trident.patch => 0076-Expose-getItemStack-for-Trident.patch} (96%)
 rename patches/server/{0082-Despawn-egg-hatches-chicken.patch => 0077-Despawn-egg-hatches-chicken.patch} (95%)
 rename patches/server/{0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (97%)
 rename patches/server/{0084-Add-sleep-options.patch => 0079-Add-sleep-options.patch} (90%)
 rename patches/server/{0085-Option-for-hay-block-fall-damage.patch => 0080-Option-for-hay-block-fall-damage.patch} (94%)
 rename patches/server/{0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (96%)
 rename patches/server/{0087-Add-LootableInventoryFirstFillEvent.patch => 0082-Add-LootableInventoryFirstFillEvent.patch} (97%)
 rename patches/server/{0088-Villagers-follow-emerald-blocks.patch => 0083-Villagers-follow-emerald-blocks.patch} (96%)
 rename patches/server/{0089-Add-player-death-exp-control-options.patch => 0084-Add-player-death-exp-control-options.patch} (93%)
 rename patches/server/{0090-Add-permission-for-F3-N-debug.patch => 0085-Add-permission-for-F3-N-debug.patch} (83%)
 rename patches/server/{0091-Allow-leashing-villagers.patch => 0086-Allow-leashing-villagers.patch} (96%)
 rename patches/server/{0092-Implement-configurable-search-radius-for-villagers-t.patch => 0087-Implement-configurable-search-radius-for-villagers-t.patch} (92%)
 rename patches/server/{0093-Make-lava-flow-speed-configurable.patch => 0088-Make-lava-flow-speed-configurable.patch} (96%)
 rename patches/server/{0094-Add-wither-skeleton-takes-wither-damage-option.patch => 0089-Add-wither-skeleton-takes-wither-damage-option.patch} (93%)
 rename patches/server/{0095-UPnP-Port-Forwarding-Service.patch => 0090-UPnP-Port-Forwarding-Service.patch} (96%)
 rename patches/server/{0096-Implement-EntityMoveEvent.patch => 0091-Implement-EntityMoveEvent.patch} (96%)
 rename patches/server/{0097-Add-option-to-disable-saving-projectiles-to-disk.patch => 0092-Add-option-to-disable-saving-projectiles-to-disk.patch} (97%)
 rename patches/server/{0099-Implement-bed-explosion-options.patch => 0093-Implement-bed-explosion-options.patch} (97%)
 rename patches/server/{0100-Add-item-entity-options.patch => 0094-Add-item-entity-options.patch} (96%)
 rename patches/server/{0101-Make-natural-spawns-per-biome-configurable.patch => 0095-Make-natural-spawns-per-biome-configurable.patch} (99%)
 rename patches/server/{0102-Configurable-void-damage-height.patch => 0096-Configurable-void-damage-height.patch} (90%)
 rename patches/server/{0103-Fix-the-dead-lagging-the-server.patch => 0097-Fix-the-dead-lagging-the-server.patch} (94%)
 rename patches/server/{0104-Add-flying-mobs-to-entity-activation-range-settings.patch => 0098-Add-flying-mobs-to-entity-activation-range-settings.patch} (98%)
 rename patches/server/{0105-Add-mspt-command.patch => 0099-Add-mspt-command.patch} (98%)
 rename patches/server/{0106-Add-ping-command.patch => 0100-Add-ping-command.patch} (99%)
 rename patches/server/{0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (87%)
 rename patches/server/{0108-Configurable-server-mod-name.patch => 0102-Configurable-server-mod-name.patch} (84%)
 rename patches/server/{0109-End-gateway-should-check-if-entity-can-use-portal.patch => 0103-End-gateway-should-check-if-entity-can-use-portal.patch} (94%)
 rename patches/server/{0112-Configurable-TPS-Catchup.patch => 0104-Configurable-TPS-Catchup.patch} (88%)
 rename patches/server/{0113-Breedable-Polar-Bears.patch => 0105-Breedable-Polar-Bears.patch} (96%)
 rename patches/server/{0114-Configurable-jockey-options.patch => 0106-Configurable-jockey-options.patch} (96%)
 rename patches/server/{0115-Configurable-enchantment-max-level.patch => 0107-Configurable-enchantment-max-level.patch} (99%)
 rename patches/server/{0117-Optimize-entity-pathfinder-selector.patch => 0108-Optimize-entity-pathfinder-selector.patch} (99%)
 rename patches/server/{0118-Optimize-Chunk-Ticks.patch => 0109-Optimize-Chunk-Ticks.patch} (99%)
 rename patches/server/{0122-Add-configurable-beehive-generation-chance.patch => 0110-Add-configurable-beehive-generation-chance.patch} (98%)
 rename patches/server/{0123-Add-more-timings-timers.patch => 0111-Add-more-timings-timers.patch} (98%)
 rename patches/server/{0124-Skip-events-if-there-s-no-listeners.patch => 0112-Skip-events-if-there-s-no-listeners.patch} (95%)
 rename patches/server/{0125-Debug-stick-should-not-update-neighbors.patch => 0113-Debug-stick-should-not-update-neighbors.patch} (94%)
 rename patches/server/{0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch => 0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch} (93%)
 rename patches/server/{0030-Add-turtle-egg-block-options-fixes-MC-168772.patch => 0115-MC-168772-Fix-Add-turtle-egg-block-options.patch} (87%)
 rename patches/server/{0040-Fix-item-position-desync-MC-4.patch => 0116-MC-4-Fix-Item-position-desync.patch} (92%)
 rename patches/server/{0041-Fix-pig-zombies-MC-56653.patch => 0117-MC-56653-Fix-pig-zombies-aggro.patch} (70%)
 rename patches/server/{0068-Add-MonsterEggSpawnEvent.patch => 0118-EMC-MonsterEggSpawn-Event.patch} (95%)
 rename patches/server/{0116-Optimize-Pathfinding.patch => 0119-EMC-Optimize-Pathfinding.patch} (95%)
 rename patches/server/{0110-Add-BellRingEvent.patch => 0120-PaperPR-Add-BellRingEvent.patch} (95%)
 rename patches/server/{0074-Don-t-recalculate-permissions-for-players-on-world-c.patch => 0121-PaperPR-Don-t-recalculate-permissions-for-players-on.patch} (85%)
 rename patches/server/{0121-Per-World-Spawn-limits.patch => 0122-PaperPR-Per-World-Spawn-limits.patch} (89%)
 rename patches/server/{0119-Delay-chunk-unloads.patch => 0123-Tuinity-Delay-chunk-unloads.patch} (98%)
 rename patches/server/{0120-Don-t-run-entity-collision-code-if-not-needed.patch => 0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch} (85%)
 rename patches/server/{0111-Disable-mojang-profiler.patch => 0125-YAPFA-Disable-mojang-profiler.patch} (95%)

diff --git a/Paper b/Paper
index 2c37d2ebe..6c39a59ae 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 2c37d2ebeeacc5ff4a72ba860c386a522fe75a42
+Subproject commit 6c39a59ae793cb2e1735f624013c8ffa562219f4
diff --git a/patches/server/0003-decompile-fixes.patch b/patches/server/0003-decompile-fixes.patch
index 0f8b034c8..fd7754bc4 100644
--- a/patches/server/0003-decompile-fixes.patch
+++ b/patches/server/0003-decompile-fixes.patch
@@ -1,4 +1,4 @@
-From a89bbe90c2218f7ce1a2c106f2c8d0166290ef21 Mon Sep 17 00:00:00 2001
+From 106e7e57474342b5a012d4bad86fe8438a8cc663 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] decompile-fixes
@@ -88,10 +88,11 @@ Subject: [PATCH] decompile-fixes
  .../net/minecraft/server/EntityParrot.java    |  4 +--
  .../net/minecraft/server/EntitySheep.java     |  6 ++---
  .../net/minecraft/server/EntityWitch.java     |  4 +--
+ .../net/minecraft/server/GeneratorAccess.java |  2 +-
  .../java/net/minecraft/server/MathHelper.java |  2 +-
  .../server/WorldGenFeatureConfigured.java     |  2 +-
  .../server/WorldGenFeatureTreeBeehive.java    |  2 +-
- 87 files changed, 226 insertions(+), 232 deletions(-)
+ 88 files changed, 227 insertions(+), 233 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 index de831ed87e..9c38f8907a 100644
@@ -1561,6 +1562,19 @@ index 7b6b1ad17b..1432d3f6bf 100644
          this.targetSelector.a(2, this.bz);
          this.targetSelector.a(3, this.bA);
      }
+diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
+index e865a5694f..acc5f61ced 100644
+--- a/src/main/java/net/minecraft/server/GeneratorAccess.java
++++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
+@@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
+     void a(@Nullable EntityHuman entityhuman, int i, BlockPosition blockposition, int j);
+ 
+     default void triggerEffect(int i, BlockPosition blockposition, int j) {
+-        this.a((EntityHuman) null, i, blockposition, j);
++        this.a(null, i, blockposition, j); // Purpur - decompile error
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
 index 38b79b5b10..c4aa38ddf1 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
diff --git a/patches/server/0031-Make-Iron-Golems-Swim.patch b/patches/server/0030-Make-Iron-Golems-Swim.patch
similarity index 91%
rename from patches/server/0031-Make-Iron-Golems-Swim.patch
rename to patches/server/0030-Make-Iron-Golems-Swim.patch
index 84df7d6b2..0f10a83cc 100644
--- a/patches/server/0031-Make-Iron-Golems-Swim.patch
+++ b/patches/server/0030-Make-Iron-Golems-Swim.patch
@@ -1,4 +1,4 @@
-From 8255937a5c894806e5cfc0e433dc29e605b9e9a5 Mon Sep 17 00:00:00 2001
+From 7ef961aff34ea9ce4aa25a14c904582636207e8d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
  2 files changed, 3 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 288a043fb..0cc3b8eb0 100644
+index 288a043fbd..0cc3b8eb01 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -36,6 +36,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,10 +21,10 @@ index 288a043fb..0cc3b8eb0 100644
          this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a1d075246..6e506dff8 100644
+index 3b6ace7856..8810a596fb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -342,10 +342,12 @@ public class PurpurWorldConfig {
+@@ -333,10 +333,12 @@ public class PurpurWorldConfig {
      public boolean ironGolemRidable = false;
      public boolean ironGolemRidableInWater = false;
      public boolean ironGolemRequireShiftToMount = true;
diff --git a/patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 96%
rename from patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
index c9234c88c..275a19821 100644
--- a/patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -1,4 +1,4 @@
-From 29f71d98c3ba415d64064c5acfa52a5376a3efc4 Mon Sep 17 00:00:00 2001
+From e23c594e222b52481a4e661bf8c5ac89a6f26755 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
@@ -47,7 +47,7 @@ index b6561f2c79..f2ab3ee011 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 114fe87f4a..08cef8e645 100644
+index 8810a596fb..ecaa388a29 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -65,6 +65,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0033-Controllable-Minecarts.patch b/patches/server/0032-Controllable-Minecarts.patch
similarity index 96%
rename from patches/server/0033-Controllable-Minecarts.patch
rename to patches/server/0032-Controllable-Minecarts.patch
index 5f645328a..982c5c937 100644
--- a/patches/server/0033-Controllable-Minecarts.patch
+++ b/patches/server/0032-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From 4375fbfecad73783db63b9d11cfafb157bf1108b Mon Sep 17 00:00:00 2001
+From 6d4b0ac5099bcd3c0ac27191ae75c1f61c6e51fc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd48d13e0a..7bba9e9c43 100644
+index 6b95b89e89..313b74fb0f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1293,6 +1293,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -103,7 +103,7 @@ index b73e317fbb..e1337a9c04 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a89c484df0..5406c5066b 100644
+index ecaa388a29..0894523d72 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,10 +1,16 @@
@@ -123,8 +123,8 @@ index a89c484df0..5406c5066b 100644
  
  import static net.pl3x.purpur.PurpurConfig.log;
  
-@@ -84,6 +90,32 @@ public class PurpurWorldConfig {
-         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
+@@ -75,6 +81,32 @@ public class PurpurWorldConfig {
+         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  
 +    public boolean controllableMinecarts = false;
diff --git a/patches/server/0034-Signs-allow-color-codes.patch b/patches/server/0033-Signs-allow-color-codes.patch
similarity index 95%
rename from patches/server/0034-Signs-allow-color-codes.patch
rename to patches/server/0033-Signs-allow-color-codes.patch
index 5b60bb561..69ce735f2 100644
--- a/patches/server/0034-Signs-allow-color-codes.patch
+++ b/patches/server/0033-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 3fe44c34e9c2f2a60eaba70bbda3dadd77495341 Mon Sep 17 00:00:00 2001
+From c4c61bd67ed2e76f34bf244041d1518f29512af3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Signs allow color codes
@@ -11,7 +11,7 @@ Subject: [PATCH] Signs allow color codes
  4 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f4fcefc68..cc66f5e1a 100644
+index c8e2b81a1f..96b9d60bd4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1131,6 +1131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,7 +23,7 @@ index f4fcefc68..cc66f5e1a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7929fcc80..895e34ed3 100644
+index 7929fcc800..895e34ed34 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index 7929fcc80..895e34ed3 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 099d98e04..19d76c8cc 100644
+index 099d98e04c..19d76c8cce 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e04..19d76c8cc 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 086bd505c..bf9093158 100644
+index 0894523d72..3c7f545e2e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -76,8 +76,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0035-Campfires-have-regen-effect.patch b/patches/server/0034-Campfires-have-regen-effect.patch
similarity index 99%
rename from patches/server/0035-Campfires-have-regen-effect.patch
rename to patches/server/0034-Campfires-have-regen-effect.patch
index bf074a10b..acca7b5a7 100644
--- a/patches/server/0035-Campfires-have-regen-effect.patch
+++ b/patches/server/0034-Campfires-have-regen-effect.patch
@@ -1,4 +1,4 @@
-From 8995f846b274ea14dd1486c6f8f1ccf7fc3938d8 Mon Sep 17 00:00:00 2001
+From af5c19a1d071f70a805d733799353485d3a679ef Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Campfires have regen effect
@@ -165,7 +165,7 @@ index a1580b8c6d..618ca2d763 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bf9093158b..2eb483d30f 100644
+index 3c7f545e2e..3aa2da98b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -71,6 +71,29 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
similarity index 92%
rename from patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
index 284c3724a..779de229a 100644
--- a/patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0035-Disable-loot-drops-on-death-by-cramming.patch
@@ -1,4 +1,4 @@
-From c3e420c80c3f9c5cd60e3427b907fa625154d4ae Mon Sep 17 00:00:00 2001
+From 161985c2f3d69f5a509003d22dd54fd8a7ba0c8f 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
@@ -24,10 +24,10 @@ index 106fb5c027..0310e4ddd1 100644
              deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2eb483d30f..7d8d2f6d9d 100644
+index 3aa2da98b8..1072aa2e58 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -121,6 +121,7 @@ public class PurpurWorldConfig {
+@@ -112,6 +112,7 @@ public class PurpurWorldConfig {
      public double controllableMinecartsHopBoost = 0.5D;
      public double controllableMinecartsBaseSpeed = 0.1D;
      public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
@@ -35,7 +35,7 @@ index 2eb483d30f..7d8d2f6d9d 100644
      private void gameplayMechanicsSettings() {
          controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
          controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
-@@ -139,6 +140,7 @@ public class PurpurWorldConfig {
+@@ -130,6 +131,7 @@ public class PurpurWorldConfig {
              set("gameplay-mechanics.controllable-minecarts.block-speed.grass-block", 0.3D);
              set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D);
          }
diff --git a/patches/server/0037-Campfires-burn-out-in-rain.patch b/patches/server/0036-Campfires-burn-out-in-rain.patch
similarity index 97%
rename from patches/server/0037-Campfires-burn-out-in-rain.patch
rename to patches/server/0036-Campfires-burn-out-in-rain.patch
index f36380375..d69d7a6fc 100644
--- a/patches/server/0037-Campfires-burn-out-in-rain.patch
+++ b/patches/server/0036-Campfires-burn-out-in-rain.patch
@@ -1,4 +1,4 @@
-From 32d7363527a4c8dce909e9d85aaf0e4c3fc36443 Mon Sep 17 00:00:00 2001
+From f0185947ca1047079b3b7e96d04a6747b4d2d795 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
@@ -58,7 +58,7 @@ index 65f8d803b8..3b95dfaaae 100644
      public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
          if ((Boolean) iblockdata.get(BlockCampfire.d)) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d8d2f6d9d..1e31357340 100644
+index 1072aa2e58..6aa26a1974 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -81,6 +81,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0038-Campfires-should-fall-with-gravity.patch b/patches/server/0037-Campfires-should-fall-with-gravity.patch
similarity index 98%
rename from patches/server/0038-Campfires-should-fall-with-gravity.patch
rename to patches/server/0037-Campfires-should-fall-with-gravity.patch
index ac65c7231..49bc06c45 100644
--- a/patches/server/0038-Campfires-should-fall-with-gravity.patch
+++ b/patches/server/0037-Campfires-should-fall-with-gravity.patch
@@ -1,4 +1,4 @@
-From d420003742cabe3f07be2233cdd78ad631fe8000 Mon Sep 17 00:00:00 2001
+From c4efe79678a5f66e299642543477e7536add03bc 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
@@ -59,7 +59,7 @@ index 3b95dfaaae..418fa6d1fe 100644
  
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1e31357340..9324fdd095 100644
+index 6aa26a1974..c6bf9395c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -82,6 +82,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0039-Dont-send-useless-entity-packets.patch b/patches/server/0038-Dont-send-useless-entity-packets.patch
similarity index 98%
rename from patches/server/0039-Dont-send-useless-entity-packets.patch
rename to patches/server/0038-Dont-send-useless-entity-packets.patch
index 70fce33ee..e1eb00745 100644
--- a/patches/server/0039-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0038-Dont-send-useless-entity-packets.patch
@@ -1,4 +1,4 @@
-From 7c36e3a59376a5f986e9ddde4819d7f4384938bf Mon Sep 17 00:00:00 2001
+From 0615cce725fded5d85634ddd864dab33a6b3a9b9 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/0042-Implement-AFK-API.patch b/patches/server/0039-Implement-AFK-API.patch
similarity index 97%
rename from patches/server/0042-Implement-AFK-API.patch
rename to patches/server/0039-Implement-AFK-API.patch
index 4f016d109..af92c17d8 100644
--- a/patches/server/0042-Implement-AFK-API.patch
+++ b/patches/server/0039-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 353f57eb50fa9510dc2b2c5d7bae35b52e26a4ea Mon Sep 17 00:00:00 2001
+From 190e3873141083981bc52c2c422d840488f46f44 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -18,7 +18,7 @@ Subject: [PATCH] Implement AFK API
  11 files changed, 112 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7bba9e9c43..9239f83e74 100644
+index 313b74fb0f..cdb32e40ed 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1385,6 +1385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,7 +30,7 @@ index 7bba9e9c43..9239f83e74 100644
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index de22cad764..9d26bd1e4c 100644
+index f372c13d8b..d69854b5c1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -50,7 +50,7 @@ index de22cad764..9d26bd1e4c 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cc66f5e1a4..1f20b89696 100644
+index 96b9d60bd4..ed0f0542c0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -228,10 +228,10 @@ index 02f711540b..0eca6f42d9 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 76a8ac3b8b..8a36ac3ad1 100644
+index c6bf9395c1..76f8c8fed1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -147,6 +147,17 @@ public class PurpurWorldConfig {
+@@ -138,6 +138,17 @@ public class PurpurWorldConfig {
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
      }
  
@@ -276,7 +276,7 @@ index 60f62f19cb..fa9fc940a2 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f4cb669740..a0ac98ede2 100644
+index 795817177a..17c4d7ec9b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -146,6 +146,7 @@ public class ActivationRange
diff --git a/patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 91%
rename from patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
index a218dadfc..3d24fe7b4 100644
--- a/patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
@@ -1,4 +1,4 @@
-From 64af6e51211c169c38e2e6c8312ab2c9edb90125 Mon Sep 17 00:00:00 2001
+From 778a063ca719b2f12b3072e0df639ad2222dbd71 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
@@ -24,10 +24,10 @@ index 6b255e09ac..e1d3894ab7 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b454d71ac0..0062cae90c 100644
+index 76f8c8fed1..8efb7a4e05 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -126,6 +126,7 @@ public class PurpurWorldConfig {
+@@ -117,6 +117,7 @@ public class PurpurWorldConfig {
      public double controllableMinecartsBaseSpeed = 0.1D;
      public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
      public boolean disableDropsOnCrammingDeath = false;
@@ -35,7 +35,7 @@ index b454d71ac0..0062cae90c 100644
      private void gameplayMechanicsSettings() {
          controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
          controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
-@@ -145,6 +146,7 @@ public class PurpurWorldConfig {
+@@ -136,6 +137,7 @@ public class PurpurWorldConfig {
              set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D);
          }
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
diff --git a/patches/server/0044-Mending-mends-most-damages-equipment-first.patch b/patches/server/0041-Mending-mends-most-damages-equipment-first.patch
similarity index 96%
rename from patches/server/0044-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0041-Mending-mends-most-damages-equipment-first.patch
index d355a62fa..60ff5963c 100644
--- a/patches/server/0044-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0041-Mending-mends-most-damages-equipment-first.patch
@@ -1,4 +1,4 @@
-From 126d0b582742e1c40bc865d4bf37e4a9bc88db9e Mon Sep 17 00:00:00 2001
+From 78cc6fb2ce8d6f1d4087d72e19a7f4c8df1f3ca9 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
@@ -86,10 +86,10 @@ index 4730c2beb7..4fe5038083 100644
          return this.tag == null ? 0 : this.tag.getInt("Damage");
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0062cae90c..89e86ec7c1 100644
+index 8efb7a4e05..0c70093483 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -127,6 +127,7 @@ public class PurpurWorldConfig {
+@@ -118,6 +118,7 @@ public class PurpurWorldConfig {
      public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
      public boolean disableDropsOnCrammingDeath = false;
      public boolean milkCuresBadOmen = true;
@@ -97,7 +97,7 @@ index 0062cae90c..89e86ec7c1 100644
      private void gameplayMechanicsSettings() {
          controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
          controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
-@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
+@@ -138,6 +139,7 @@ public class PurpurWorldConfig {
          }
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
diff --git a/patches/server/0045-Tulips-change-fox-type.patch b/patches/server/0042-Tulips-change-fox-type.patch
similarity index 97%
rename from patches/server/0045-Tulips-change-fox-type.patch
rename to patches/server/0042-Tulips-change-fox-type.patch
index 4e4ced6e9..feb2cf821 100644
--- a/patches/server/0045-Tulips-change-fox-type.patch
+++ b/patches/server/0042-Tulips-change-fox-type.patch
@@ -1,4 +1,4 @@
-From 794914413f22901e9dff389b3b93b2912de134d2 Mon Sep 17 00:00:00 2001
+From 87309ca0a55c7724e2025a677f516340db6eca98 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
@@ -90,10 +90,10 @@ index 54670f64cf..9c9b93f280 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 89e86ec7c1..bd0c2f98fa 100644
+index 0c70093483..9579b477e6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -344,10 +344,12 @@ public class PurpurWorldConfig {
+@@ -335,10 +335,12 @@ public class PurpurWorldConfig {
      public boolean foxRidable = false;
      public boolean foxRidableInWater = false;
      public boolean foxRequireShiftToMount = true;
diff --git a/patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch b/patches/server/0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
similarity index 93%
rename from patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
rename to patches/server/0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
index 9e54e346d..0d55ca6e9 100644
--- a/patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
+++ b/patches/server/0043-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
@@ -1,4 +1,4 @@
-From 8b255c6b671828a2f0d05d14d607bf79a7710d0f Mon Sep 17 00:00:00 2001
+From 7db263a216a1e8ddf47a9c7db3e220ee6648f41a 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
@@ -21,10 +21,10 @@ index 70f43c5159..baca8f7054 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d90843bc75..a4e23c2073 100644
+index 9579b477e6..0bfafa054d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -538,10 +538,12 @@ public class PurpurWorldConfig {
+@@ -529,10 +529,12 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public boolean pillagerRequireShiftToMount = true;
diff --git a/patches/server/0047-Make-the-GUI-better.patch b/patches/server/0044-Make-the-GUI-better.patch
similarity index 98%
rename from patches/server/0047-Make-the-GUI-better.patch
rename to patches/server/0044-Make-the-GUI-better.patch
index 06b6c5072..0bad511c3 100644
--- a/patches/server/0047-Make-the-GUI-better.patch
+++ b/patches/server/0044-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From ff97f6b0269e505297cf44e443e448d123f7d220 Mon Sep 17 00:00:00 2001
+From ad0065c28eb221e73573fc8f9bc1e5a72fcf45fc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index d70c8cab2..1c1a34e69 100644
+index e614570d33..bd9c123d56 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -88,7 +88,7 @@ index d70c8cab2..1c1a34e69 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b31a9ac78..f939f56d9 100644
+index b31a9ac78c..f939f56d96 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -101,7 +101,7 @@ index b31a9ac78..f939f56d9 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 new file mode 100644
-index 000000000..973b5efef
+index 0000000000..973b5efef5
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 @@ -0,0 +1,123 @@
@@ -230,7 +230,7 @@ index 000000000..973b5efef
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
 new file mode 100644
-index 000000000..55feec811
+index 0000000000..55feec811f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
 @@ -0,0 +1,81 @@
@@ -317,7 +317,7 @@ index 000000000..55feec811
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
 new file mode 100644
-index 000000000..fb017a070
+index 0000000000..fb017a0708
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
 @@ -0,0 +1,128 @@
@@ -451,7 +451,7 @@ index 000000000..fb017a070
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
 new file mode 100644
-index 000000000..4e0b80fdd
+index 0000000000..4e0b80fddb
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
 @@ -0,0 +1,21 @@
@@ -478,7 +478,7 @@ index 000000000..4e0b80fdd
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 new file mode 100644
-index 000000000..c4903c7db
+index 0000000000..c4903c7db6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 @@ -0,0 +1,42 @@
@@ -526,7 +526,7 @@ index 000000000..c4903c7db
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 new file mode 100644
-index 000000000..1e049d575
+index 0000000000..1e049d575b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 @@ -0,0 +1,59 @@
@@ -591,7 +591,7 @@ index 000000000..1e049d575
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
 new file mode 100644
-index 000000000..2fdb9bdd0
+index 0000000000..2fdb9bdd0d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
 @@ -0,0 +1,44 @@
@@ -641,7 +641,7 @@ index 000000000..2fdb9bdd0
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
 new file mode 100644
-index 000000000..85babad9c
+index 0000000000..85babad9cd
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
 @@ -0,0 +1,47 @@
@@ -694,7 +694,7 @@ index 000000000..85babad9c
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
 new file mode 100644
-index 000000000..0c0c73bee
+index 0000000000..0c0c73beeb
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
 @@ -0,0 +1,144 @@
@@ -844,7 +844,7 @@ index 000000000..0c0c73bee
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
 new file mode 100644
-index 000000000..17e75a207
+index 0000000000..17e75a2070
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
 @@ -0,0 +1,57 @@
@@ -907,7 +907,7 @@ index 000000000..17e75a207
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
 new file mode 100644
-index 000000000..2f02e9adc
+index 0000000000..2f02e9adc7
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
 @@ -0,0 +1,22 @@
@@ -935,7 +935,7 @@ index 000000000..2f02e9adc
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
 new file mode 100644
-index 000000000..edbf45416
+index 0000000000..edbf454163
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
 @@ -0,0 +1,47 @@
@@ -988,7 +988,7 @@ index 000000000..edbf45416
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
 new file mode 100644
-index 000000000..13a5eb3ad
+index 0000000000..13a5eb3ad3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
 @@ -0,0 +1,32 @@
@@ -1026,7 +1026,7 @@ index 000000000..13a5eb3ad
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
 new file mode 100644
-index 000000000..973c8ddf9
+index 0000000000..973c8ddf93
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
 @@ -0,0 +1,54 @@
@@ -1086,7 +1086,7 @@ index 000000000..973c8ddf9
 +}
 diff --git a/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 new file mode 100644
-index 000000000..4b340b88a
+index 0000000000..4b340b88a2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 @@ -0,0 +1,86 @@
@@ -1177,7 +1177,7 @@ index 000000000..4b340b88a
 +
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a9bb98765..4be7613d0 100644
+index a9bb987652..4be7613d0f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,8 +1,17 @@
diff --git a/patches/server/0048-Players-should-not-cram-to-death.patch b/patches/server/0045-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/0045-Players-should-not-cram-to-death.patch
index 3288c4042..dcd5e2156 100644
--- a/patches/server/0048-Players-should-not-cram-to-death.patch
+++ b/patches/server/0045-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From 0e94855b9937f4826ea40fbe796beacaa674771a Mon Sep 17 00:00:00 2001
+From 77e74101767575ce4990f63ab6adc423fa3517aa 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 1f20b8969..c357d2231 100644
+index ed0f0542c0..e9acf6509c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1105,7 +1105,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0049-Add-EntityPortalReadyEvent.patch b/patches/server/0046-Add-EntityPortalReadyEvent.patch
similarity index 98%
rename from patches/server/0049-Add-EntityPortalReadyEvent.patch
rename to patches/server/0046-Add-EntityPortalReadyEvent.patch
index 57853271d..918dae2bf 100644
--- a/patches/server/0049-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0046-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From caf6dea52cfe39de2b21bb01716fc0db505fec0d Mon Sep 17 00:00:00 2001
+From 06beb46a65ac9ad982302a218fa13873f257e06f 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
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9239f83e74..d90b01a7ee 100644
+index cdb32e40ed..3a7024b08c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0050-Implement-elytra-settings.patch b/patches/server/0047-Implement-elytra-settings.patch
similarity index 98%
rename from patches/server/0050-Implement-elytra-settings.patch
rename to patches/server/0047-Implement-elytra-settings.patch
index bd5bbb3e3..adf29544c 100644
--- a/patches/server/0050-Implement-elytra-settings.patch
+++ b/patches/server/0047-Implement-elytra-settings.patch
@@ -1,4 +1,4 @@
-From 42c73917e959e85cbaf017f489bc90116046492d Mon Sep 17 00:00:00 2001
+From 4506bcccff567bea72a7d6ce3ce1f9d69d74466c 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
@@ -115,10 +115,10 @@ index 62a0810062..53e7e82688 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 18a30fde39..3b932e329e 100644
+index 0bfafa054d..0f0975e730 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -151,6 +151,19 @@ public class PurpurWorldConfig {
+@@ -142,6 +142,19 @@ public class PurpurWorldConfig {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
      }
  
diff --git a/patches/server/0051-Add-tick-times-API.patch b/patches/server/0048-Add-tick-times-API.patch
similarity index 98%
rename from patches/server/0051-Add-tick-times-API.patch
rename to patches/server/0048-Add-tick-times-API.patch
index 62563de4e..98fa0112f 100644
--- a/patches/server/0051-Add-tick-times-API.patch
+++ b/patches/server/0048-Add-tick-times-API.patch
@@ -1,4 +1,4 @@
-From 86132ea883b70eadb9869c2f242a70dc624efd4c Mon Sep 17 00:00:00 2001
+From eef7618cf7493834b52ae7986d84d84dbde318d6 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/0049-Add-blacklist-option-for-grindstone.patch
similarity index 98%
rename from patches/server/0052-Add-blacklist-option-for-grindstone.patch
rename to patches/server/0049-Add-blacklist-option-for-grindstone.patch
index 60397e107..332cd687a 100644
--- a/patches/server/0052-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0049-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From 70f5a303345a54e3c7a95ec62d1e4112d028f5aa Mon Sep 17 00:00:00 2001
+From 1309766e3d46d414d3dc5ca823c3a35fa671e1eb 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
@@ -68,7 +68,7 @@ index 7b7a0a7cb1..6b45bc17cf 100644
          return this.getItem().f(this);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3b932e329e..b0747e092c 100644
+index 0f0975e730..60f5f21645 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;
diff --git a/patches/server/0053-Implement-lagging-threshold.patch b/patches/server/0050-Implement-lagging-threshold.patch
similarity index 92%
rename from patches/server/0053-Implement-lagging-threshold.patch
rename to patches/server/0050-Implement-lagging-threshold.patch
index 5b398452d..875ea342c 100644
--- a/patches/server/0053-Implement-lagging-threshold.patch
+++ b/patches/server/0050-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From 9406e3dd30db91cc126ff4399294e4798d8016ec Mon Sep 17 00:00:00 2001
+From 652c74660ca2847379061598db0d76f1778cedad 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
@@ -30,7 +30,7 @@ index 334ebae14f..14d6f67c2b 100644
                      }
                      // Spigot end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3670b4d48d..968d21dda4 100644
+index e219312168..b608b1deb3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -142,6 +142,11 @@ public class PurpurConfig {
@@ -43,8 +43,8 @@ index 3670b4d48d..968d21dda4 100644
 +    }
 +
      public static boolean dontSendUselessEntityPackets = false;
-     public static boolean fixItemPositionDesync = false;
      private static void dontSendUselessEntityPackets() {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index cea28154e2..13da5fedbb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
diff --git a/patches/server/0054-Implement-configurable-villager-brain-ticks.patch b/patches/server/0051-Implement-configurable-villager-brain-ticks.patch
similarity index 95%
rename from patches/server/0054-Implement-configurable-villager-brain-ticks.patch
rename to patches/server/0051-Implement-configurable-villager-brain-ticks.patch
index 4738a5a7d..50ecc42dd 100644
--- a/patches/server/0054-Implement-configurable-villager-brain-ticks.patch
+++ b/patches/server/0051-Implement-configurable-villager-brain-ticks.patch
@@ -1,4 +1,4 @@
-From 263d652371bd50e3fa16d633e216269224018c75 Mon Sep 17 00:00:00 2001
+From 5a42488252ac128e22c93c09401c0c65609ed4a2 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
@@ -40,10 +40,10 @@ index 3eaac031fb..65cd5f53c1 100644
          this.world.getMethodProfiler().exit();
          if (!this.et() && this.bB > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ffc388541d..77b675d3e3 100644
+index 60f5f21645..43b09aa890 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -746,10 +746,14 @@ public class PurpurWorldConfig {
+@@ -737,10 +737,14 @@ public class PurpurWorldConfig {
      public boolean villagerRidable = false;
      public boolean villagerRidableInWater = false;
      public boolean villagerRequireShiftToMount = true;
diff --git a/patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
similarity index 93%
rename from patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch
rename to patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
index 85f81f752..245cab3d1 100644
--- a/patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch
+++ b/patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
@@ -1,4 +1,4 @@
-From 8eec926233aafb6ec3054f81522de1facbfa06a2 Mon Sep 17 00:00:00 2001
+From 0b06e5072c4a31938381be3690a45935ec89a390 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
@@ -22,10 +22,10 @@ index 8d1f04415e..95ae6f3494 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 77b675d3e3..8bc5b2b264 100644
+index 43b09aa890..f3d9944e93 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -815,10 +815,12 @@ public class PurpurWorldConfig {
+@@ -806,10 +806,12 @@ public class PurpurWorldConfig {
      public boolean zombieRidable = false;
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;
diff --git a/patches/server/0056-Implement-bamboo-growth-settings.patch b/patches/server/0053-Implement-bamboo-growth-settings.patch
similarity index 98%
rename from patches/server/0056-Implement-bamboo-growth-settings.patch
rename to patches/server/0053-Implement-bamboo-growth-settings.patch
index b9ab373db..7599aea48 100644
--- a/patches/server/0056-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0053-Implement-bamboo-growth-settings.patch
@@ -1,4 +1,4 @@
-From 16b7461a4692820e86d06ee29c59b96661fc9089 Mon Sep 17 00:00:00 2001
+From 86128fc56605abb5750fbb85c81d652a6c06263a 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
@@ -76,7 +76,7 @@ index 02c548dd9c..016ceebb9d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aee946c27e..8680e173d8 100644
+index f3d9944e93..9e6f4bb843 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -72,6 +72,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch
index 342e5019c..8c8598183 100644
--- a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 30b7d0ce1416d9d9307a0ab175d44adbfa6da5da Mon Sep 17 00:00:00 2001
+From 2f98750b79199b775d18ce235717cfe8f1eaec20 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d90b01a7ee..8222f7caf2 100644
+index 3a7024b08c..09224e2b11 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1520,6 +1520,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -161,10 +161,10 @@ index 4665671ef6..fbf2a50f08 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 033c094902..a72abb4117 100644
+index 9e6f4bb843..c593180397 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -145,6 +145,7 @@ public class PurpurWorldConfig {
+@@ -136,6 +136,7 @@ public class PurpurWorldConfig {
      public double controllableMinecartsBaseSpeed = 0.1D;
      public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
      public boolean disableDropsOnCrammingDeath = false;
@@ -172,7 +172,7 @@ index 033c094902..a72abb4117 100644
      public boolean milkCuresBadOmen = true;
      public boolean useBetterMending = false;
      private void gameplayMechanicsSettings() {
-@@ -166,6 +167,7 @@ public class PurpurWorldConfig {
+@@ -157,6 +158,7 @@ public class PurpurWorldConfig {
              set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D);
          }
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
diff --git a/patches/server/0058-Option-for-slimes-not-pushable.patch b/patches/server/0055-Option-for-slimes-not-pushable.patch
similarity index 90%
rename from patches/server/0058-Option-for-slimes-not-pushable.patch
rename to patches/server/0055-Option-for-slimes-not-pushable.patch
index 55a6a0a5e..f5150cbbb 100644
--- a/patches/server/0058-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0055-Option-for-slimes-not-pushable.patch
@@ -1,4 +1,4 @@
-From 4d2119c6af164fdd0de7954dedb4d166ce49b4a2 Mon Sep 17 00:00:00 2001
+From 7806409448b0a5cfe121230af5ab00a771ad81a4 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
@@ -47,11 +47,11 @@ index 01f32659d9..52ab86f0b1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 968d21dda4..e2459a32aa 100644
+index b608b1deb3..0f69284a72 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -154,6 +154,11 @@ public class PurpurConfig {
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
+@@ -152,6 +152,11 @@ public class PurpurConfig {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  
 +    public static boolean slimeBlocksNotPushable = false;
diff --git a/patches/server/0059-Bring-back-server-name.patch b/patches/server/0056-Bring-back-server-name.patch
similarity index 96%
rename from patches/server/0059-Bring-back-server-name.patch
rename to patches/server/0056-Bring-back-server-name.patch
index c5bb63342..c1ac07fd0 100644
--- a/patches/server/0059-Bring-back-server-name.patch
+++ b/patches/server/0056-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From ad930c8b5a16e651cd4ec1c1729abccc5e4001d7 Mon Sep 17 00:00:00 2001
+From f20db3ae3d9121a59e5abb19b6c2b704082e05ad 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/0057-Dispenser-curse-of-binding-protection.patch
similarity index 97%
rename from patches/server/0060-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0057-Dispenser-curse-of-binding-protection.patch
index 138650d81..02a056049 100644
--- a/patches/server/0060-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0057-Dispenser-curse-of-binding-protection.patch
@@ -1,4 +1,4 @@
-From cc3dcdbfadcd5526822b30dea0ddcee347b4536f Mon Sep 17 00:00:00 2001
+From a61b377c3381264e8798e346d30e7309118202c2 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
@@ -49,7 +49,7 @@ index df8c42bfbd..a4b3d0c298 100644
          return this.b;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9914bb004a..87cd40aec2 100644
+index c593180397..38d2e99cb1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0061-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
similarity index 98%
rename from patches/server/0061-Implement-LivingEntity-safeFallDistance.patch
rename to patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
index 290af1efc..926fe4c07 100644
--- a/patches/server/0061-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From 47b007e4714b79f6208b7c9e9fc4962f67abc93b Mon Sep 17 00:00:00 2001
+From ef2e0e662b4fdbb11c24630cce15ad4618daf32b 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
diff --git a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 86%
rename from patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
index 7a3ca01e5..196c811e7 100644
--- a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,4 +1,4 @@
-From be01b85f112800b8af48a35a8ffe186a575ab8dd Mon Sep 17 00:00:00 2001
+From 9e5f3087a5309e2f2e0179e36b59fc7511863cfe 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
@@ -21,18 +21,18 @@ index 563fc8ced0..479ed7c7bc 100644
              } else {
                  return EntityBoat.EnumStatus.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 87cd40aec2..7639b5acc7 100644
+index 38d2e99cb1..24b7154707 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
-         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
+@@ -134,6 +134,7 @@ public class PurpurWorldConfig {
+         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  
 +    public boolean boatEjectPlayersOnLand = false;
      public boolean controllableMinecarts = false;
      public boolean controllableMinecartsPlaceAnywhere = false;
      public float controllableMinecartsStepHeight = 1.0F;
-@@ -154,6 +155,7 @@ public class PurpurWorldConfig {
+@@ -145,6 +146,7 @@ public class PurpurWorldConfig {
      public boolean milkCuresBadOmen = true;
      public boolean useBetterMending = false;
      private void gameplayMechanicsSettings() {
diff --git a/patches/server/0063-Advancement-API-Additions.patch b/patches/server/0060-Advancement-API-Additions.patch
similarity index 99%
rename from patches/server/0063-Advancement-API-Additions.patch
rename to patches/server/0060-Advancement-API-Additions.patch
index b168b522f..ef678b792 100644
--- a/patches/server/0063-Advancement-API-Additions.patch
+++ b/patches/server/0060-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 5e1b8093326605978ba1d9b32d9eaade834e22d1 Mon Sep 17 00:00:00 2001
+From 252aeaebaf6963252adc8e93e8ca6fe8d1e4e9e0 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/0061-Add-option-to-set-armorstand-step-height.patch
similarity index 85%
rename from patches/server/0064-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0061-Add-option-to-set-armorstand-step-height.patch
index 0683a4d71..7748a4730 100644
--- a/patches/server/0064-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0061-Add-option-to-set-armorstand-step-height.patch
@@ -1,4 +1,4 @@
-From 18133fafa23a15460e7e6d0321b6a38eab265a25 Mon Sep 17 00:00:00 2001
+From 25447a2e438e473944698988df2c83de7c936273 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
@@ -29,25 +29,25 @@ index dfe8c57cef..0f6870a45c 100644
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7639b5acc7..bb3153ec74 100644
+index 24b7154707..910377c499 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
-         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
+@@ -135,6 +135,7 @@ public class PurpurWorldConfig {
      }
  
-+    public float armorstandStepHeight = 0.0F;
      public boolean boatEjectPlayersOnLand = false;
++    public float armorstandStepHeight = 0.0F;
      public boolean controllableMinecarts = false;
      public boolean controllableMinecartsPlaceAnywhere = false;
-@@ -155,6 +156,7 @@ public class PurpurWorldConfig {
-     public boolean milkCuresBadOmen = true;
+     public float controllableMinecartsStepHeight = 1.0F;
+@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
      public boolean useBetterMending = false;
      private void gameplayMechanicsSettings() {
-+        armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
++        armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
          controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
          controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
+         controllableMinecartsStepHeight = (float) getDouble("gameplay-mechanics.controllable-minecarts.step-height", controllableMinecartsStepHeight);
 -- 
 2.24.0
 
diff --git a/patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch b/patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch
similarity index 97%
rename from patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch
index df89cbc4c..2d5866540 100644
--- a/patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From c7837842a925d7ae1c2d54edc830644ac6152c07 Mon Sep 17 00:00:00 2001
+From c3d6fc5e2b0a71d385734bbf707b1366b0c9da1b 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/0063-Alternative-Keepalive-Handling.patch
similarity index 95%
rename from patches/server/0066-Alternative-Keepalive-Handling.patch
rename to patches/server/0063-Alternative-Keepalive-Handling.patch
index 7cc0d5e50..41427d387 100644
--- a/patches/server/0066-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0063-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 272fd9a3eca4cd104fb1ed6f59ab4970f62959bc Mon Sep 17 00:00:00 2001
+From 8424f04fe9c27bbfd69727504f4330d5ad3d344c 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
@@ -74,7 +74,7 @@ index f92516069a..b60b71a15d 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e2459a32aa..1dfe2407da 100644
+index 0f69284a72..777f167293 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -147,6 +147,11 @@ public class PurpurConfig {
@@ -87,8 +87,8 @@ index e2459a32aa..1dfe2407da 100644
 +    }
 +
      public static boolean dontSendUselessEntityPackets = false;
-     public static boolean fixItemPositionDesync = false;
      private static void dontSendUselessEntityPackets() {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 -- 
 2.24.0
 
diff --git a/patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 97%
rename from patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index f43daa6bd..104bc1c45 100644
--- a/patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From fc4736c0c89a383e896ebda33d2a68451191b011 Mon Sep 17 00:00:00 2001
+From 6d7ea8a087be03ce9ec616bc05232321ceed10d0 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/0069-Add-moon-phase-API.patch b/patches/server/0065-Add-moon-phase-API.patch
similarity index 94%
rename from patches/server/0069-Add-moon-phase-API.patch
rename to patches/server/0065-Add-moon-phase-API.patch
index fab644011..471515eec 100644
--- a/patches/server/0069-Add-moon-phase-API.patch
+++ b/patches/server/0065-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From b9a13c3276b04604c507d3bb0c69d65ebfb45818 Mon Sep 17 00:00:00 2001
+From a5bd89f5ecdb5d2ecefd9bcb2ecbe87bc93a7c64 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/0066-Add-getPlacementBlockData-to-World.patch
similarity index 98%
rename from patches/server/0070-Add-getPlacementBlockData-to-World.patch
rename to patches/server/0066-Add-getPlacementBlockData-to-World.patch
index ce6eeff29..8f13cad49 100644
--- a/patches/server/0070-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0066-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 711cf195fd8e1ef488cf8e4532ba2e37f4bf9acf Mon Sep 17 00:00:00 2001
+From e731b3f90988e40ca31e13098fc8e1fbf5a88553 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/0067-Barrels-have-6-rows.patch
similarity index 94%
rename from patches/server/0071-Barrels-have-6-rows.patch
rename to patches/server/0067-Barrels-have-6-rows.patch
index 77ab12db1..e299e6ad0 100644
--- a/patches/server/0071-Barrels-have-6-rows.patch
+++ b/patches/server/0067-Barrels-have-6-rows.patch
@@ -1,4 +1,4 @@
-From afcabbb773ef1ac9760c20dbb3bca45c90853052 Mon Sep 17 00:00:00 2001
+From 51887c8d479ca17be120f8320c13a43792d272a3 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
@@ -40,7 +40,7 @@ index 1e27abbea0..ca3b6c9aae 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1dfe2407da..871f2a031a 100644
+index 777f167293..392f4f8771 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
@@ -51,8 +51,8 @@ index 1dfe2407da..871f2a031a 100644
  
  import java.io.File;
  import java.io.IOException;
-@@ -159,8 +160,16 @@ public class PurpurConfig {
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
+@@ -157,8 +158,16 @@ public class PurpurConfig {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  
 +    public static boolean barrelSixRows = false;
diff --git a/patches/server/0072-Enderchest-6-rows-plus-permissions.patch b/patches/server/0068-Enderchest-6-rows-plus-permissions.patch
similarity index 98%
rename from patches/server/0072-Enderchest-6-rows-plus-permissions.patch
rename to patches/server/0068-Enderchest-6-rows-plus-permissions.patch
index e1555d2a4..5fa481b35 100644
--- a/patches/server/0072-Enderchest-6-rows-plus-permissions.patch
+++ b/patches/server/0068-Enderchest-6-rows-plus-permissions.patch
@@ -1,4 +1,4 @@
-From 64a5253eff6d92fa3bfc0cbea85aa25e396bc75e Mon Sep 17 00:00:00 2001
+From 19559ab2a0001868fe0f30486e873b974c37ca48 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Enderchest 6 rows (plus permissions)
@@ -58,10 +58,10 @@ index fd31b9a6dc..903c02e9ef 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 871f2a031a..9f6b4dc9a5 100644
+index 392f4f8771..3f8648cd71 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -162,14 +162,22 @@ public class PurpurConfig {
+@@ -160,14 +160,22 @@ public class PurpurConfig {
  
      public static boolean barrelSixRows = false;
      public static boolean slimeBlocksNotPushable = false;
diff --git a/patches/server/0073-Add-5-second-tps-average-in-tps.patch b/patches/server/0069-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/0069-Add-5-second-tps-average-in-tps.patch
index 8987e8f32..a4ff21538 100644
--- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0069-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From a847410fecd1e58b53784a74d659fcb23f59474d Mon Sep 17 00:00:00 2001
+From a69d358165c1eea6ef0a6b220a1812375c1607d9 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/0075-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 94%
rename from patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch
index 3f224dab3..da66a27cd 100644
--- a/patches/server/0075-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From ae332894d0f74860f683ac803dca06afa41144c6 Mon Sep 17 00:00:00 2001
+From 7732842c10213ebf95086f947dc6debf10aff8b5 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/0071-Add-more-evoker-API.patch
similarity index 97%
rename from patches/server/0076-Add-more-evoker-API.patch
rename to patches/server/0071-Add-more-evoker-API.patch
index a92f09abb..490bfacb6 100644
--- a/patches/server/0076-Add-more-evoker-API.patch
+++ b/patches/server/0071-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From 0c514bb2845e84563242551096795dc3b793b344 Mon Sep 17 00:00:00 2001
+From c306c186ae294dc54ee21d1010509abd02bc12cb 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/0072-Add-API-for-Villager-resetOffers.patch
similarity index 97%
rename from patches/server/0077-Add-API-for-Villager-resetOffers.patch
rename to patches/server/0072-Add-API-for-Villager-resetOffers.patch
index 8cc165465..0dd4af076 100644
--- a/patches/server/0077-Add-API-for-Villager-resetOffers.patch
+++ b/patches/server/0072-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From d54945c9fde761a7df6b1e9198ddb1c5159bc5af Mon Sep 17 00:00:00 2001
+From 6dc90c206d24a274c6ff030ca55302f5b4f0b584 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/0073-Add-more-llama-API.patch
similarity index 97%
rename from patches/server/0078-Add-more-llama-API.patch
rename to patches/server/0073-Add-more-llama-API.patch
index 798004712..6d109e527 100644
--- a/patches/server/0078-Add-more-llama-API.patch
+++ b/patches/server/0073-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From b709ecc23aa978b8a6e0a889f0c03ccab99da8f4 Mon Sep 17 00:00:00 2001
+From bed75b5779a908fc1f9c64bbdf48f2966887801a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API
  3 files changed, 61 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 7a4e64a3d..576179756 100644
+index 7a4e64a3d0..5761797568 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -80,7 +80,7 @@ index 7a4e64a3d..576179756 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
-index e181d8350..8376f1dc4 100644
+index e181d83505..8376f1dc4e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
 @@ -6,7 +6,7 @@ import java.util.List;
@@ -109,7 +109,7 @@ index e181d8350..8376f1dc4 100644
              double d0 = this.a.h((Entity) this.a.fe());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 3f94c5a92..a02763480 100644
+index 3f94c5a920..a027634801 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE
diff --git a/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0074-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/0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
index e2b611eba..b55ed14bd 100644
--- a/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
+++ b/patches/server/0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
@@ -1,4 +1,4 @@
-From 3038f08a3eed28993b19ff09375880e1a57c5063 Mon Sep 17 00:00:00 2001
+From cff47976090e87dc16d5a276a9cc885e825ecc6b 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/0075-Implement-infinite-lava.patch
similarity index 97%
rename from patches/server/0080-Implement-infinite-lava.patch
rename to patches/server/0075-Implement-infinite-lava.patch
index cd2cbf51e..11cce1d6b 100644
--- a/patches/server/0080-Implement-infinite-lava.patch
+++ b/patches/server/0075-Implement-infinite-lava.patch
@@ -1,4 +1,4 @@
-From fe2e326b4830b2e59b56bcbc829d2746d01ecf30 Mon Sep 17 00:00:00 2001
+From babd4a9eafc898c15985e48c1318ffebf9ab3975 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
@@ -70,7 +70,7 @@ index 9eba9a12c0..39252e6873 100644
      protected boolean c;
      protected boolean d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bb3153ec74..3b68a7f76d 100644
+index 910377c499..fbde4cc77e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0081-Expose-getItemStack-for-Trident.patch b/patches/server/0076-Expose-getItemStack-for-Trident.patch
similarity index 96%
rename from patches/server/0081-Expose-getItemStack-for-Trident.patch
rename to patches/server/0076-Expose-getItemStack-for-Trident.patch
index ca8c3a71b..b9076ae69 100644
--- a/patches/server/0081-Expose-getItemStack-for-Trident.patch
+++ b/patches/server/0076-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From ed518ec9746b1f8fe450f035db00e124f61212d3 Mon Sep 17 00:00:00 2001
+From 94c6c639c030945c3bdaf67647695d96d191ba30 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/0077-Despawn-egg-hatches-chicken.patch
similarity index 95%
rename from patches/server/0082-Despawn-egg-hatches-chicken.patch
rename to patches/server/0077-Despawn-egg-hatches-chicken.patch
index 0eef49c2e..33b39f090 100644
--- a/patches/server/0082-Despawn-egg-hatches-chicken.patch
+++ b/patches/server/0077-Despawn-egg-hatches-chicken.patch
@@ -1,4 +1,4 @@
-From cf327c4f12c35edfcc7f16c0ba0ed27d2506ac41 Mon Sep 17 00:00:00 2001
+From 31d2db14d22911a259defeacef8263d52f5a4223 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
@@ -41,10 +41,10 @@ index 2926fbb957..bbb9ca1efc 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3b68a7f76d..9e705db0bd 100644
+index fbde4cc77e..878770c110 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -271,11 +271,15 @@ public class PurpurWorldConfig {
+@@ -262,11 +262,15 @@ public class PurpurWorldConfig {
      public boolean chickenRidableInWater = false;
      public boolean chickenRequireShiftToMount = true;
      public boolean chickenDontLayEggsWhenRidden = false;
diff --git a/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0078-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/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 8c225bd99..d5ea7a9d1 100644
--- a/patches/server/0083-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From b33674f2952b188d7286ee0a68ade5670f1feafd Mon Sep 17 00:00:00 2001
+From e551815a914ba37fcc2f574f3972912e1eb7d9e6 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/0079-Add-sleep-options.patch
similarity index 90%
rename from patches/server/0084-Add-sleep-options.patch
rename to patches/server/0079-Add-sleep-options.patch
index 84dff4756..115be8cee 100644
--- a/patches/server/0084-Add-sleep-options.patch
+++ b/patches/server/0079-Add-sleep-options.patch
@@ -1,4 +1,4 @@
-From af75b295d1729f6c5562a421e3f9447141b4f666 Mon Sep 17 00:00:00 2001
+From 763dbfdf7cd95903e234a50f77221be70ae4b2cf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
  2 files changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9d26bd1e4c..c99a338082 100644
+index d69854b5c1..0e16e03bb1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -53,10 +53,10 @@ index 9d26bd1e4c..c99a338082 100644
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9e705db0bd..7b59bd638c 100644
+index 878770c110..faebefabeb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -159,6 +159,8 @@ public class PurpurWorldConfig {
+@@ -150,6 +150,8 @@ public class PurpurWorldConfig {
      public boolean disableDropsOnCrammingDeath = false;
      public boolean fixClimbingBypassingCrammingRule = false;
      public boolean milkCuresBadOmen = true;
@@ -64,8 +64,8 @@ index 9e705db0bd..7b59bd638c 100644
 +    public String playerSleepCondition = "time >= 12541 && time <= 23458";
      public boolean useBetterMending = false;
      private void gameplayMechanicsSettings() {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-@@ -183,6 +185,8 @@ public class PurpurWorldConfig {
+         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
+@@ -174,6 +176,8 @@ public class PurpurWorldConfig {
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
diff --git a/patches/server/0085-Option-for-hay-block-fall-damage.patch b/patches/server/0080-Option-for-hay-block-fall-damage.patch
similarity index 94%
rename from patches/server/0085-Option-for-hay-block-fall-damage.patch
rename to patches/server/0080-Option-for-hay-block-fall-damage.patch
index 8897f13dc..ed598cd78 100644
--- a/patches/server/0085-Option-for-hay-block-fall-damage.patch
+++ b/patches/server/0080-Option-for-hay-block-fall-damage.patch
@@ -1,4 +1,4 @@
-From aeeff9727389d2188b73414983d784eea4ce6f59 Mon Sep 17 00:00:00 2001
+From 13fef016e0c962a9bf1442282b54059a3e3d412c 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
@@ -21,7 +21,7 @@ index ca81c49f0a..1f8f60542f 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7b59bd638c..505a52c42f 100644
+index faebefabeb..4ab38cf04f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 96%
rename from patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index d3bfa20ee..e57c7ad10 100644
--- a/patches/server/0086-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From cb8fb8b92e3ba2d73938d24840361dac02ece870 Mon Sep 17 00:00:00 2001
+From 867304e89a75db2fcaf76848458e030dd841d5db 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/0082-Add-LootableInventoryFirstFillEvent.patch
similarity index 97%
rename from patches/server/0087-Add-LootableInventoryFirstFillEvent.patch
rename to patches/server/0082-Add-LootableInventoryFirstFillEvent.patch
index 82ea12754..d79dffac6 100644
--- a/patches/server/0087-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/server/0082-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From 91185a1249210ae42969239f59eb0c5733c39a7c Mon Sep 17 00:00:00 2001
+From f19b4f8b9ed84b4a630edaaecde5e5ce95f260d0 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/0083-Villagers-follow-emerald-blocks.patch
similarity index 96%
rename from patches/server/0088-Villagers-follow-emerald-blocks.patch
rename to patches/server/0083-Villagers-follow-emerald-blocks.patch
index 6fd23c2b1..4d8f0efcf 100644
--- a/patches/server/0088-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0083-Villagers-follow-emerald-blocks.patch
@@ -1,4 +1,4 @@
-From 6eecb57177cfb0a3c23dea41bafdd58a9317fbe7 Mon Sep 17 00:00:00 2001
+From 13946792c7017ecc09079bb523363ef9ca8c46f2 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
@@ -48,10 +48,10 @@ index 4e9c5e84a9..14ca5fc367 100644
          this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
          this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66a30a9d4b..f293ebb956 100644
+index 4ab38cf04f..d1f71ee14b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -784,21 +784,25 @@ public class PurpurWorldConfig {
+@@ -775,21 +775,25 @@ public class PurpurWorldConfig {
      public boolean villagerRequireShiftToMount = true;
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
diff --git a/patches/server/0089-Add-player-death-exp-control-options.patch b/patches/server/0084-Add-player-death-exp-control-options.patch
similarity index 93%
rename from patches/server/0089-Add-player-death-exp-control-options.patch
rename to patches/server/0084-Add-player-death-exp-control-options.patch
index 8ba798b0b..2630daa25 100644
--- a/patches/server/0089-Add-player-death-exp-control-options.patch
+++ b/patches/server/0084-Add-player-death-exp-control-options.patch
@@ -1,4 +1,4 @@
-From b71e07fe509bd0c5456982cf1647f1f7bd3723b2 Mon Sep 17 00:00:00 2001
+From 05d805b5cbdc10331f4913f53b29cfe54d299ff9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
  2 files changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c99a338082..67a114d59e 100644
+index 0e16e03bb1..477d5c00b4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,10 +35,10 @@ index c99a338082..67a114d59e 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 425e12116a..8eff6a6dd6 100644
+index d1f71ee14b..af14defca3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -164,6 +164,8 @@ public class PurpurWorldConfig {
+@@ -155,6 +155,8 @@ public class PurpurWorldConfig {
      public boolean disableDropsOnCrammingDeath = false;
      public boolean fixClimbingBypassingCrammingRule = false;
      public boolean milkCuresBadOmen = true;
@@ -47,7 +47,7 @@ index 425e12116a..8eff6a6dd6 100644
      public boolean playerSleepOnlyWithCondition = false;
      public String playerSleepCondition = "time >= 12541 && time <= 23458";
      public boolean useBetterMending = false;
-@@ -190,6 +192,8 @@ public class PurpurWorldConfig {
+@@ -181,6 +183,8 @@ public class PurpurWorldConfig {
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
diff --git a/patches/server/0090-Add-permission-for-F3-N-debug.patch b/patches/server/0085-Add-permission-for-F3-N-debug.patch
similarity index 83%
rename from patches/server/0090-Add-permission-for-F3-N-debug.patch
rename to patches/server/0085-Add-permission-for-F3-N-debug.patch
index 5638730c1..13ae41c8e 100644
--- a/patches/server/0090-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0085-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From d925bcf95309010f8dc483f71290847dfedcc821 Mon Sep 17 00:00:00 2001
+From 46c8ea33e9e07d877496f11d7efed7a0084b04b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3975312394..39b33d9d72 100644
+index 7b79ee4fe5..67228329bd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -902,6 +902,7 @@ public abstract class PlayerList {
+@@ -903,6 +903,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server/0091-Allow-leashing-villagers.patch b/patches/server/0086-Allow-leashing-villagers.patch
similarity index 96%
rename from patches/server/0091-Allow-leashing-villagers.patch
rename to patches/server/0086-Allow-leashing-villagers.patch
index b9f9a7070..b664643e6 100644
--- a/patches/server/0091-Allow-leashing-villagers.patch
+++ b/patches/server/0086-Allow-leashing-villagers.patch
@@ -1,4 +1,4 @@
-From 66bf264ae452bafd07809857e258d7cae2bebcfd Mon Sep 17 00:00:00 2001
+From 27198ac0af4ff9a0efca48c1230bfa61fc0cb122 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
@@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ddd6492fac..9a9ffa2a53 100644
+index af14defca3..46aaf301ca 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -789,6 +789,7 @@ public class PurpurWorldConfig {
+@@ -780,6 +780,7 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
@@ -66,7 +66,7 @@ index ddd6492fac..9a9ffa2a53 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -796,17 +797,20 @@ public class PurpurWorldConfig {
+@@ -787,17 +788,20 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
diff --git a/patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 92%
rename from patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch
index 4118d6124..0e7d39c56 100644
--- a/patches/server/0092-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch
@@ -1,4 +1,4 @@
-From 10576a80d1a87510951ba860153cf41d34b8f7c6 Mon Sep 17 00:00:00 2001
+From 418fa5432792724626a0a3a671203860c0c9e2d6 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
@@ -22,10 +22,10 @@ index 315440b3fb..fe0e646ea6 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9a9ffa2a53..b729c81d2e 100644
+index 46aaf301ca..89a3ab67d3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -790,6 +790,8 @@ public class PurpurWorldConfig {
+@@ -781,6 +781,8 @@ public class PurpurWorldConfig {
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -34,7 +34,7 @@ index 9a9ffa2a53..b729c81d2e 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -798,6 +800,8 @@ public class PurpurWorldConfig {
+@@ -789,6 +791,8 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
diff --git a/patches/server/0093-Make-lava-flow-speed-configurable.patch b/patches/server/0088-Make-lava-flow-speed-configurable.patch
similarity index 96%
rename from patches/server/0093-Make-lava-flow-speed-configurable.patch
rename to patches/server/0088-Make-lava-flow-speed-configurable.patch
index 4999e5969..6d60a202c 100644
--- a/patches/server/0093-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0088-Make-lava-flow-speed-configurable.patch
@@ -1,4 +1,4 @@
-From 189ca66a4d4d17a5f0e28e1fc65486dbf46e6312 Mon Sep 17 00:00:00 2001
+From 73a4646468060dc7890229018290c9912c36c9f5 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
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c57982274c..29c2d64fb5 100644
+index 89a3ab67d3..9fd551d6b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -133,8 +133,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 93%
rename from patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch
index fb1270746..fd6e6da95 100644
--- a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,4 +1,4 @@
-From 09c1575cc476e76ef18220157cc8cb66b1ea6aec Mon Sep 17 00:00:00 2001
+From e6cc5d3a4d248d32a8de357807c8ab94f1fff271 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
@@ -21,10 +21,10 @@ index 8aa0a6699f..0fd740e717 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c853f4198c..51937d8449 100644
+index 9fd551d6b8..e12b096db3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -853,10 +853,12 @@ public class PurpurWorldConfig {
+@@ -844,10 +844,12 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonRidable = false;
      public boolean witherSkeletonRidableInWater = false;
      public boolean witherSkeletonRequireShiftToMount = true;
diff --git a/patches/server/0095-UPnP-Port-Forwarding-Service.patch b/patches/server/0090-UPnP-Port-Forwarding-Service.patch
similarity index 96%
rename from patches/server/0095-UPnP-Port-Forwarding-Service.patch
rename to patches/server/0090-UPnP-Port-Forwarding-Service.patch
index 80f609054..9f7aed9ab 100644
--- a/patches/server/0095-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0090-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From 29696f515ee5836226eb85a44a91b35e5072efda Mon Sep 17 00:00:00 2001
+From 700c2918dd403589a9201e6fc625895253a3f007 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
@@ -42,7 +42,7 @@ index a7ee9396a0..93fba088f4 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index a8f3237ce1..fa42808553 100644
+index bd9c123d56..7e8286b573 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -107,7 +107,7 @@ index 95050de2a5..8390ce7b54 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a8276ab477..4c6d401b09 100644
+index 3f8648cd71..acf5ea62a0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -153,6 +153,11 @@ public class PurpurConfig {
@@ -120,8 +120,8 @@ index a8276ab477..4c6d401b09 100644
 +    }
 +
      public static boolean dontSendUselessEntityPackets = false;
-     public static boolean fixItemPositionDesync = false;
      private static void dontSendUselessEntityPackets() {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
 index c4903c7db6..ee4f022fc5 100644
 --- a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
diff --git a/patches/server/0096-Implement-EntityMoveEvent.patch b/patches/server/0091-Implement-EntityMoveEvent.patch
similarity index 96%
rename from patches/server/0096-Implement-EntityMoveEvent.patch
rename to patches/server/0091-Implement-EntityMoveEvent.patch
index 6f1643b14..0878fe56b 100644
--- a/patches/server/0096-Implement-EntityMoveEvent.patch
+++ b/patches/server/0091-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From 380d35a8cecb97414ed0cba4342f0575e80e2f9a Mon Sep 17 00:00:00 2001
+From 3f7e67b779b50e7de1de83610a0babddb396d88a 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
diff --git a/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 97%
rename from patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch
index e2591098e..a2a73d9c0 100644
--- a/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 6fb2fc02758e6943fd284e74dcb06cc5694966ef Mon Sep 17 00:00:00 2001
+From 39dca041f48cdedb69df537052d8c065990b316c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -27,7 +27,7 @@ index 4349d22cc8..647d303ad1 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8222f7caf2..d9532ebfc1 100644
+index 09224e2b11..169904504f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1537,6 +1537,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -134,18 +134,18 @@ index f5c8074dcf..674f2ccc7f 100644
          float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F);
          float f6 = -MathHelper.sin((f + f2) * 0.017453292F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2acf779b06..5bb31a0fa1 100644
+index e12b096db3..91746d99ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -173,6 +173,7 @@ public class PurpurWorldConfig {
+@@ -164,6 +164,7 @@ public class PurpurWorldConfig {
      public boolean playerSleepOnlyWithCondition = false;
      public String playerSleepCondition = "time >= 12541 && time <= 23458";
      public boolean useBetterMending = false;
 +    public boolean saveProjectilesToDisk = true;
      private void gameplayMechanicsSettings() {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -201,6 +202,21 @@ public class PurpurWorldConfig {
+         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
+@@ -192,6 +193,21 @@ public class PurpurWorldConfig {
          playerSleepOnlyWithCondition = getBoolean("gameplay-mechanics.player.sleep.only-with-condition", playerSleepOnlyWithCondition);
          playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition);
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
diff --git a/patches/server/0099-Implement-bed-explosion-options.patch b/patches/server/0093-Implement-bed-explosion-options.patch
similarity index 97%
rename from patches/server/0099-Implement-bed-explosion-options.patch
rename to patches/server/0093-Implement-bed-explosion-options.patch
index 92a03d4b8..a59d1661d 100644
--- a/patches/server/0099-Implement-bed-explosion-options.patch
+++ b/patches/server/0093-Implement-bed-explosion-options.patch
@@ -1,4 +1,4 @@
-From 1718803a84502174559d03ae7e2641eb442079d0 Mon Sep 17 00:00:00 2001
+From 55b86ebe06ce1927cfb17114392c692eda158858 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
@@ -22,7 +22,7 @@ index 06a35629ab..df41a7dfcd 100644
                  // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4dbe5c0773..865c73f388 100644
+index 91746d99ec..b0bded22db 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -3,6 +3,7 @@ package net.pl3x.purpur;
diff --git a/patches/server/0100-Add-item-entity-options.patch b/patches/server/0094-Add-item-entity-options.patch
similarity index 96%
rename from patches/server/0100-Add-item-entity-options.patch
rename to patches/server/0094-Add-item-entity-options.patch
index 7315c4b53..461a33811 100644
--- a/patches/server/0100-Add-item-entity-options.patch
+++ b/patches/server/0094-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From 9ad41cdd65edde37b21bd6abfca168c0c68feef1 Mon Sep 17 00:00:00 2001
+From d3f765706b531d416e301c23c0a4c3b944d738c9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,7 +10,7 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d9532ebfc1..80ace33828 100644
+index 169904504f..bcb1db00de 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1268,6 +1268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -56,7 +56,7 @@ index bbb9ca1efc..262a7935e7 100644
              if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 567a305511..b60065111f 100644
+index b0bded22db..2607d93b63 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -5,6 +5,8 @@ import net.minecraft.server.Block;
@@ -68,7 +68,7 @@ index 567a305511..b60065111f 100644
  import net.minecraft.server.MinecraftKey;
  import org.bukkit.configuration.ConfigurationSection;
  import org.spigotmc.SpigotWorldConfig;
-@@ -185,6 +187,10 @@ public class PurpurWorldConfig {
+@@ -176,6 +178,10 @@ public class PurpurWorldConfig {
      public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
      public boolean disableDropsOnCrammingDeath = false;
      public boolean fixClimbingBypassingCrammingRule = false;
@@ -79,7 +79,7 @@ index 567a305511..b60065111f 100644
      public boolean milkCuresBadOmen = true;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
-@@ -214,6 +220,19 @@ public class PurpurWorldConfig {
+@@ -205,6 +211,19 @@ public class PurpurWorldConfig {
          }
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
diff --git a/patches/server/0101-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0095-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/0095-Make-natural-spawns-per-biome-configurable.patch
index 0301fe9de..525a11d7a 100644
--- a/patches/server/0101-Make-natural-spawns-per-biome-configurable.patch
+++ b/patches/server/0095-Make-natural-spawns-per-biome-configurable.patch
@@ -1,4 +1,4 @@
-From 3e5128d6b25bccba9736d0dabb352da48a3021a9 Mon Sep 17 00:00:00 2001
+From f849bf8f54f61aaf813a73fc1b08ae5ef14c9f42 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/0096-Configurable-void-damage-height.patch
similarity index 90%
rename from patches/server/0102-Configurable-void-damage-height.patch
rename to patches/server/0096-Configurable-void-damage-height.patch
index 06025bd39..77b9b17e4 100644
--- a/patches/server/0102-Configurable-void-damage-height.patch
+++ b/patches/server/0096-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 3cbf50ee0737097f0090d1adcd5fcc6fd94e1922 Mon Sep 17 00:00:00 2001
+From 1fb84dcc6440f3509eb71beddb5bd23d3e9b95b1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fe9c72dd9..f5209ec92 100644
+index bcb1db00de..300a4057f3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -453,7 +453,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,18 +22,18 @@ index fe9c72dd9..f5209ec92 100644
              && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24d9c699a..08980a797 100644
+index 2607d93b63..a4e16f7f3b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -198,6 +198,7 @@ public class PurpurWorldConfig {
+@@ -189,6 +189,7 @@ public class PurpurWorldConfig {
      public String playerSleepCondition = "time >= 12541 && time <= 23458";
      public boolean useBetterMending = false;
      public boolean saveProjectilesToDisk = true;
 +    public double voidDamageHeight = -64.0D;
      private void gameplayMechanicsSettings() {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -254,6 +255,7 @@ public class PurpurWorldConfig {
+         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
+@@ -245,6 +246,7 @@ public class PurpurWorldConfig {
              set("gameplay-mechanics.saveProjectilesToDisk", null);
          }
          saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk);
diff --git a/patches/server/0103-Fix-the-dead-lagging-the-server.patch b/patches/server/0097-Fix-the-dead-lagging-the-server.patch
similarity index 94%
rename from patches/server/0103-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0097-Fix-the-dead-lagging-the-server.patch
index f9c046c38..d286d356e 100644
--- a/patches/server/0103-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0097-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From 84d33f1f61132168a340d0b49f1ef47c7b5e3378 Mon Sep 17 00:00:00 2001
+From fde2ea1d343b6f96b640c49458853842cd853196 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 75db09c34e..4183636ff9 100644
+index 300a4057f3..7f9a3d220d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1354,7 +1354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0104-Add-flying-mobs-to-entity-activation-range-settings.patch b/patches/server/0098-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/0098-Add-flying-mobs-to-entity-activation-range-settings.patch
index 04e61531f..adfdee460 100644
--- a/patches/server/0104-Add-flying-mobs-to-entity-activation-range-settings.patch
+++ b/patches/server/0098-Add-flying-mobs-to-entity-activation-range-settings.patch
@@ -1,4 +1,4 @@
-From 4c1ab3425c237f7e8fba3d2bebdaf3491f417f09 Mon Sep 17 00:00:00 2001
+From 6b04a9ccf7410558f53fdf191625401b3b776ba8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 8 Mar 2020 20:54:44 -0500
 Subject: [PATCH] Add flying mobs to entity activation range settings
@@ -9,7 +9,7 @@ Subject: [PATCH] Add flying mobs to entity activation range settings
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a0ac98ede2..ba10e811f1 100644
+index 17c4d7ec9b..88ae15bc4f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -12,6 +12,9 @@ import net.minecraft.server.EntityAmbient;
diff --git a/patches/server/0105-Add-mspt-command.patch b/patches/server/0099-Add-mspt-command.patch
similarity index 98%
rename from patches/server/0105-Add-mspt-command.patch
rename to patches/server/0099-Add-mspt-command.patch
index fa7c93b13..71002ffa4 100644
--- a/patches/server/0105-Add-mspt-command.patch
+++ b/patches/server/0099-Add-mspt-command.patch
@@ -1,4 +1,4 @@
-From 4a72b96f9cc2dfd30b1db8a0fc0472d2c21fcaaa Mon Sep 17 00:00:00 2001
+From 359749edefd02b8cbe166c7ae6f9f8a6efb0c925 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
diff --git a/patches/server/0106-Add-ping-command.patch b/patches/server/0100-Add-ping-command.patch
similarity index 99%
rename from patches/server/0106-Add-ping-command.patch
rename to patches/server/0100-Add-ping-command.patch
index edf20aa46..39f7a82bb 100644
--- a/patches/server/0106-Add-ping-command.patch
+++ b/patches/server/0100-Add-ping-command.patch
@@ -1,4 +1,4 @@
-From 3708fea97302e8ccffeab804e3f491ba5439d5da Mon Sep 17 00:00:00 2001
+From d52f0071a48d19f1810d6d3fab0f4369245de5c7 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
diff --git a/patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 87%
rename from patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 3c5a990db..ec8527d89 100644
--- a/patches/server/0107-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -1,4 +1,4 @@
-From 8fa5df5b259e45a10e00269e9d9383b91b875bc3 Mon Sep 17 00:00:00 2001
+From 6e55978a4fba2ddf62f232a299764cf80cb33958 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
@@ -22,18 +22,18 @@ index ed8e26aa45..ca6c0ec299 100644
  
              if (b0 > 0 && !this.z()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 08980a797b..974e2b4b83 100644
+index a4e16f7f3b..95193625b7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -198,6 +198,7 @@ public class PurpurWorldConfig {
+@@ -189,6 +189,7 @@ public class PurpurWorldConfig {
      public String playerSleepCondition = "time >= 12541 && time <= 23458";
      public boolean useBetterMending = false;
      public boolean saveProjectilesToDisk = true;
 +    public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      private void gameplayMechanicsSettings() {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-@@ -255,6 +256,7 @@ public class PurpurWorldConfig {
+         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
+@@ -246,6 +247,7 @@ public class PurpurWorldConfig {
              set("gameplay-mechanics.saveProjectilesToDisk", null);
          }
          saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk);
diff --git a/patches/server/0108-Configurable-server-mod-name.patch b/patches/server/0102-Configurable-server-mod-name.patch
similarity index 84%
rename from patches/server/0108-Configurable-server-mod-name.patch
rename to patches/server/0102-Configurable-server-mod-name.patch
index 36c756623..8814a7e31 100644
--- a/patches/server/0108-Configurable-server-mod-name.patch
+++ b/patches/server/0102-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From 17c9974f9e8b00c408b611cac67adf1be57a98ec Mon Sep 17 00:00:00 2001
+From 948b40b88aebc684f74009a19774fab344998de2 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
@@ -22,11 +22,11 @@ index 8390ce7b54..487a9149d8 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4c6d401b09..0948d67260 100644
+index acf5ea62a0..42eedc9955 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -191,6 +191,11 @@ public class PurpurConfig {
-         recalculatePermsOnWorldChange = getBoolean("settings.recalculate-perms-on-world-change", recalculatePermsOnWorldChange);
+@@ -184,6 +184,11 @@ public class PurpurConfig {
+         slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable);
      }
  
 +    public static String serverModName = "Purpur";
diff --git a/patches/server/0109-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 94%
rename from patches/server/0109-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch
index ea1ccaebb..4cf1d021d 100644
--- a/patches/server/0109-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,4 +1,4 @@
-From d5256b45a3cb99aa7007d5ceb9b414cb149aa012 Mon Sep 17 00:00:00 2001
+From 55c6fed36bf58fdde1dcf46b1eaf2d39e3a3786b 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/0112-Configurable-TPS-Catchup.patch b/patches/server/0104-Configurable-TPS-Catchup.patch
similarity index 88%
rename from patches/server/0112-Configurable-TPS-Catchup.patch
rename to patches/server/0104-Configurable-TPS-Catchup.patch
index 2dda9a7f3..511412bcd 100644
--- a/patches/server/0112-Configurable-TPS-Catchup.patch
+++ b/patches/server/0104-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From da0f2c744a2d3420ce56d14cc17613c1c76efe10 Mon Sep 17 00:00:00 2001
+From 7ca42744a81e168e222a0b1d4fe2b6f7b3ffec8a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable TPS Catchup
  2 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5f6852e4ba..ac7604d632 100644
+index 487a9149d8..daa34492c6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -958,6 +958,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -27,7 +27,7 @@ index 5f6852e4ba..ac7604d632 100644
                      this.methodProfiler.exit();
                      this.methodProfiler.b();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0948d67260..850a7ac24d 100644
+index 42eedc9955..3cc03c9e85 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -158,6 +158,11 @@ public class PurpurConfig {
@@ -40,8 +40,8 @@ index 0948d67260..850a7ac24d 100644
 +    }
 +
      public static boolean dontSendUselessEntityPackets = false;
-     public static boolean fixItemPositionDesync = false;
      private static void dontSendUselessEntityPackets() {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 -- 
 2.24.0
 
diff --git a/patches/server/0113-Breedable-Polar-Bears.patch b/patches/server/0105-Breedable-Polar-Bears.patch
similarity index 96%
rename from patches/server/0113-Breedable-Polar-Bears.patch
rename to patches/server/0105-Breedable-Polar-Bears.patch
index 056ec6b81..a963166cb 100644
--- a/patches/server/0113-Breedable-Polar-Bears.patch
+++ b/patches/server/0105-Breedable-Polar-Bears.patch
@@ -1,4 +1,4 @@
-From 7b2e1b0ba7a37da251aded27df8010a5dc8713b9 Mon Sep 17 00:00:00 2001
+From e2473f36a0588e54e9ca3f2e8039dc77e23f441f 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
@@ -64,10 +64,10 @@ index 0a3906bde0..42fef3abaa 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e7bb3bae92..a76ca3d9d8 100644
+index 95193625b7..2f7a590827 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -675,10 +675,15 @@ public class PurpurWorldConfig {
+@@ -666,10 +666,15 @@ public class PurpurWorldConfig {
      public boolean polarBearRidable = false;
      public boolean polarBearRidableInWater = false;
      public boolean polarBearRequireShiftToMount = true;
diff --git a/patches/server/0114-Configurable-jockey-options.patch b/patches/server/0106-Configurable-jockey-options.patch
similarity index 96%
rename from patches/server/0114-Configurable-jockey-options.patch
rename to patches/server/0106-Configurable-jockey-options.patch
index be3001bfc..7544a2c04 100644
--- a/patches/server/0114-Configurable-jockey-options.patch
+++ b/patches/server/0106-Configurable-jockey-options.patch
@@ -1,4 +1,4 @@
-From d458d77cad8e3b646ae184b86b891d07288ae2fb Mon Sep 17 00:00:00 2001
+From 77e7f9c1cda92bae1ffb1efe3cb0dbebb49f1c2e 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
@@ -39,7 +39,7 @@ index 63f5969b10..f32950cc9b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 227fff3f1d..c78876fc42 100644
+index fb9ef88ea3..90bf12c735 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -32,6 +32,21 @@ public class EntityPigZombie extends EntityZombie {
@@ -191,10 +191,10 @@ index ebbfcb75a4..8532385d8d 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a76ca3d9d8..ee71312def 100644
+index 2f7a590827..2da403bc47 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -410,10 +410,16 @@ public class PurpurWorldConfig {
+@@ -401,10 +401,16 @@ public class PurpurWorldConfig {
      public boolean drownedRidable = false;
      public boolean drownedRidableInWater = false;
      public boolean drownedRequireShiftToMount = true;
@@ -211,7 +211,7 @@ index a76ca3d9d8..ee71312def 100644
      }
  
      public boolean elderGuardianRidable = false;
-@@ -524,10 +530,16 @@ public class PurpurWorldConfig {
+@@ -515,10 +521,16 @@ public class PurpurWorldConfig {
      public boolean huskRidable = false;
      public boolean huskRidableInWater = false;
      public boolean huskRequireShiftToMount = true;
@@ -228,7 +228,7 @@ index a76ca3d9d8..ee71312def 100644
      }
  
      public boolean horseRidableInWater = false;
-@@ -936,11 +948,17 @@ public class PurpurWorldConfig {
+@@ -927,11 +939,17 @@ public class PurpurWorldConfig {
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;
      public boolean zombieTargetTurtleEggs = true;
@@ -246,10 +246,10 @@ index a76ca3d9d8..ee71312def 100644
      }
  
      public boolean zombieHorseCanSwim = false;
-@@ -956,19 +974,31 @@ public class PurpurWorldConfig {
+@@ -946,18 +964,30 @@ public class PurpurWorldConfig {
+     public boolean zombiePigmanRidable = false;
      public boolean zombiePigmanRidableInWater = false;
      public boolean zombiePigmanRequireShiftToMount = true;
-     public boolean zombiePigmanDontTargetUnlessHit = false;
 +    public boolean zombiePigmanJockeyOnlyBaby = true;
 +    public double zombiePigmanJockeyChance = 0.05D;
 +    public boolean zombiePigmanJockeyTryExistingChickens = true;
@@ -257,7 +257,6 @@ index a76ca3d9d8..ee71312def 100644
          zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable);
          zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater);
          zombiePigmanRequireShiftToMount = getBoolean("mobs.zombie_pigman.require-shift-to-mount", zombiePigmanRequireShiftToMount);
-         zombiePigmanDontTargetUnlessHit = getBoolean("mobs.zombie_pigman.dont-target-unless-hit", zombiePigmanDontTargetUnlessHit);
 +        zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby);
 +        zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance);
 +        zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens);
diff --git a/patches/server/0115-Configurable-enchantment-max-level.patch b/patches/server/0107-Configurable-enchantment-max-level.patch
similarity index 99%
rename from patches/server/0115-Configurable-enchantment-max-level.patch
rename to patches/server/0107-Configurable-enchantment-max-level.patch
index fb3c6a6b8..ad57bef3d 100644
--- a/patches/server/0115-Configurable-enchantment-max-level.patch
+++ b/patches/server/0107-Configurable-enchantment-max-level.patch
@@ -1,4 +1,4 @@
-From c401fe87188ba7b2328ee37f8acd6479d6a8fb58 Mon Sep 17 00:00:00 2001
+From e20c8e31d3c94a90fcbf4b7710ac912afc572831 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 17:21:42 -0500
 Subject: [PATCH] Configurable enchantment max level
@@ -740,7 +740,7 @@ index 4571cdf021..aa3cbd523a 100644
      public float a(int i, EnumMonsterType enummonstertype) {
          return this.a == 0 ? 1.0F + (float) Math.max(0, i - 1) * 0.5F : (this.a == 1 && enummonstertype == EnumMonsterType.UNDEAD ? (float) i * 2.5F : (this.a == 2 && enummonstertype == EnumMonsterType.ARTHROPOD ? (float) i * 2.5F : 0.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 850a7ac24d..bb5ba4f137 100644
+index 3cc03c9e85..b42b3dfa72 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,8 @@
@@ -752,7 +752,7 @@ index 850a7ac24d..bb5ba4f137 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
-@@ -204,4 +206,12 @@ public class PurpurConfig {
+@@ -197,4 +199,12 @@ public class PurpurConfig {
      private static void timingsSettings() {
          getString("settings.timings.url", "https://timings.pl3x.net");
      }
diff --git a/patches/server/0117-Optimize-entity-pathfinder-selector.patch b/patches/server/0108-Optimize-entity-pathfinder-selector.patch
similarity index 99%
rename from patches/server/0117-Optimize-entity-pathfinder-selector.patch
rename to patches/server/0108-Optimize-entity-pathfinder-selector.patch
index 26fa95d9c..c16038ef3 100644
--- a/patches/server/0117-Optimize-entity-pathfinder-selector.patch
+++ b/patches/server/0108-Optimize-entity-pathfinder-selector.patch
@@ -1,4 +1,4 @@
-From 0fc52f8c76773eb856e9bca698433d00c4a38f23 Mon Sep 17 00:00:00 2001
+From 352d63b5d92d8fca4f7b4c1467c3e23c7d82fa1a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 16:33:58 -0600
 Subject: [PATCH] Optimize entity pathfinder selector
diff --git a/patches/server/0118-Optimize-Chunk-Ticks.patch b/patches/server/0109-Optimize-Chunk-Ticks.patch
similarity index 99%
rename from patches/server/0118-Optimize-Chunk-Ticks.patch
rename to patches/server/0109-Optimize-Chunk-Ticks.patch
index 919f0f87c..6320e6c5a 100644
--- a/patches/server/0118-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0109-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From 4ec92463a439a49f71d932ae0fbaee1e3d8a4193 Mon Sep 17 00:00:00 2001
+From e1b82153644d4323bfd9f68ce0ee1a96a0ba69af Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 00:28:06 -0500
 Subject: [PATCH] Optimize Chunk Ticks
diff --git a/patches/server/0122-Add-configurable-beehive-generation-chance.patch b/patches/server/0110-Add-configurable-beehive-generation-chance.patch
similarity index 98%
rename from patches/server/0122-Add-configurable-beehive-generation-chance.patch
rename to patches/server/0110-Add-configurable-beehive-generation-chance.patch
index 05c4fbd12..9158ca096 100644
--- a/patches/server/0122-Add-configurable-beehive-generation-chance.patch
+++ b/patches/server/0110-Add-configurable-beehive-generation-chance.patch
@@ -1,4 +1,4 @@
-From b3f030e509044015a30554baaef3f67b79ff66e8 Mon Sep 17 00:00:00 2001
+From 966a5671bec24f1f77553c50093a06e964847310 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 03:39:34 -0500
 Subject: [PATCH] Add configurable beehive generation chance
@@ -69,7 +69,7 @@ index b9dee0e255..9e9d9e6437 100644
          BlockPosition blockposition1;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58b7543d82..6446ee7d79 100644
+index 2da403bc47..ecf326d697 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -99,6 +99,29 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0123-Add-more-timings-timers.patch b/patches/server/0111-Add-more-timings-timers.patch
similarity index 98%
rename from patches/server/0123-Add-more-timings-timers.patch
rename to patches/server/0111-Add-more-timings-timers.patch
index 14c0e5306..51d7f9cb8 100644
--- a/patches/server/0123-Add-more-timings-timers.patch
+++ b/patches/server/0111-Add-more-timings-timers.patch
@@ -1,4 +1,4 @@
-From 28c65172fa6558d88974d8b46f4098f06fe61039 Mon Sep 17 00:00:00 2001
+From 8a146aa63d0e2fa18567fef8990d10d0cab32730 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 02:36:45 -0500
 Subject: [PATCH] Add more timings timers
@@ -91,7 +91,7 @@ index bac6cea1ff..f9ca4280d4 100644
          this.K();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a991614408..44889e86e1 100644
+index 2769077bb4..fdb8a0f8c7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2385,7 +2385,9 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0124-Skip-events-if-there-s-no-listeners.patch b/patches/server/0112-Skip-events-if-there-s-no-listeners.patch
similarity index 95%
rename from patches/server/0124-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0112-Skip-events-if-there-s-no-listeners.patch
index b59ab3604..cd80cd88a 100644
--- a/patches/server/0124-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0112-Skip-events-if-there-s-no-listeners.patch
@@ -1,4 +1,4 @@
-From 28a031dde622114b5b89e25f0cad11416b91ef7b Mon Sep 17 00:00:00 2001
+From 07b7231e8bd0fb12885b134af76f6f381b08a338 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners
diff --git a/patches/server/0125-Debug-stick-should-not-update-neighbors.patch b/patches/server/0113-Debug-stick-should-not-update-neighbors.patch
similarity index 94%
rename from patches/server/0125-Debug-stick-should-not-update-neighbors.patch
rename to patches/server/0113-Debug-stick-should-not-update-neighbors.patch
index ef41d60bd..cb6f9a1eb 100644
--- a/patches/server/0125-Debug-stick-should-not-update-neighbors.patch
+++ b/patches/server/0113-Debug-stick-should-not-update-neighbors.patch
@@ -1,4 +1,4 @@
-From 667c7634e2f1c8a064d621e3fa8d37b7ebca4220 Mon Sep 17 00:00:00 2001
+From 92944ad199d2bb2497ee9c280853b09040399be2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 17:16:30 -0500
 Subject: [PATCH] Debug stick should not update neighbors
diff --git a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch b/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
similarity index 93%
rename from patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
rename to patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
index ba0da28d5..3e2ca8e06 100644
--- a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch
+++ b/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
@@ -1,7 +1,7 @@
-From 7db338afa0043303f800ec7cbbcdbfa2d8642128 Mon Sep 17 00:00:00 2001
+From 140ca22b4dd0d3cea7dcf32ddef49abd6f0e6af3 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)
+Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
 
 ---
  src/main/java/net/minecraft/server/EntityArrow.java | 5 ++++-
diff --git a/patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch b/patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 87%
rename from patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch
rename to patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch
index 925de6c4e..4e2035fb4 100644
--- a/patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch
+++ b/patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch
@@ -1,7 +1,7 @@
-From 8f423e9a0065d51e8b00cebd1d1425a721a835a2 Mon Sep 17 00:00:00 2001
+From b983b3ea803ff460b2bc7e29990dc9fb1cd24f5b 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
+Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
 
 ---
  .../net/minecraft/server/BlockTurtleEgg.java  | 19 ++++++++++++++++++-
@@ -38,10 +38,10 @@ index cb36334e41..aa83ef1699 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 82b58225bd..dcf0f58a29 100644
+index ecf326d697..944ecc0723 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -70,6 +70,15 @@ public class PurpurWorldConfig {
+@@ -191,6 +191,15 @@ public class PurpurWorldConfig {
          signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  
@@ -54,9 +54,9 @@ index 82b58225bd..dcf0f58a29 100644
 +        turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
 +    }
 +
-     public boolean batRidable = false;
-     public boolean batRidableInWater = false;
-     public boolean batRequireShiftToMount = true;
+     public boolean boatEjectPlayersOnLand = false;
+     public float armorstandStepHeight = 0.0F;
+     public boolean controllableMinecarts = false;
 -- 
 2.24.0
 
diff --git a/patches/server/0040-Fix-item-position-desync-MC-4.patch b/patches/server/0116-MC-4-Fix-Item-position-desync.patch
similarity index 92%
rename from patches/server/0040-Fix-item-position-desync-MC-4.patch
rename to patches/server/0116-MC-4-Fix-Item-position-desync.patch
index 8781fcfa7..5f50213c8 100644
--- a/patches/server/0040-Fix-item-position-desync-MC-4.patch
+++ b/patches/server/0116-MC-4-Fix-Item-position-desync.patch
@@ -1,7 +1,7 @@
-From d17719bc857035f9d86ddcc536857a01b0996aa8 Mon Sep 17 00:00:00 2001
+From f486e438695a437bf15a552bf738cf47169acf1a 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)
+Subject: [PATCH] MC-4 Fix - Item position desync
 
 ---
  src/main/java/net/minecraft/server/EntityTrackerEntry.java  | 6 ++++++
@@ -44,10 +44,10 @@ index 5b1d959354..0010448e3a 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e219312168..3670b4d48d 100644
+index b42b3dfa72..7699b81dad 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -143,8 +143,10 @@ public class PurpurConfig {
+@@ -166,8 +166,10 @@ public class PurpurConfig {
      }
  
      public static boolean dontSendUselessEntityPackets = false;
@@ -57,7 +57,7 @@ index e219312168..3670b4d48d 100644
 +        fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
      }
  
-     private static void timingsSettings() {
+     public static boolean barrelSixRows = false;
 -- 
 2.24.0
 
diff --git a/patches/server/0041-Fix-pig-zombies-MC-56653.patch b/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch
similarity index 70%
rename from patches/server/0041-Fix-pig-zombies-MC-56653.patch
rename to patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch
index 8d655009f..2bf6a1e83 100644
--- a/patches/server/0041-Fix-pig-zombies-MC-56653.patch
+++ b/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch
@@ -1,7 +1,7 @@
-From 2a6f41ff407214c97f6a4bc8370e9157cae5a374 Mon Sep 17 00:00:00 2001
+From e0a32f81af60ef0eb5f602f9ddc37242c65fa515 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)
+Subject: [PATCH] MC-56653 Fix - pig zombies aggro
 
 ---
  src/main/java/net/minecraft/server/EntityPigZombie.java | 9 ++++++++-
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index fb9ef88ea3..227fff3f1d 100644
+index 90bf12c735..c78876fc42 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
-@@ -155,6 +155,7 @@ public class EntityPigZombie extends EntityZombie {
+@@ -170,6 +170,7 @@ public class EntityPigZombie extends EntityZombie {
              boolean result = super.damageEntity(damagesource, f);
  
              if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
@@ -20,7 +20,7 @@ index fb9ef88ea3..227fff3f1d 100644
                  this.i((EntityLiving) entity);
              }
  
-@@ -173,7 +174,7 @@ public class EntityPigZombie extends EntityZombie {
+@@ -188,7 +189,7 @@ public class EntityPigZombie extends EntityZombie {
          this.angerLevel = event.getNewAnger();
          // CraftBukkit end
          this.soundDelay = this.random.nextInt(40);
@@ -29,7 +29,7 @@ index fb9ef88ea3..227fff3f1d 100644
          return true;
      }
  
-@@ -215,6 +216,12 @@ public class EntityPigZombie extends EntityZombie {
+@@ -230,6 +231,12 @@ public class EntityPigZombie extends EntityZombie {
          return this.eA();
      }
  
@@ -43,18 +43,21 @@ index fb9ef88ea3..227fff3f1d 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 392b826286..a1548fe174 100644
+index 944ecc0723..be0d5f9e3e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -785,10 +785,12 @@ public class PurpurWorldConfig {
-     public boolean zombiePigmanRidable = false;
-     public boolean zombiePigmanRidableInWater = false;
-     public boolean zombiePigmanRequireShiftToMount = true;
+@@ -999,6 +999,7 @@ public class PurpurWorldConfig {
+     public boolean zombiePigmanJockeyOnlyBaby = true;
+     public double zombiePigmanJockeyChance = 0.05D;
+     public boolean zombiePigmanJockeyTryExistingChickens = true;
 +    public boolean zombiePigmanDontTargetUnlessHit = false;
      private void zombiePigmanSettings() {
          zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable);
          zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater);
-         zombiePigmanRequireShiftToMount = getBoolean("mobs.zombie_pigman.require-shift-to-mount", zombiePigmanRequireShiftToMount);
+@@ -1006,6 +1007,7 @@ public class PurpurWorldConfig {
+         zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby);
+         zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance);
+         zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens);
 +        zombiePigmanDontTargetUnlessHit = getBoolean("mobs.zombie_pigman.dont-target-unless-hit", zombiePigmanDontTargetUnlessHit);
      }
  
diff --git a/patches/server/0068-Add-MonsterEggSpawnEvent.patch b/patches/server/0118-EMC-MonsterEggSpawn-Event.patch
similarity index 95%
rename from patches/server/0068-Add-MonsterEggSpawnEvent.patch
rename to patches/server/0118-EMC-MonsterEggSpawn-Event.patch
index 264173972..10df217c7 100644
--- a/patches/server/0068-Add-MonsterEggSpawnEvent.patch
+++ b/patches/server/0118-EMC-MonsterEggSpawn-Event.patch
@@ -1,7 +1,7 @@
-From e6961aa0a7dda69c6669f3197125f997794c54bc 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
+From 89e3847f2604d96d3816e61252588bbf3951db7f Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 20 Jul 2013 22:40:56 -0400
+Subject: [PATCH] EMC - MonsterEggSpawn Event
 
 ---
  .../net/minecraft/server/EntityTypes.java     | 28 ++++++++++++++++++-
diff --git a/patches/server/0116-Optimize-Pathfinding.patch b/patches/server/0119-EMC-Optimize-Pathfinding.patch
similarity index 95%
rename from patches/server/0116-Optimize-Pathfinding.patch
rename to patches/server/0119-EMC-Optimize-Pathfinding.patch
index b6b155c80..ec91aa6db 100644
--- a/patches/server/0116-Optimize-Pathfinding.patch
+++ b/patches/server/0119-EMC-Optimize-Pathfinding.patch
@@ -1,7 +1,7 @@
-From e18f8766411151e7e83106d84d78c8ecd1a135c7 Mon Sep 17 00:00:00 2001
+From cf86a69474750822daefd4abea81417e33918a4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
-Subject: [PATCH] Optimize Pathfinding
+Subject: [PATCH] EMC - Optimize Pathfinding
 
 Prevents pathfinding from spamming failures for things such as
 arrow attacks.
diff --git a/patches/server/0110-Add-BellRingEvent.patch b/patches/server/0120-PaperPR-Add-BellRingEvent.patch
similarity index 95%
rename from patches/server/0110-Add-BellRingEvent.patch
rename to patches/server/0120-PaperPR-Add-BellRingEvent.patch
index 5f74a711d..64a8be493 100644
--- a/patches/server/0110-Add-BellRingEvent.patch
+++ b/patches/server/0120-PaperPR-Add-BellRingEvent.patch
@@ -1,7 +1,7 @@
-From 81ed542de9fa5421ecf12e4f08f6f8c7b14fa771 Mon Sep 17 00:00:00 2001
+From 305f236576d74ce125f772938bf21faca88f7a8f 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
+Subject: [PATCH] PaperPR - Add BellRingEvent
 
 ---
  src/main/java/net/minecraft/server/BlockBell.java | 14 +++++++++++++-
diff --git a/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0121-PaperPR-Don-t-recalculate-permissions-for-players-on.patch
similarity index 85%
rename from patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch
rename to patches/server/0121-PaperPR-Don-t-recalculate-permissions-for-players-on.patch
index 4ba3bc174..d0f214aad 100644
--- a/patches/server/0074-Don-t-recalculate-permissions-for-players-on-world-c.patch
+++ b/patches/server/0121-PaperPR-Don-t-recalculate-permissions-for-players-on.patch
@@ -1,7 +1,8 @@
-From 65faf2f8eb765570b0a4dc61580943aa2c1737d3 Mon Sep 17 00:00:00 2001
+From 212be812f3e565dfd27838cb38d93c23054f7a63 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
+Subject: [PATCH] PaperPR - Don't recalculate permissions for players on world
+ change
 
 ---
  src/main/java/net/minecraft/server/PlayerList.java | 9 +++++----
@@ -9,7 +10,7 @@ Subject: [PATCH] Don't recalculate permissions for players on world change
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7b79ee4fe5..3975312394 100644
+index 67228329bd..39b33d9d72 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -32,13 +32,10 @@ import org.bukkit.Location;
@@ -36,7 +37,7 @@ index 7b79ee4fe5..3975312394 100644
          if (!entityplayer.playerConnection.isDisconnected()) {
              worldserver.addPlayerRespawn(entityplayer1);
              this.players.add(entityplayer1);
-@@ -907,10 +906,12 @@ public abstract class PlayerList {
+@@ -908,10 +907,12 @@ public abstract class PlayerList {
              entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
          }
  
@@ -51,10 +52,10 @@ index 7b79ee4fe5..3975312394 100644
      public boolean isWhitelisted(GameProfile gameprofile) {
          return isWhitelisted(gameprofile, null);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9f6b4dc9a5..a8276ab477 100644
+index 7699b81dad..bb5ba4f137 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -181,6 +181,11 @@ public class PurpurConfig {
+@@ -193,6 +193,11 @@ public class PurpurConfig {
          slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable);
      }
  
@@ -63,9 +64,9 @@ index 9f6b4dc9a5..a8276ab477 100644
 +        recalculatePermsOnWorldChange = getBoolean("settings.recalculate-perms-on-world-change", recalculatePermsOnWorldChange);
 +    }
 +
-     private static void timingsSettings() {
-         getString("settings.timings.url", "https://timings.pl3x.net");
-     }
+     public static String serverModName = "Purpur";
+     private static void serverModName() {
+         serverModName = getString("settings.server-mod-name", serverModName);
 -- 
 2.24.0
 
diff --git a/patches/server/0121-Per-World-Spawn-limits.patch b/patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
similarity index 89%
rename from patches/server/0121-Per-World-Spawn-limits.patch
rename to patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
index 8e192835c..85ce7014c 100644
--- a/patches/server/0121-Per-World-Spawn-limits.patch
+++ b/patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
@@ -1,7 +1,7 @@
-From 8eb07321e97c85a28469515ef51ee54c56d622e4 Mon Sep 17 00:00:00 2001
+From 5a37b73f23a92389a215265319ffa2f8bdcf5f68 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
+Subject: [PATCH] PaperPR - Per World Spawn limits
 
 ---
  src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++++++++
@@ -9,10 +9,10 @@ Subject: [PATCH] Per World Spawn limits
  2 files changed, 18 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 15ec909674..58b7543d82 100644
+index be0d5f9e3e..718526ac5b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -284,6 +284,17 @@ public class PurpurWorldConfig {
+@@ -307,6 +307,17 @@ public class PurpurWorldConfig {
          idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
      }
  
@@ -31,7 +31,7 @@ index 15ec909674..58b7543d82 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8bd9459253..1cdb3d3d9e 100644
+index 05f0025bb9..ad2545d3a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -328,6 +328,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0119-Delay-chunk-unloads.patch b/patches/server/0123-Tuinity-Delay-chunk-unloads.patch
similarity index 98%
rename from patches/server/0119-Delay-chunk-unloads.patch
rename to patches/server/0123-Tuinity-Delay-chunk-unloads.patch
index dec237402..217b94187 100644
--- a/patches/server/0119-Delay-chunk-unloads.patch
+++ b/patches/server/0123-Tuinity-Delay-chunk-unloads.patch
@@ -1,7 +1,7 @@
-From b66568d3b618db54ac122476215adcd004fe49a5 Mon Sep 17 00:00:00 2001
+From 148d430731527e5de47f6a22798002dc9ddc9ac3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
-Subject: [PATCH] Delay chunk unloads
+Subject: [PATCH] Tuinity - Delay chunk unloads
 
 Chunk unloads are now delayed by 10s. Specifically, ticket level
 reduction is delayed by 10s. This is done to allow players to
@@ -210,10 +210,10 @@ index bb5ba4f137..7a02d4e8a0 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05f0025bb9..8bd9459253 100644
+index ad2545d3a4..1cdb3d3d9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -466,6 +466,7 @@ public class CraftWorld implements World {
+@@ -473,6 +473,7 @@ public class CraftWorld implements World {
          net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
          if (chunk != null) {
              world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
diff --git a/patches/server/0120-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
similarity index 85%
rename from patches/server/0120-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
index 58070f606..6e1cbe9af 100644
--- a/patches/server/0120-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
@@ -1,7 +1,7 @@
-From 0ddb705a9b56c7a1967ab659cfaad2094e441de1 Mon Sep 17 00:00:00 2001
+From 49eb2bbc6f28e325be860ceeb25929d56e69b064 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Thu, 26 Mar 2020 18:34:18 -0700
-Subject: [PATCH] Don't run entity collision code if not needed
+Subject: [PATCH] Tuinity - Don't run entity collision code if not needed
 
 Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
@@ -10,10 +10,10 @@ the max collisions per entity is less than or equal to 0
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2769077bb4..a991614408 100644
+index fdb8a0f8c7..44889e86e1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2689,10 +2689,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2701,10 +2701,16 @@ public abstract class EntityLiving extends Entity {
      protected void doTick() {}
  
      protected void collideNearby() {
diff --git a/patches/server/0111-Disable-mojang-profiler.patch b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch
similarity index 95%
rename from patches/server/0111-Disable-mojang-profiler.patch
rename to patches/server/0125-YAPFA-Disable-mojang-profiler.patch
index 6d1c75578..a9616bb0b 100644
--- a/patches/server/0111-Disable-mojang-profiler.patch
+++ b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch
@@ -1,7 +1,7 @@
-From ef7345e31dc84acd1782a91f574308569c5a3469 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
+From b1709f7987a485e5596ef7a485781ce219a70558 Mon Sep 17 00:00:00 2001
+From: tr7zw <tr7zw@live.de>
+Date: Thu, 5 Mar 2020 23:08:01 +0100
+Subject: [PATCH] YAPFA - Disable mojang profiler
 
 ---
  .../net/minecraft/server/CommandDebug.java    |  5 ++
@@ -43,7 +43,7 @@ index f0d72ea39d..e38a684060 100644
              throw CommandDebug.b.create();
          } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 487a9149d8..5f6852e4ba 100644
+index 914eb19b6e..c69fbf2548 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -55,7 +55,7 @@ index 487a9149d8..5f6852e4ba 100644
      private ServerConnection serverConnection;
      public final WorldLoadListenerFactory worldLoadListenerFactory;
      private final ServerPing serverPing = new ServerPing();
-@@ -1390,6 +1390,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1397,6 +1397,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              String s1 = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              final DedicatedServer dedicatedserver = new DedicatedServer(optionset, dedicatedserversettings, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new, s1);
  
@@ -64,7 +64,7 @@ index 487a9149d8..5f6852e4ba 100644
              /*
              dedicatedserver.i((String) optionset.valueOf(optionspec7));
              dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
-@@ -1815,6 +1817,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1822,6 +1824,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);