From d05e78bdb143883e03cb17df96fee1f05f60cada Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 7 Jan 2024 16:50:35 -0800
Subject: [PATCH] drop two config options in favor of PurpurExtras impl

dropped options:
- `mobs.snow_golem.drop-pumpkin-when-sheared`
- `mobs.sheep.jeb-shear-random-color`
---
 ...37-Snowman-drop-and-put-back-pumpkin.patch | 22 +----
 ...0049-Villagers-follow-emerald-blocks.patch | 10 +-
 .../0050-Allow-leashing-villagers.patch       | 12 +--
 .../0065-Configurable-jockey-options.patch    | 14 +--
 patches/server/0074-Squid-EAR-immunity.patch  |  8 +-
 .../0076-Configurable-villager-breeding.patch |  6 +-
 ...9-Add-vindicator-johnny-spawn-chance.patch |  6 +-
 ...Stop-squids-floating-on-top-of-water.patch |  6 +-
 ...stomizable-wither-health-and-healing.patch |  6 +-
 ...sable-zombie-aggressiveness-towards-.patch |  6 +-
 patches/server/0094-Flying-squids-Oh-my.patch |  6 +-
 ...e-entity-breeding-times-configurable.patch | 28 +++---
 .../0109-Snow-Golem-rate-of-fire-config.patch | 12 +--
 ...Villager-Clerics-to-farm-Nether-Wart.patch |  6 +-
 ...fied-Piglin-death-always-counting-as.patch |  6 +-
 ...ble-chance-for-wolves-to-spawn-rabid.patch |  6 +-
 ...14-Configurable-default-collar-color.patch |  6 +-
 .../0118-Striders-give-saddle-back.patch      |  6 +-
 ...iefing-bypass-to-everything-affected.patch | 24 ++---
 ...oggle-for-water-sensitive-mob-damage.patch | 88 ++++++++---------
 ...ither-Ender-Dragon-can-ride-vehicles.patch |  6 +-
 ...0145-Add-config-for-villager-trading.patch | 10 +-
 ...8-Config-for-wither-explosion-radius.patch |  6 +-
 ...onfigurable-hunger-starvation-damage.patch |  4 +-
 ...izeable-Zombie-Villager-curing-times.patch |  6 +-
 ...0201-Toggle-for-Wither-s-spawn-sound.patch |  8 +-
 .../0204-Conduit-behavior-configuration.patch |  4 +-
 .../server/0205-Cauldron-fill-chances.patch   |  4 +-
 ...ion-to-disable-zombie-villagers-cure.patch |  6 +-
 .../0225-Mobs-always-drop-experience.patch    | 94 +++++++++----------
 ...aring-jeb-produces-random-color-wool.patch | 39 --------
 ...urtle-eggs-random-tick-crack-chance.patch} |  4 +-
 ...=> 0230-Mob-head-visibility-percent.patch} | 12 +--
 ...able-valid-characters-for-usernames.patch} |  0
 ...Shears-can-have-looting-enchantment.patch} | 42 ++++-----
 ...Stop-bees-from-dying-after-stinging.patch} |  2 +-
 ...ounts-in-beehives-to-Purpur-clients.patch} |  0
 ...onfigurable-farmland-trample-height.patch} |  2 +-
 ...onfigurable-player-pickup-exp-delay.patch} |  6 +-
 ...ng.patch => 0237-Allow-void-trading.patch} |  2 +-
 ...h => 0238-Configurable-phantom-size.patch} |  2 +-
 ...> 0239-Configurable-food-attributes.patch} |  0
 ....patch => 0240-Max-joins-per-second.patch} |  0
 ...figurable-minimum-demand-for-trades.patch} |  6 +-
 ... => 0242-Lobotomize-stuck-villagers.patch} |  6 +-
 ...ion-for-villager-display-trade-item.patch} |  6 +-
 ...wner-not-spawning-water-animals-cor.patch} |  2 +-
 ...ig-for-mob-last-hurt-by-player-time.patch} |  4 +-
 ...=> 0246-Anvil-repair-damage-options.patch} |  2 +-
 ...-turtle-egg-trampling-with-feather-.patch} |  4 +-
 ...d-toggle-for-enchant-level-clamping.patch} |  2 +-
 ...kip-junit-tests-for-purpur-commands.patch} |  0
 ...rable-search-radius-for-villagers-t.patch} |  6 +-
 ...ge.patch => 0251-Stonecutter-damage.patch} |  2 +-
 ...le-damage-settings-for-magma-blocks.patch} |  2 +-
 ...253-Add-config-for-snow-on-blue-ice.patch} |  2 +-
 ... => 0254-Skeletons-eat-wither-roses.patch} |  6 +-
 ...55-Enchantment-Table-Persists-Lapis.patch} |  2 +-
 ...ofiler.patch => 0256-Spark-Profiler.patch} |  0
 ...-disable-kick-for-out-of-order-chat.patch} |  2 +-
 ...for-sculk-shrieker-can_summon-state.patch} |  2 +-
 ...=> 0259-Config-to-not-let-coral-die.patch} |  2 +-
 ...ch => 0260-Add-local-difficulty-api.patch} |  0
 ...261-Add-toggle-for-RNG-manipulation.patch} |  4 +-
 ... 0262-Send-client-custom-name-of-BE.patch} |  0
 ...=> 0263-Allow-custom-ChatDecorators.patch} |  0
 ...imings.patch => 0264-Remove-Timings.patch} |  0
 ...atch => 0265-Remove-Mojang-Profiler.patch} |  0
 ...r-output-for-invalid-movement-kicks.patch} |  2 +-
 ...d-Bee-API.patch => 0267-Add-Bee-API.patch} |  0
 ...-API.patch => 0268-Debug-Marker-API.patch} |  0
 ...g-option-to-ignore-creative-players.patch} |  2 +-
 ...70-Add-skeleton-bow-accuracy-option.patch} |  6 +-
 ...atch => 0271-Allay-respect-item-NBT.patch} |  2 +-
 ....patch => 0272-Add-death-screen-API.patch} |  0
 ...-Make-pufferfish-config-relocatable.patch} |  0
 ...4-Implement-ram-and-rambar-commands.patch} |  2 +-
 ...275-Add-item-packet-serialize-event.patch} |  2 +-
 ...n-to-fix-MC-3304-projectile-looting.patch} |  2 +-
 ...Configurable-block-blast-resistance.patch} |  2 +-
 ...gurable-block-fall-damage-modifiers.patch} |  0
 ...uage-API.patch => 0279-Language-API.patch} |  2 +-
 ... 0280-Milk-Keeps-Beneficial-Effects.patch} |  4 +-
 ...s-not-looking-up-and-down-when-stra.patch} |  0
 ...d-log-suppression-for-LibraryLoader.patch} |  0
 ...ow-creeper-to-encircle-target-when-.patch} |  2 +-
 ...API.patch => 0284-Fire-Immunity-API.patch} |  0
 ...eport-to-spawn-on-nether-ceiling-da.patch} |  2 +-
 ...t.patch => 0286-Added-got-ram-event.patch} |  0
 ... 0287-Log-skipped-entity-s-position.patch} |  0
 ....patch => 0288-End-Crystal-Cramming.patch} |  2 +-
 ...eacon-effects-when-covered-by-tinte.patch} |  2 +-
 ...ute-clamping-and-armor-limit-config.patch} |  0
 ...ig-to-remove-explosion-radius-clamp.patch} |  2 +-
 ...ble-sugarcane-cactus-and-netherwart.patch} |  2 +-
 ....patch => 0293-Add-PreExplodeEvents.patch} |  0
 ...4-Improve-output-of-plugins-command.patch} |  0
 ...atch => 0295-Add-mending-multiplier.patch} |  4 +-
 ....patch => 0296-Make-GUI-Great-Again.patch} |  0
 ...ee-API.patch => 0297-Stored-Bee-API.patch} |  0
 ...patch => 0298-Shears-can-defuse-TNT.patch} |  4 +-
 ...-API.patch => 0299-Explorer-Map-API.patch} |  0
 ...Option-Ocelot-Spawn-Under-Sea-Level.patch} |  2 +-
 ...-piglins-to-ignore-gold-trimmed-arm.patch} |  2 +-
 ...ways-showing-item-in-player-death-m.patch} |  0
 ...0303-place-end-crystal-on-any-block.patch} |  2 +-
 ...I.patch => 0304-Add-hover-lines-API.patch} |  0
 ...able-the-copper-oxidation-proximity.patch} |  2 +-
 108 files changed, 302 insertions(+), 357 deletions(-)
 delete mode 100644 patches/server/0229-Shearing-jeb-produces-random-color-wool.patch
 rename patches/server/{0230-Turtle-eggs-random-tick-crack-chance.patch => 0229-Turtle-eggs-random-tick-crack-chance.patch} (91%)
 rename patches/server/{0231-Mob-head-visibility-percent.patch => 0230-Mob-head-visibility-percent.patch} (93%)
 rename patches/server/{0232-Configurable-valid-characters-for-usernames.patch => 0231-Configurable-valid-characters-for-usernames.patch} (100%)
 rename patches/server/{0233-Shears-can-have-looting-enchantment.patch => 0232-Shears-can-have-looting-enchantment.patch} (91%)
 rename patches/server/{0234-Stop-bees-from-dying-after-stinging.patch => 0233-Stop-bees-from-dying-after-stinging.patch} (95%)
 rename patches/server/{0235-Give-bee-counts-in-beehives-to-Purpur-clients.patch => 0234-Give-bee-counts-in-beehives-to-Purpur-clients.patch} (100%)
 rename patches/server/{0236-Configurable-farmland-trample-height.patch => 0235-Configurable-farmland-trample-height.patch} (97%)
 rename patches/server/{0237-Configurable-player-pickup-exp-delay.patch => 0236-Configurable-player-pickup-exp-delay.patch} (93%)
 rename patches/server/{0238-Allow-void-trading.patch => 0237-Allow-void-trading.patch} (96%)
 rename patches/server/{0239-Configurable-phantom-size.patch => 0238-Configurable-phantom-size.patch} (96%)
 rename patches/server/{0240-Configurable-food-attributes.patch => 0239-Configurable-food-attributes.patch} (100%)
 rename patches/server/{0241-Max-joins-per-second.patch => 0240-Max-joins-per-second.patch} (100%)
 rename patches/server/{0242-Configurable-minimum-demand-for-trades.patch => 0241-Configurable-minimum-demand-for-trades.patch} (93%)
 rename patches/server/{0243-Lobotomize-stuck-villagers.patch => 0242-Lobotomize-stuck-villagers.patch} (97%)
 rename patches/server/{0244-Option-for-villager-display-trade-item.patch => 0243-Option-for-villager-display-trade-item.patch} (91%)
 rename patches/server/{0245-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch => 0244-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch} (95%)
 rename patches/server/{0246-Config-for-mob-last-hurt-by-player-time.patch => 0245-Config-for-mob-last-hurt-by-player-time.patch} (95%)
 rename patches/server/{0247-Anvil-repair-damage-options.patch => 0246-Anvil-repair-damage-options.patch} (98%)
 rename patches/server/{0248-Option-to-disable-turtle-egg-trampling-with-feather-.patch => 0247-Option-to-disable-turtle-egg-trampling-with-feather-.patch} (93%)
 rename patches/server/{0249-Add-toggle-for-enchant-level-clamping.patch => 0248-Add-toggle-for-enchant-level-clamping.patch} (97%)
 rename patches/server/{0250-Skip-junit-tests-for-purpur-commands.patch => 0249-Skip-junit-tests-for-purpur-commands.patch} (100%)
 rename patches/server/{0251-Implement-configurable-search-radius-for-villagers-t.patch => 0250-Implement-configurable-search-radius-for-villagers-t.patch} (92%)
 rename patches/server/{0252-Stonecutter-damage.patch => 0251-Stonecutter-damage.patch} (98%)
 rename patches/server/{0253-Configurable-damage-settings-for-magma-blocks.patch => 0252-Configurable-damage-settings-for-magma-blocks.patch} (96%)
 rename patches/server/{0254-Add-config-for-snow-on-blue-ice.patch => 0253-Add-config-for-snow-on-blue-ice.patch} (95%)
 rename patches/server/{0255-Skeletons-eat-wither-roses.patch => 0254-Skeletons-eat-wither-roses.patch} (96%)
 rename patches/server/{0256-Enchantment-Table-Persists-Lapis.patch => 0255-Enchantment-Table-Persists-Lapis.patch} (98%)
 rename patches/server/{0257-Spark-Profiler.patch => 0256-Spark-Profiler.patch} (100%)
 rename patches/server/{0258-Option-to-disable-kick-for-out-of-order-chat.patch => 0257-Option-to-disable-kick-for-out-of-order-chat.patch} (95%)
 rename patches/server/{0259-Config-for-sculk-shrieker-can_summon-state.patch => 0258-Config-for-sculk-shrieker-can_summon-state.patch} (95%)
 rename patches/server/{0260-Config-to-not-let-coral-die.patch => 0259-Config-to-not-let-coral-die.patch} (96%)
 rename patches/server/{0261-Add-local-difficulty-api.patch => 0260-Add-local-difficulty-api.patch} (100%)
 rename patches/server/{0262-Add-toggle-for-RNG-manipulation.patch => 0261-Add-toggle-for-RNG-manipulation.patch} (93%)
 rename patches/server/{0263-Send-client-custom-name-of-BE.patch => 0262-Send-client-custom-name-of-BE.patch} (100%)
 rename patches/server/{0264-Allow-custom-ChatDecorators.patch => 0263-Allow-custom-ChatDecorators.patch} (100%)
 rename patches/server/{0265-Remove-Timings.patch => 0264-Remove-Timings.patch} (100%)
 rename patches/server/{0266-Remove-Mojang-Profiler.patch => 0265-Remove-Mojang-Profiler.patch} (100%)
 rename patches/server/{0267-Add-more-logger-output-for-invalid-movement-kicks.patch => 0266-Add-more-logger-output-for-invalid-movement-kicks.patch} (96%)
 rename patches/server/{0268-Add-Bee-API.patch => 0267-Add-Bee-API.patch} (100%)
 rename patches/server/{0269-Debug-Marker-API.patch => 0268-Debug-Marker-API.patch} (100%)
 rename patches/server/{0270-mob-spawning-option-to-ignore-creative-players.patch => 0269-mob-spawning-option-to-ignore-creative-players.patch} (96%)
 rename patches/server/{0271-Add-skeleton-bow-accuracy-option.patch => 0270-Add-skeleton-bow-accuracy-option.patch} (94%)
 rename patches/server/{0272-Allay-respect-item-NBT.patch => 0271-Allay-respect-item-NBT.patch} (96%)
 rename patches/server/{0273-Add-death-screen-API.patch => 0272-Add-death-screen-API.patch} (100%)
 rename patches/server/{0274-Make-pufferfish-config-relocatable.patch => 0273-Make-pufferfish-config-relocatable.patch} (100%)
 rename patches/server/{0275-Implement-ram-and-rambar-commands.patch => 0274-Implement-ram-and-rambar-commands.patch} (99%)
 rename patches/server/{0276-Add-item-packet-serialize-event.patch => 0275-Add-item-packet-serialize-event.patch} (97%)
 rename patches/server/{0277-Add-an-option-to-fix-MC-3304-projectile-looting.patch => 0276-Add-an-option-to-fix-MC-3304-projectile-looting.patch} (98%)
 rename patches/server/{0278-Configurable-block-blast-resistance.patch => 0277-Configurable-block-blast-resistance.patch} (96%)
 rename patches/server/{0279-Configurable-block-fall-damage-modifiers.patch => 0278-Configurable-block-fall-damage-modifiers.patch} (100%)
 rename patches/server/{0280-Language-API.patch => 0279-Language-API.patch} (93%)
 rename patches/server/{0281-Milk-Keeps-Beneficial-Effects.patch => 0280-Milk-Keeps-Beneficial-Effects.patch} (95%)
 rename patches/server/{0282-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch => 0281-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch} (100%)
 rename patches/server/{0283-Add-log-suppression-for-LibraryLoader.patch => 0282-Add-log-suppression-for-LibraryLoader.patch} (100%)
 rename patches/server/{0284-Add-option-to-allow-creeper-to-encircle-target-when-.patch => 0283-Add-option-to-allow-creeper-to-encircle-target-when-.patch} (96%)
 rename patches/server/{0285-Fire-Immunity-API.patch => 0284-Fire-Immunity-API.patch} (100%)
 rename patches/server/{0286-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch => 0285-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch} (96%)
 rename patches/server/{0287-Added-got-ram-event.patch => 0286-Added-got-ram-event.patch} (100%)
 rename patches/server/{0288-Log-skipped-entity-s-position.patch => 0287-Log-skipped-entity-s-position.patch} (100%)
 rename patches/server/{0289-End-Crystal-Cramming.patch => 0288-End-Crystal-Cramming.patch} (96%)
 rename patches/server/{0290-Option-to-allow-beacon-effects-when-covered-by-tinte.patch => 0289-Option-to-allow-beacon-effects-when-covered-by-tinte.patch} (97%)
 rename patches/server/{0291-Add-attribute-clamping-and-armor-limit-config.patch => 0290-Add-attribute-clamping-and-armor-limit-config.patch} (100%)
 rename patches/server/{0292-Config-to-remove-explosion-radius-clamp.patch => 0291-Config-to-remove-explosion-radius-clamp.patch} (95%)
 rename patches/server/{0293-bonemealable-sugarcane-cactus-and-netherwart.patch => 0292-bonemealable-sugarcane-cactus-and-netherwart.patch} (98%)
 rename patches/server/{0294-Add-PreExplodeEvents.patch => 0293-Add-PreExplodeEvents.patch} (100%)
 rename patches/server/{0295-Improve-output-of-plugins-command.patch => 0294-Improve-output-of-plugins-command.patch} (100%)
 rename patches/server/{0296-Add-mending-multiplier.patch => 0295-Add-mending-multiplier.patch} (92%)
 rename patches/server/{0297-Make-GUI-Great-Again.patch => 0296-Make-GUI-Great-Again.patch} (100%)
 rename patches/server/{0298-Stored-Bee-API.patch => 0297-Stored-Bee-API.patch} (100%)
 rename patches/server/{0299-Shears-can-defuse-TNT.patch => 0298-Shears-can-defuse-TNT.patch} (95%)
 rename patches/server/{0300-Explorer-Map-API.patch => 0299-Explorer-Map-API.patch} (100%)
 rename patches/server/{0301-Option-Ocelot-Spawn-Under-Sea-Level.patch => 0300-Option-Ocelot-Spawn-Under-Sea-Level.patch} (95%)
 rename patches/server/{0302-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch => 0301-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch} (97%)
 rename patches/server/{0303-Add-option-for-always-showing-item-in-player-death-m.patch => 0302-Add-option-for-always-showing-item-in-player-death-m.patch} (100%)
 rename patches/server/{0304-place-end-crystal-on-any-block.patch => 0303-place-end-crystal-on-any-block.patch} (96%)
 rename patches/server/{0305-Add-hover-lines-API.patch => 0304-Add-hover-lines-API.patch} (100%)
 rename patches/server/{0306-Add-option-to-disable-the-copper-oxidation-proximity.patch => 0305-Add-option-to-disable-the-copper-oxidation-proximity.patch} (96%)

diff --git a/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch
index 067b91ce9..ba60b2b3c 100644
--- a/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 0c128449fbe51aa7e437568ba4bc857c1175df2b..9c8efa5dcd4ec78a4e071d6b06871d09b93a531d 100644
+index 0c128449fbe51aa7e437568ba4bc857c1175df2b..cf68f12da22cb9b0980c21e90caf4dea62769fa5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -198,6 +198,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -23,36 +23,22 @@ index 0c128449fbe51aa7e437568ba4bc857c1175df2b..9c8efa5dcd4ec78a4e071d6b06871d09
          } else {
              return tryRide(player, hand); // Purpur
          }
-@@ -211,6 +219,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
- 
-     @Override
-     public java.util.List<ItemStack> generateDefaultDrops() {
-+        // Purpur start
-+        if (!level().purpurConfig.snowGolemDropsPumpkin) {
-+            return Shearable.super.generateDefaultDrops(0);
-+        }
-+        // Purpur end
-         return java.util.Collections.singletonList(new ItemStack(Items.CARVED_PUMPKIN));
-     }
- 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 05b7788d168cadb594613d81cbff0726a63d81d2..a48dbad212789f90525e669ea81b1042c53cd06a 100644
+index 05b7788d168cadb594613d81cbff0726a63d81d2..f63849ddb622633da41c38c7cbc03f0061acf139 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1176,6 +1176,8 @@ public class PurpurWorldConfig {
+@@ -1176,6 +1176,7 @@ public class PurpurWorldConfig {
      public boolean snowGolemControllable = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;
      public double snowGolemMaxHealth = 4.0D;
-+    public boolean snowGolemDropsPumpkin = true;
 +    public boolean snowGolemPutPumpkinBack = false;
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1187,6 +1189,8 @@ public class PurpurWorldConfig {
+@@ -1187,6 +1188,7 @@ public class PurpurWorldConfig {
              set("mobs.snow_golem.attributes.max_health", oldValue);
          }
          snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-+        snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
 +        snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
      }
  
diff --git a/patches/server/0049-Villagers-follow-emerald-blocks.patch b/patches/server/0049-Villagers-follow-emerald-blocks.patch
index 9dde72e1a..2e0d03b97 100644
--- a/patches/server/0049-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0049-Villagers-follow-emerald-blocks.patch
@@ -54,10 +54,10 @@ index 731bf43e2685554174d7ff295b5561ecf9dd70fa..64dd35573db3feae6507fc05086ed08c
          this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
          this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 511cec787f2fb9e4985ffcfb13b1352a2c789fee..92a3e3c87ef30b9ba55b3a671f35209db6018631 100644
+index edbe9c93d03d3811e536d1a079e7b3511569ffa7..431fa9e522662b506c82fbe7e0266e5662ad91cc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1437,6 +1437,7 @@ public class PurpurWorldConfig {
+@@ -1435,6 +1435,7 @@ public class PurpurWorldConfig {
      public boolean villagerRidableInWater = true;
      public boolean villagerControllable = true;
      public double villagerMaxHealth = 20.0D;
@@ -65,7 +65,7 @@ index 511cec787f2fb9e4985ffcfb13b1352a2c789fee..92a3e3c87ef30b9ba55b3a671f35209d
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
+@@ -1445,6 +1446,7 @@ public class PurpurWorldConfig {
              set("mobs.villager.attributes.max_health", oldValue);
          }
          villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
@@ -73,7 +73,7 @@ index 511cec787f2fb9e4985ffcfb13b1352a2c789fee..92a3e3c87ef30b9ba55b3a671f35209d
      }
  
      public boolean vindicatorRidable = false;
-@@ -1469,6 +1471,7 @@ public class PurpurWorldConfig {
+@@ -1467,6 +1469,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderRidableInWater = true;
      public boolean wanderingTraderControllable = true;
      public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 511cec787f2fb9e4985ffcfb13b1352a2c789fee..92a3e3c87ef30b9ba55b3a671f35209d
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1479,6 +1482,7 @@ public class PurpurWorldConfig {
+@@ -1477,6 +1480,7 @@ public class PurpurWorldConfig {
              set("mobs.wandering_trader.attributes.max_health", oldValue);
          }
          wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
diff --git a/patches/server/0050-Allow-leashing-villagers.patch b/patches/server/0050-Allow-leashing-villagers.patch
index bc92d459f..c84bc7b6f 100644
--- a/patches/server/0050-Allow-leashing-villagers.patch
+++ b/patches/server/0050-Allow-leashing-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 05eecaf3147051c44f9c4abce178c3126385c825..c77da33c38ddb9a383cb39e8a8837e67cf545bda 100644
+index f17b7e83a04a2cd738f7d708891fec2e341f3f96..a36994947d3a4f06f102bb143e44d0d7510f8338 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1317,6 +1317,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -49,10 +49,10 @@ index 64dd35573db3feae6507fc05086ed08c60f5ea01..ad7a32169b0decad1d3a2bd98e25b077
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5a952358f 100644
+index 431fa9e522662b506c82fbe7e0266e5662ad91cc..40a0cd68b1e35894360f0edc45bc30a5bd47622f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {
+@@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
      public boolean villagerControllable = true;
      public double villagerMaxHealth = 20.0D;
      public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1449,6 +1450,7 @@ public class PurpurWorldConfig {
+@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
          }
          villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
      }
  
      public boolean vindicatorRidable = false;
-@@ -1472,6 +1474,7 @@ public class PurpurWorldConfig {
+@@ -1470,6 +1472,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderControllable = true;
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1483,6 +1486,7 @@ public class PurpurWorldConfig {
+@@ -1481,6 +1484,7 @@ public class PurpurWorldConfig {
          }
          wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
diff --git a/patches/server/0065-Configurable-jockey-options.patch b/patches/server/0065-Configurable-jockey-options.patch
index 91a153816..5544f83cf 100644
--- a/patches/server/0065-Configurable-jockey-options.patch
+++ b/patches/server/0065-Configurable-jockey-options.patch
@@ -167,7 +167,7 @@ index fa5fa58ee03243054a38475634a6aa67815ca77d..764477c39e690d6373e17c7768780941
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738a78a0d35 100644
+index b5599360a524a55183b3a21f822b5cb24f59dc67..5c83d5b665bfccd7c54c18012d4bec7d975de3f2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -588,6 +588,9 @@ public class PurpurWorldConfig {
@@ -210,7 +210,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      }
  
      public boolean illusionerRidable = false;
-@@ -1676,6 +1688,9 @@ public class PurpurWorldConfig {
+@@ -1674,6 +1686,9 @@ public class PurpurWorldConfig {
      public boolean zombieControllable = true;
      public double zombieMaxHealth = 20.0D;
      public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1687,6 +1702,9 @@ public class PurpurWorldConfig {
+@@ -1685,6 +1700,9 @@ public class PurpurWorldConfig {
          }
          zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
          zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      }
  
      public boolean zombieHorseRidable = false;
-@@ -1723,6 +1741,9 @@ public class PurpurWorldConfig {
+@@ -1721,6 +1739,9 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerControllable = true;
      public double zombieVillagerMaxHealth = 20.0D;
      public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1734,6 +1755,9 @@ public class PurpurWorldConfig {
+@@ -1732,6 +1753,9 @@ public class PurpurWorldConfig {
          }
          zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
          zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -1741,6 +1765,9 @@ public class PurpurWorldConfig {
+@@ -1739,6 +1763,9 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinControllable = true;
      public double zombifiedPiglinMaxHealth = 20.0D;
      public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1752,5 +1779,8 @@ public class PurpurWorldConfig {
+@@ -1750,5 +1777,8 @@ public class PurpurWorldConfig {
          }
          zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
          zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
diff --git a/patches/server/0074-Squid-EAR-immunity.patch b/patches/server/0074-Squid-EAR-immunity.patch
index 6b0852511..247da5700 100644
--- a/patches/server/0074-Squid-EAR-immunity.patch
+++ b/patches/server/0074-Squid-EAR-immunity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3d7726bd54781e922f9d2b5b1fea510d6295919e..3557d668d5117aaaef2fde0792b58c7e58546c22 100644
+index e813fa037ca17bec29db916eac882cbfab432e56..c87c7feb140864771cbef3dcee1f89319c9a1f83 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
+@@ -1453,6 +1453,7 @@ public class PurpurWorldConfig {
      public boolean squidRidable = false;
      public boolean squidControllable = true;
      public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 3d7726bd54781e922f9d2b5b1fea510d6295919e..3557d668d5117aaaef2fde0792b58c7e
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1464,6 +1465,7 @@ public class PurpurWorldConfig {
+@@ -1462,6 +1463,7 @@ public class PurpurWorldConfig {
              set("mobs.squid.attributes.max_health", oldValue);
          }
          squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
@@ -25,7 +25,7 @@ index 3d7726bd54781e922f9d2b5b1fea510d6295919e..3557d668d5117aaaef2fde0792b58c7e
  
      public boolean spiderRidable = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 282a57df4e2e5708e9cfd9c76b1d7de2a8a23900..a7ecbd77d0017a298b94cceeddc049eff713f60f 100644
+index 08b266efbefc45e9b08b2c03a36441a8c7564197..e7c384a8bf16de5132245c24226fff22f5c38585 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
diff --git a/patches/server/0076-Configurable-villager-breeding.patch b/patches/server/0076-Configurable-villager-breeding.patch
index adbfde3fc..e27c64bf1 100644
--- a/patches/server/0076-Configurable-villager-breeding.patch
+++ b/patches/server/0076-Configurable-villager-breeding.patch
@@ -18,10 +18,10 @@ index f4ed6ae7e8f122a0a2ce7f4488b0fe1ed0c7da3d..ce450d4b0d42443a47861dcb54b78a01
  
      private boolean hungry() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 81dd8666fd997f92972da2c6980c6ce515582fbc..51dd20665e5cdf1e76a63367d75890d4ae8f55b6 100644
+index a0477b47563214152483423121523f836827306b..3decdb56a21e7be052ef9386f2059e912738d4be 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
+@@ -1611,6 +1611,7 @@ public class PurpurWorldConfig {
      public double villagerMaxHealth = 20.0D;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 81dd8666fd997f92972da2c6980c6ce515582fbc..51dd20665e5cdf1e76a63367d75890d4
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1625,6 +1626,7 @@ public class PurpurWorldConfig {
+@@ -1623,6 +1624,7 @@ public class PurpurWorldConfig {
          villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
diff --git a/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch
index e13a7f214..150c48ba7 100644
--- a/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch
@@ -22,10 +22,10 @@ index fece613e9c182c6658f9df1d333a5b7e1e862218..a3db9c351b9cb06340458811c006d537
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 538c6f1cec00ef0ce8e793a5d205875d2d9aac92..7bcba65dfaa0076c5ce9271a5f54d01a99025242 100644
+index 65c365cd330b8865f0aeb7781a8995cbfea62f18..ac14ad278466dca95ad012c0b064b5bb470d06c8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {
+@@ -1638,6 +1638,7 @@ public class PurpurWorldConfig {
      public boolean vindicatorRidableInWater = true;
      public boolean vindicatorControllable = true;
      public double vindicatorMaxHealth = 24.0D;
@@ -33,7 +33,7 @@ index 538c6f1cec00ef0ce8e793a5d205875d2d9aac92..7bcba65dfaa0076c5ce9271a5f54d01a
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -1650,6 +1651,7 @@ public class PurpurWorldConfig {
+@@ -1648,6 +1649,7 @@ public class PurpurWorldConfig {
              set("mobs.vindicator.attributes.max_health", oldValue);
          }
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
diff --git a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch b/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
index e0712d2a0..721bcc6d2 100644
--- a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
@@ -54,10 +54,10 @@ index 67d595f75e0c3bffdb27b85b25ccd1f0bf1427d5..4d0c524af87d05dbd4a923ad6c40e1f2
 +    // Purpur
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index afc67803bf71d26e84f9130c30ac2b1b3d1114bf..d6b6d112da049e26ee867d81e37baa8f7bd4cda0 100644
+index 4218ebd3aa75c7290f1f8bb6ebd357ae3faf53f1..cb1d95f6f786df7a8825016b70c3c6b718f60358 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {
+@@ -1478,6 +1478,7 @@ public class PurpurWorldConfig {
      public boolean squidControllable = true;
      public double squidMaxHealth = 10.0D;
      public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index afc67803bf71d26e84f9130c30ac2b1b3d1114bf..d6b6d112da049e26ee867d81e37baa8f
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1490,6 +1491,7 @@ public class PurpurWorldConfig {
+@@ -1488,6 +1489,7 @@ public class PurpurWorldConfig {
          }
          squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
diff --git a/patches/server/0088-Customizable-wither-health-and-healing.patch b/patches/server/0088-Customizable-wither-health-and-healing.patch
index a91f56f2e..9aa0c4d37 100644
--- a/patches/server/0088-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0088-Customizable-wither-health-and-healing.patch
@@ -23,10 +23,10 @@ index 29957114850eb897b54997dcad0753e0c895ce6e..93cf322ea4943fea127dc89eed900a2c
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6b45e9aa4575892005765af9e202c61f50d4b1b6..7eb0e5512a2aa78e7dca727384656781760d57c0 100644
+index 4ffd1263f48a426e5f7a79fd266a0f445975dc2e..6b7602954de34a114893e49e8f93665ba30ed494 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1719,6 +1719,8 @@ public class PurpurWorldConfig {
+@@ -1717,6 +1717,8 @@ public class PurpurWorldConfig {
      public boolean witherControllable = true;
      public double witherMaxY = 320D;
      public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 6b45e9aa4575892005765af9e202c61f50d4b1b6..7eb0e5512a2aa78e7dca727384656781
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1734,6 +1736,8 @@ public class PurpurWorldConfig {
+@@ -1732,6 +1734,8 @@ public class PurpurWorldConfig {
              set("mobs.wither.attributes.max_health", oldValue);
          }
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
diff --git a/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index a981b1550..ab1c0a096 100644
--- a/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -70,10 +70,10 @@ index 52f2d2df03314c8ddf70b240dca82cafa44c6b07..624e4007f031b5781e34f4cb6614e8c7
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ba055361b27c83fd27e5347c26752e8f88d35793..37794c0863bda3d5cc24cc2e4c512d433eb4ef9b 100644
+index 79ba22306cde4e5b6a119cb81d8029d828da7bbe..6950c4f5b1b0fd203c9b7adf92d13a321a8c5af1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {
+@@ -1850,6 +1850,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
@@ -81,7 +81,7 @@ index ba055361b27c83fd27e5347c26752e8f88d35793..37794c0863bda3d5cc24cc2e4c512d43
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
+@@ -1864,6 +1865,7 @@ public class PurpurWorldConfig {
          zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
          zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
diff --git a/patches/server/0094-Flying-squids-Oh-my.patch b/patches/server/0094-Flying-squids-Oh-my.patch
index 01bca2a2b..d5a73b2e0 100644
--- a/patches/server/0094-Flying-squids-Oh-my.patch
+++ b/patches/server/0094-Flying-squids-Oh-my.patch
@@ -58,7 +58,7 @@ index f68c18b6645981126329b58379946308bbb8ccf8..80bdc93cba675d6c1286618f14fc33e0
                  float g = Mth.cos(f) * 0.2F;
                  float h = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 37794c0863bda3d5cc24cc2e4c512d433eb4ef9b..8af34a04370ebb0b62137387c7eb082443f68c5b 100644
+index 6950c4f5b1b0fd203c9b7adf92d13a321a8c5af1..de43787965c6d45d398be47988fba31dc12e7032 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -902,10 +902,12 @@ public class PurpurWorldConfig {
@@ -74,7 +74,7 @@ index 37794c0863bda3d5cc24cc2e4c512d433eb4ef9b..8af34a04370ebb0b62137387c7eb0824
      }
  
      public boolean goatRidable = false;
-@@ -1539,6 +1541,7 @@ public class PurpurWorldConfig {
+@@ -1537,6 +1539,7 @@ public class PurpurWorldConfig {
      public double squidMaxHealth = 10.0D;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index 37794c0863bda3d5cc24cc2e4c512d433eb4ef9b..8af34a04370ebb0b62137387c7eb0824
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1550,6 +1553,7 @@ public class PurpurWorldConfig {
+@@ -1548,6 +1551,7 @@ public class PurpurWorldConfig {
          squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
diff --git a/patches/server/0102-Make-entity-breeding-times-configurable.patch b/patches/server/0102-Make-entity-breeding-times-configurable.patch
index 6c76b2474..787dcc604 100644
--- a/patches/server/0102-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0102-Make-entity-breeding-times-configurable.patch
@@ -140,7 +140,7 @@ index 88e26b2653eac1898f266b7c8f9f6e0fba422a52..fdab9a9ad76a0ad8f83ddbff27809663
                  this.partner.resetLove();
                  worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index f27ca76b153dc33d20dc46a57f1dda4e91e82883..09fc3c6ddf99854d43b6577b4d2d74665f32dfa3 100644
+index c58b3ff4e7e5dba4543a77c2c4d9bad3911fba98..db0170fb22ee8424c29fc0d4f3c93c9eac79611c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -85,6 +85,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -252,7 +252,7 @@ index 106600ad9712d9a4fdf6770e81b40606b2f9b9b2..c25776ef9805f3f4e31ca5b027e65775
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index c24299cb482beaef3e2e860475c66e068fa03eb1..284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288 100644
+index 1d69558cccc6add5f02f1ff070c985bd5ec406c0..df7deec204ebf99afdbfe49f9a113857dcd413c6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -141,6 +141,11 @@ public class Sheep extends Animal implements Shearable {
@@ -522,7 +522,7 @@ index 22788892f7286f3fa6b40059b2bedaf0c6ec5ef3..80f91a11c04763c1c9ed2bd242b88b5a
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c430494292457453ab1 100644
+index 52b9e364056b0b405779965daa634a8b0f1f82e0..bbff889198f33fa8fede86fef7be81236a0a591c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -501,10 +501,12 @@ public class PurpurWorldConfig {
@@ -851,7 +851,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean shulkerRidable = false;
-@@ -1567,11 +1609,13 @@ public class PurpurWorldConfig {
+@@ -1565,11 +1607,13 @@ public class PurpurWorldConfig {
      public boolean snifferRidableInWater = true;
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
@@ -865,7 +865,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean squidRidable = false;
-@@ -1630,6 +1674,7 @@ public class PurpurWorldConfig {
+@@ -1628,6 +1672,7 @@ public class PurpurWorldConfig {
      public boolean striderRidableInWater = false;
      public boolean striderControllable = true;
      public double striderMaxHealth = 20.0D;
@@ -873,7 +873,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1640,6 +1685,7 @@ public class PurpurWorldConfig {
+@@ -1638,6 +1683,7 @@ public class PurpurWorldConfig {
              set("mobs.strider.attributes.max_health", oldValue);
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -881,7 +881,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean tadpoleRidable = false;
-@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
+@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
      public double traderLlamaJumpStrengthMax = 0.5D;
      public double traderLlamaMovementSpeedMin = 0.175D;
      public double traderLlamaMovementSpeedMax = 0.175D;
@@ -889,7 +889,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -1677,6 +1724,7 @@ public class PurpurWorldConfig {
+@@ -1675,6 +1722,7 @@ public class PurpurWorldConfig {
          traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
          traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -897,7 +897,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean tropicalFishRidable = false;
-@@ -1697,6 +1745,7 @@ public class PurpurWorldConfig {
+@@ -1695,6 +1743,7 @@ public class PurpurWorldConfig {
      public boolean turtleRidableInWater = true;
      public boolean turtleControllable = true;
      public double turtleMaxHealth = 30.0D;
@@ -905,7 +905,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig {
+@@ -1705,6 +1754,7 @@ public class PurpurWorldConfig {
              set("mobs.turtle.attributes.max_health", oldValue);
          }
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -913,7 +913,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean vexRidable = false;
-@@ -1734,6 +1784,7 @@ public class PurpurWorldConfig {
+@@ -1732,6 +1782,7 @@ public class PurpurWorldConfig {
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
      public boolean villagerCanBreed = true;
@@ -921,7 +921,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1747,6 +1798,7 @@ public class PurpurWorldConfig {
+@@ -1745,6 +1796,7 @@ public class PurpurWorldConfig {
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -929,7 +929,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      }
  
      public boolean vindicatorRidable = false;
-@@ -1858,6 +1910,7 @@ public class PurpurWorldConfig {
+@@ -1856,6 +1908,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -937,7 +937,7 @@ index 7ebc466f72e61e11e73ab20a98f72d16cea7c077..569a09a73c9d800e78a77c4304942924
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -1868,6 +1921,7 @@ public class PurpurWorldConfig {
+@@ -1866,6 +1919,7 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0109-Snow-Golem-rate-of-fire-config.patch b/patches/server/0109-Snow-Golem-rate-of-fire-config.patch
index ea04237cc..4be5b604d 100644
--- a/patches/server/0109-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0109-Snow-Golem-rate-of-fire-config.patch
@@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index bd9dd01e9140c2ad0ab9859b9a455f73ab04a253..d3da7487f911ff791dca5f7b546dccda751fe44c 100644
+index cf68f12da22cb9b0980c21e90caf4dea62769fa5..6fac5dbbbd9600e82b1dd1496680f551ab44313e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -79,7 +79,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -23,12 +23,12 @@ index bd9dd01e9140c2ad0ab9859b9a455f73ab04a253..d3da7487f911ff791dca5f7b546dccda
          this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 68fa6b3492d9ad309f305560afe6f767c9c56fe0..7687b76b6a468b242835eb035781f6121b9477a8 100644
+index fee388e9ba11e0555ba6e2809b82b29e6f3be5bf..7bcec0062d777134fdc963ed4e8874730df36711 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1607,6 +1607,10 @@ public class PurpurWorldConfig {
+@@ -1606,6 +1606,10 @@ public class PurpurWorldConfig {
+     public boolean snowGolemLeaveTrailWhenRidden = false;
      public double snowGolemMaxHealth = 4.0D;
-     public boolean snowGolemDropsPumpkin = true;
      public boolean snowGolemPutPumpkinBack = false;
 +    public int snowGolemSnowBallMin = 20;
 +    public int snowGolemSnowBallMax = 20;
@@ -37,9 +37,9 @@ index 68fa6b3492d9ad309f305560afe6f767c9c56fe0..7687b76b6a468b242835eb035781f612
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1620,6 +1624,10 @@ public class PurpurWorldConfig {
+@@ -1618,6 +1622,10 @@ public class PurpurWorldConfig {
+         }
          snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-         snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
          snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
 +        snowGolemSnowBallMin = getInt("mobs.snow_golem.min-shoot-interval-ticks", snowGolemSnowBallMin);
 +        snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
diff --git a/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index d63ac52e4..a9d248102 100644
--- a/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -174,10 +174,10 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3
      public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
      public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7687b76b6a468b242835eb035781f6121b9477a8..476a91cb2449072f9c13bb881f2f439172f0e933 100644
+index 7bcec0062d777134fdc963ed4e8874730df36711..743f53357131695b89cb71c0c126f2e53a46c9f1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1810,6 +1810,8 @@ public class PurpurWorldConfig {
+@@ -1808,6 +1808,8 @@ public class PurpurWorldConfig {
      public boolean villagerCanBeLeashed = false;
      public boolean villagerCanBreed = true;
      public int villagerBreedingTicks = 6000;
@@ -186,7 +186,7 @@ index 7687b76b6a468b242835eb035781f6121b9477a8..476a91cb2449072f9c13bb881f2f4391
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1824,6 +1826,8 @@ public class PurpurWorldConfig {
+@@ -1822,6 +1824,8 @@ public class PurpurWorldConfig {
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
          villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
diff --git a/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index 38932b4da..ed1e1f353 100644
--- a/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -35,10 +35,10 @@ index 764477c39e690d6373e17c77687809418e0de884..b2d77117309e81db60e7e50911247793
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 476a91cb2449072f9c13bb881f2f439172f0e933..34a557f50cf5056592208fe0d9f9fb50f4b7e943 100644
+index 743f53357131695b89cb71c0c126f2e53a46c9f1..6f682def96c6783d0ffc9f285fc397de1f6b148f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2056,6 +2056,7 @@ public class PurpurWorldConfig {
+@@ -2054,6 +2054,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 476a91cb2449072f9c13bb881f2f439172f0e933..34a557f50cf5056592208fe0d9f9fb50
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2070,5 +2071,6 @@ public class PurpurWorldConfig {
+@@ -2068,5 +2069,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
diff --git a/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
index ad39dfde8..928ff58d1 100644
--- a/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -221,10 +221,10 @@ index 38b6d2c377800134de592a780b737b45c8096a11..449acd9dc983be1cd51208bc8f8d843d
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 34a557f50cf5056592208fe0d9f9fb50f4b7e943..50863c526d4ea0e171c326b8b989f92cf082fa96 100644
+index 6f682def96c6783d0ffc9f285fc397de1f6b148f..18e4711b000128f4e4ad7b62b73fdc161e6048a7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1939,6 +1939,8 @@ public class PurpurWorldConfig {
+@@ -1937,6 +1937,8 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -233,7 +233,7 @@ index 34a557f50cf5056592208fe0d9f9fb50f4b7e943..50863c526d4ea0e171c326b8b989f92c
      public int wolfBreedingTicks = 6000;
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
-@@ -1950,6 +1952,8 @@ public class PurpurWorldConfig {
+@@ -1948,6 +1950,8 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0114-Configurable-default-collar-color.patch b/patches/server/0114-Configurable-default-collar-color.patch
index e100904a4..c205925ae 100644
--- a/patches/server/0114-Configurable-default-collar-color.patch
+++ b/patches/server/0114-Configurable-default-collar-color.patch
@@ -43,7 +43,7 @@ index 6a822abe936aed83da595980e0f698354a205b0b..bbecb3894d0f4a24442e8833f4d828e6
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 50863c526d4ea0e171c326b8b989f92cf082fa96..9df131e8e3c14aedfafa491b4765dc05f468d01f 100644
+index 18e4711b000128f4e4ad7b62b73fdc161e6048a7..2e17bb7bd1df56a875498ef4f6be1e2b5f2001dc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -621,6 +621,7 @@ public class PurpurWorldConfig {
@@ -66,7 +66,7 @@ index 50863c526d4ea0e171c326b8b989f92cf082fa96..9df131e8e3c14aedfafa491b4765dc05
      }
  
      public boolean caveSpiderRidable = false;
-@@ -1939,6 +1945,7 @@ public class PurpurWorldConfig {
+@@ -1937,6 +1943,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index 50863c526d4ea0e171c326b8b989f92cf082fa96..9df131e8e3c14aedfafa491b4765dc05
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
-@@ -1952,6 +1959,11 @@ public class PurpurWorldConfig {
+@@ -1950,6 +1957,11 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0118-Striders-give-saddle-back.patch b/patches/server/0118-Striders-give-saddle-back.patch
index defd1f5aa..e080aed53 100644
--- a/patches/server/0118-Striders-give-saddle-back.patch
+++ b/patches/server/0118-Striders-give-saddle-back.patch
@@ -29,10 +29,10 @@ index 10136a5062d154456c962e7d1a99c2dedbd568ed..64503362c42daa39dcfa270bc50b0e21
              if (!this.level().isClientSide) {
                  player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ef40f177856981c16c667c202480591ad1334109..810745ee8b2f3dedf50533e31000ed29c2929718 100644
+index 1027887398a348e210830add7b77f99236512256..7cb9381590a24f24099b8ad87f094b1f73f1e624 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1713,6 +1713,7 @@ public class PurpurWorldConfig {
+@@ -1711,6 +1711,7 @@ public class PurpurWorldConfig {
      public boolean striderControllable = true;
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index ef40f177856981c16c667c202480591ad1334109..810745ee8b2f3dedf50533e31000ed29
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1724,6 +1725,7 @@ public class PurpurWorldConfig {
+@@ -1722,6 +1723,7 @@ public class PurpurWorldConfig {
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
diff --git a/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
index 772cfc41f..f769b7774 100644
--- a/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -18,7 +18,7 @@ index b3930bf7f9d93203907d6b39e29dfea06087b8d1..43bbc2f776048f006ad5f7a80e83ae2e
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1f57de58a38946763e5160e59e4157957aadafb1..1cec1afb15755e15f5d59d562cdf8d3281973062 100644
+index e0ab53ad1a5c10a47d07d384f8f5a7abcbc1365d..b9fb6962da54decaed30c2e18cb377b56f41c34a 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -705,7 +705,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -118,7 +118,7 @@ index c25776ef9805f3f4e31ca5b027e6577526e48819..86502ef70f2213191d1348ef98969c5c
                  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index f59fac2fd4e6fe710f6afa622bc86f912986f14a..55c85dbafb2278c8e247492537faec4fd77c9ec6 100644
+index 6fac5dbbbd9600e82b1dd1496680f551ab44313e..fd64a12c7f215f47d366af60882981c2cc0ef04f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -127,7 +127,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -362,7 +362,7 @@ index f579911b06b66e94e6311d970e93cca33fa089c6..2c63579226409a1823d2e8990e7ffc42
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index f5eb45df4f2c9914e1780bb10fb085713c411a4d..44bb9930313cae9d150cc08cbdcced10a35bd07d 100644
+index 3897c7cee2ca0c269852153794aa0e07c5f5e565..189cec37228f88c97e1994c40c44461a3321df8b 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -220,7 +220,7 @@ public class TurtleEggBlock extends Block {
@@ -375,7 +375,7 @@ index f5eb45df4f2c9914e1780bb10fb085713c411a4d..44bb9930313cae9d150cc08cbdcced10
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a77999fb2 100644
+index fb8d380b90338b91c7481b4c3242ab3336e32370..5e0667dbce808de7f81a68347152094036d70ec0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -115,8 +115,11 @@ public class PurpurWorldConfig {
@@ -614,7 +614,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      }
  
      public boolean skeletonRidable = false;
-@@ -1637,6 +1674,7 @@ public class PurpurWorldConfig {
+@@ -1636,6 +1673,7 @@ public class PurpurWorldConfig {
      public int snowGolemSnowBallMax = 20;
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
@@ -622,7 +622,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1654,6 +1692,7 @@ public class PurpurWorldConfig {
+@@ -1652,6 +1690,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -630,7 +630,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      }
  
      public boolean snifferRidable = false;
-@@ -1840,6 +1879,7 @@ public class PurpurWorldConfig {
+@@ -1838,6 +1877,7 @@ public class PurpurWorldConfig {
      public int villagerBreedingTicks = 6000;
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
@@ -638,7 +638,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1856,6 +1896,7 @@ public class PurpurWorldConfig {
+@@ -1854,6 +1894,7 @@ public class PurpurWorldConfig {
          villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -646,7 +646,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      }
  
      public boolean vindicatorRidable = false;
-@@ -1928,6 +1969,7 @@ public class PurpurWorldConfig {
+@@ -1926,6 +1967,7 @@ public class PurpurWorldConfig {
      public double witherMaxHealth = 300.0D;
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
@@ -654,7 +654,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1945,6 +1987,7 @@ public class PurpurWorldConfig {
+@@ -1943,6 +1985,7 @@ public class PurpurWorldConfig {
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -662,7 +662,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -2016,6 +2059,7 @@ public class PurpurWorldConfig {
+@@ -2014,6 +2057,7 @@ public class PurpurWorldConfig {
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -670,7 +670,7 @@ index 88609510c379d0e7d94f3d821f828ed0313a9fe3..1ee8dfb7d6efea66293cfd8059b8a84a
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2031,6 +2075,7 @@ public class PurpurWorldConfig {
+@@ -2029,6 +2073,7 @@ public class PurpurWorldConfig {
          zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
diff --git a/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
index 4d726d82b..8b1b14af6 100644
--- a/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
@@ -174,7 +174,7 @@ index 95ff109511c97d603aeaf9e73c49397a841fcbce..58539d29b8e2a8c0676cc574f64e7d61
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 09fc3c6ddf99854d43b6577b4d2d74665f32dfa3..1e51eee2c4e425c7ac0152b55a1d1376a5a5708e 100644
+index db0170fb22ee8424c29fc0d4f3c93c9eac79611c..7bd539ed5fea0d4db8e97722bd9bd37e6563185d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -90,6 +90,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -318,7 +318,7 @@ index 742805994f29a18af444912b10af631d2c60cacf..e101c3bf425902908c43ffa18867fb83
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0885b47de 100644
+index df7deec204ebf99afdbfe49f9a113857dcd413c6..d1a8b15de4f4aa20d6049135bcbef94f0d1fb388 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -146,6 +146,11 @@ public class Sheep extends Animal implements Shearable {
@@ -334,7 +334,7 @@ index 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 84e0a41620fd52af0cd22dc92fd13ee4efd206fb..a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d 100644
+index fd64a12c7f215f47d366af60882981c2cc0ef04f..61943dc8238190072dbdce1e1aff1d7932c87da6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -116,7 +116,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -555,7 +555,7 @@ index aaec706b7eaa6afdf7959e6dd53cc39344bb97df..dcc1d71c2eeea48669651165868899ba
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 5381ee91770a0f1012b5478d6615540263e46533..5643f35f02fff5a2d4072d246f8646772695b797 100644
+index f5dfcf2aefebf9faabd962d6f331de88ae26eb26..df8baf2059cdfed3f0c43496fba843b8b6819281 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -191,6 +191,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -571,7 +571,7 @@ index 5381ee91770a0f1012b5478d6615540263e46533..5643f35f02fff5a2d4072d246f864677
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index bd4658651ba8bccdc5b8a7d59e70e527942615dd..aea64f97be2430e92cb45d43e1b50c0e32eebdf9 100644
+index 5e61463f5d25b42165813df43c30246dff8a4a7e..73930b4eea2bd632c390b79118ecafad84cfa44a 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -117,6 +117,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -871,7 +871,7 @@ index 5aa00878c4c7be4a38137a93b1a2cf1c468422ea..0992e3729fdfa945660affb7eb7efcff
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 5bdeac3ed1bbc70d0620a548f03792e5df212629..ea09f65e89b2c683c1549146948ff4f5b5073500 100644
+index 9efda5d6cf9a235b5039ed622e917124aae7be82..bc8e86f9e1703709f3d4bc160f4c3e1cfbc1f066 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -119,6 +119,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1197,7 +1197,7 @@ index ad7a32169b0decad1d3a2bd98e25b07731a33d03..5a373ba4d9e404c064bc158718d02c0c
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d76fd285e9 100644
+index cd4a14bd5d13b41d02ad68ddf31fd3648f933850..bab1a72f8a165ba9df57187296f242287d57f300 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -568,11 +568,13 @@ public class PurpurWorldConfig {
@@ -2011,7 +2011,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean snowGolemRidable = false;
-@@ -1693,6 +1797,7 @@ public class PurpurWorldConfig {
+@@ -1692,6 +1796,7 @@ public class PurpurWorldConfig {
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
@@ -2019,7 +2019,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1711,6 +1816,7 @@ public class PurpurWorldConfig {
+@@ -1709,6 +1814,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
          snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -2027,7 +2027,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean snifferRidable = false;
-@@ -1732,6 +1838,7 @@ public class PurpurWorldConfig {
+@@ -1730,6 +1836,7 @@ public class PurpurWorldConfig {
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
      public boolean squidsCanFly = false;
@@ -2035,7 +2035,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1744,12 +1851,14 @@ public class PurpurWorldConfig {
+@@ -1742,12 +1849,14 @@ public class PurpurWorldConfig {
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
          squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
@@ -2050,7 +2050,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void spiderSettings() {
          spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
          spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
-@@ -1760,12 +1869,14 @@ public class PurpurWorldConfig {
+@@ -1758,12 +1867,14 @@ public class PurpurWorldConfig {
              set("mobs.spider.attributes.max_health", oldValue);
          }
          spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2065,7 +2065,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void straySettings() {
          strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
          strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
-@@ -1776,6 +1887,7 @@ public class PurpurWorldConfig {
+@@ -1774,6 +1885,7 @@ public class PurpurWorldConfig {
              set("mobs.stray.attributes.max_health", oldValue);
          }
          strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2073,7 +2073,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean striderRidable = false;
-@@ -1784,6 +1896,7 @@ public class PurpurWorldConfig {
+@@ -1782,6 +1894,7 @@ public class PurpurWorldConfig {
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
@@ -2081,7 +2081,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1796,6 +1909,7 @@ public class PurpurWorldConfig {
+@@ -1794,6 +1907,7 @@ public class PurpurWorldConfig {
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
          striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
@@ -2089,7 +2089,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean tadpoleRidable = false;
-@@ -1817,6 +1931,7 @@ public class PurpurWorldConfig {
+@@ -1815,6 +1929,7 @@ public class PurpurWorldConfig {
      public double traderLlamaMovementSpeedMin = 0.175D;
      public double traderLlamaMovementSpeedMax = 0.175D;
      public int traderLlamaBreedingTicks = 6000;
@@ -2097,7 +2097,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -1835,11 +1950,13 @@ public class PurpurWorldConfig {
+@@ -1833,11 +1948,13 @@ public class PurpurWorldConfig {
          traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
          traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
@@ -2111,7 +2111,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void tropicalFishSettings() {
          tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
          tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
-@@ -1849,6 +1966,7 @@ public class PurpurWorldConfig {
+@@ -1847,6 +1964,7 @@ public class PurpurWorldConfig {
              set("mobs.tropical_fish.attributes.max_health", oldValue);
          }
          tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
@@ -2119,7 +2119,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean turtleRidable = false;
-@@ -1856,6 +1974,7 @@ public class PurpurWorldConfig {
+@@ -1854,6 +1972,7 @@ public class PurpurWorldConfig {
      public boolean turtleControllable = true;
      public double turtleMaxHealth = 30.0D;
      public int turtleBreedingTicks = 6000;
@@ -2127,7 +2127,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -1867,6 +1986,7 @@ public class PurpurWorldConfig {
+@@ -1865,6 +1984,7 @@ public class PurpurWorldConfig {
          }
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
          turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2135,7 +2135,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean vexRidable = false;
-@@ -1874,6 +1994,7 @@ public class PurpurWorldConfig {
+@@ -1872,6 +1992,7 @@ public class PurpurWorldConfig {
      public boolean vexControllable = true;
      public double vexMaxY = 320D;
      public double vexMaxHealth = 14.0D;
@@ -2143,7 +2143,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void vexSettings() {
          vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
          vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
-@@ -1885,6 +2006,7 @@ public class PurpurWorldConfig {
+@@ -1883,6 +2004,7 @@ public class PurpurWorldConfig {
              set("mobs.vex.attributes.max_health", oldValue);
          }
          vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2151,7 +2151,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean villagerRidable = false;
-@@ -1898,6 +2020,7 @@ public class PurpurWorldConfig {
+@@ -1896,6 +2018,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
@@ -2159,7 +2159,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1915,6 +2038,7 @@ public class PurpurWorldConfig {
+@@ -1913,6 +2036,7 @@ public class PurpurWorldConfig {
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -2167,7 +2167,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean vindicatorRidable = false;
-@@ -1922,6 +2046,7 @@ public class PurpurWorldConfig {
+@@ -1920,6 +2044,7 @@ public class PurpurWorldConfig {
      public boolean vindicatorControllable = true;
      public double vindicatorMaxHealth = 24.0D;
      public double vindicatorJohnnySpawnChance = 0D;
@@ -2175,7 +2175,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -1933,6 +2058,7 @@ public class PurpurWorldConfig {
+@@ -1931,6 +2056,7 @@ public class PurpurWorldConfig {
          }
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
          vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2183,7 +2183,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean wanderingTraderRidable = false;
-@@ -1941,6 +2067,7 @@ public class PurpurWorldConfig {
+@@ -1939,6 +2065,7 @@ public class PurpurWorldConfig {
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
@@ -2191,7 +2191,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1953,6 +2080,7 @@ public class PurpurWorldConfig {
+@@ -1951,6 +2078,7 @@ public class PurpurWorldConfig {
          wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
@@ -2199,7 +2199,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean wardenRidable = false;
-@@ -1968,6 +2096,7 @@ public class PurpurWorldConfig {
+@@ -1966,6 +2094,7 @@ public class PurpurWorldConfig {
      public boolean witchRidableInWater = true;
      public boolean witchControllable = true;
      public double witchMaxHealth = 26.0D;
@@ -2207,7 +2207,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void witchSettings() {
          witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
          witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
-@@ -1978,6 +2107,7 @@ public class PurpurWorldConfig {
+@@ -1976,6 +2105,7 @@ public class PurpurWorldConfig {
              set("mobs.witch.attributes.max_health", oldValue);
          }
          witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2215,7 +2215,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean witherRidable = false;
-@@ -1988,6 +2118,7 @@ public class PurpurWorldConfig {
+@@ -1986,6 +2116,7 @@ public class PurpurWorldConfig {
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
@@ -2223,7 +2223,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2006,12 +2137,14 @@ public class PurpurWorldConfig {
+@@ -2004,12 +2135,14 @@ public class PurpurWorldConfig {
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
@@ -2238,7 +2238,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void witherSkeletonSettings() {
          witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
          witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
-@@ -2022,6 +2155,7 @@ public class PurpurWorldConfig {
+@@ -2020,6 +2153,7 @@ public class PurpurWorldConfig {
              set("mobs.wither_skeleton.attributes.max_health", oldValue);
          }
          witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2246,7 +2246,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean wolfRidable = false;
-@@ -2032,6 +2166,7 @@ public class PurpurWorldConfig {
+@@ -2030,6 +2164,7 @@ public class PurpurWorldConfig {
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
@@ -2254,7 +2254,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -2050,12 +2185,14 @@ public class PurpurWorldConfig {
+@@ -2048,12 +2183,14 @@ public class PurpurWorldConfig {
          wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
          wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
          wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2269,7 +2269,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void zoglinSettings() {
          zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
          zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
-@@ -2066,6 +2203,7 @@ public class PurpurWorldConfig {
+@@ -2064,6 +2201,7 @@ public class PurpurWorldConfig {
              set("mobs.zoglin.attributes.max_health", oldValue);
          }
          zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2277,7 +2277,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean zombieRidable = false;
-@@ -2078,6 +2216,7 @@ public class PurpurWorldConfig {
+@@ -2076,6 +2214,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public boolean zombieBypassMobGriefing = false;
@@ -2285,7 +2285,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2094,6 +2233,7 @@ public class PurpurWorldConfig {
+@@ -2092,6 +2231,7 @@ public class PurpurWorldConfig {
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
@@ -2293,7 +2293,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean zombieHorseRidable = false;
-@@ -2106,6 +2246,7 @@ public class PurpurWorldConfig {
+@@ -2104,6 +2244,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMin = 0.2D;
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
@@ -2301,7 +2301,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void zombieHorseSettings() {
          zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-@@ -2123,6 +2264,7 @@ public class PurpurWorldConfig {
+@@ -2121,6 +2262,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2309,7 +2309,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -2133,6 +2275,7 @@ public class PurpurWorldConfig {
+@@ -2131,6 +2273,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2317,7 +2317,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2147,6 +2290,7 @@ public class PurpurWorldConfig {
+@@ -2145,6 +2288,7 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2325,7 +2325,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2158,6 +2302,7 @@ public class PurpurWorldConfig {
+@@ -2156,6 +2300,7 @@ public class PurpurWorldConfig {
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2333,7 +2333,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2173,5 +2318,6 @@ public class PurpurWorldConfig {
+@@ -2171,5 +2316,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
diff --git a/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index c974974f4..4d3cb9f85 100644
--- a/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -29,7 +29,7 @@ index 73930b4eea2bd632c390b79118ecafad84cfa44a..ac7e54e2bfc1ca41fd8082c453c1f99f
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f7ca9e256524e1b080631d7cda5ed80edeeaf73b..1af0f19760426f108d32d202b087323d0ef60845 100644
+index 4d7d111a2cb6f02d3263174af9e70548be0fe971..ecfbfc843b534196ff19c2e45989f0271f9e8105 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -947,6 +947,7 @@ public class PurpurWorldConfig {
@@ -48,7 +48,7 @@ index f7ca9e256524e1b080631d7cda5ed80edeeaf73b..1af0f19760426f108d32d202b087323d
      }
  
      public boolean endermanRidable = false;
-@@ -2158,6 +2160,7 @@ public class PurpurWorldConfig {
+@@ -2156,6 +2158,7 @@ public class PurpurWorldConfig {
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
      public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index f7ca9e256524e1b080631d7cda5ed80edeeaf73b..1af0f19760426f108d32d202b087323d
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2177,6 +2180,7 @@ public class PurpurWorldConfig {
+@@ -2175,6 +2178,7 @@ public class PurpurWorldConfig {
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
diff --git a/patches/server/0145-Add-config-for-villager-trading.patch b/patches/server/0145-Add-config-for-villager-trading.patch
index d7ea956de..db92e587c 100644
--- a/patches/server/0145-Add-config-for-villager-trading.patch
+++ b/patches/server/0145-Add-config-for-villager-trading.patch
@@ -31,10 +31,10 @@ index 5a373ba4d9e404c064bc158718d02c0cd2aca548..d672c1e381e5c4a4b79a1dfb96f1410e
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bed3d00422b914c99c3e598a392543e84f58df61..fce3d4c4af444860c72b5058fcd7276838299f89 100644
+index e51a38ca916e91255c46b864e45428a364e59539..9aa6a3f69afb0fd70ac60ca0d50d564dd7d3fe54 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2125,6 +2125,7 @@ public class PurpurWorldConfig {
+@@ -2123,6 +2123,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
      public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index bed3d00422b914c99c3e598a392543e84f58df61..fce3d4c4af444860c72b5058fcd72768
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2143,6 +2144,7 @@ public class PurpurWorldConfig {
+@@ -2141,6 +2142,7 @@ public class PurpurWorldConfig {
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -50,7 +50,7 @@ index bed3d00422b914c99c3e598a392543e84f58df61..fce3d4c4af444860c72b5058fcd72768
      }
  
      public boolean vindicatorRidable = false;
-@@ -2172,6 +2174,7 @@ public class PurpurWorldConfig {
+@@ -2170,6 +2172,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
      public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index bed3d00422b914c99c3e598a392543e84f58df61..fce3d4c4af444860c72b5058fcd72768
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -2185,6 +2188,7 @@ public class PurpurWorldConfig {
+@@ -2183,6 +2186,7 @@ public class PurpurWorldConfig {
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
          wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
diff --git a/patches/server/0158-Config-for-wither-explosion-radius.patch b/patches/server/0158-Config-for-wither-explosion-radius.patch
index daf8166a4..485fd260c 100644
--- a/patches/server/0158-Config-for-wither-explosion-radius.patch
+++ b/patches/server/0158-Config-for-wither-explosion-radius.patch
@@ -18,10 +18,10 @@ index d57ef27df0a3597416564f8723b4b986413ad314..aa5ce9625bf23885a55521cbb4d994b6
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 18143874afd0fb7b6fdc7f1471368bced0dc39d5..fa3d2dbea60d7d40e30d7c8205c97f3a44b6f948 100644
+index 960dfb5f343bc0c1dcd17271594e33471a191b83..cd1fd91c9b0c1e4627f918d97338c1e87bcc0601 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2292,6 +2292,7 @@ public class PurpurWorldConfig {
+@@ -2290,6 +2290,7 @@ public class PurpurWorldConfig {
      public boolean witherBypassMobGriefing = false;
      public boolean witherTakeDamageFromWater = false;
      public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 18143874afd0fb7b6fdc7f1471368bced0dc39d5..fa3d2dbea60d7d40e30d7c8205c97f3a
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2312,6 +2313,7 @@ public class PurpurWorldConfig {
+@@ -2310,6 +2311,7 @@ public class PurpurWorldConfig {
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
diff --git a/patches/server/0185-Configurable-hunger-starvation-damage.patch b/patches/server/0185-Configurable-hunger-starvation-damage.patch
index 3bc9e501b..46a7e9e03 100644
--- a/patches/server/0185-Configurable-hunger-starvation-damage.patch
+++ b/patches/server/0185-Configurable-hunger-starvation-damage.patch
@@ -18,10 +18,10 @@ index 2840c0b16d9b8147703f34bac5a8aa21f82e6e44..e8079d126e6c0cf0b15c01afb6498922
  
                  this.tickTimer = 0;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d9409fa6d82b6f512e8b482f319b139489675828..97295817c15bfaab80241ae89134bde1bb129462 100644
+index cce6cbf83e1d57c609ea5575553e2cef5a526bf9..e308af8e5dbb066b1976b341cc8362aa7b546964 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2578,4 +2578,9 @@ public class PurpurWorldConfig {
+@@ -2576,4 +2576,9 @@ public class PurpurWorldConfig {
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
      }
diff --git a/patches/server/0199-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0199-Customizeable-Zombie-Villager-curing-times.patch
index 9d5d75ac1..580e19406 100644
--- a/patches/server/0199-Customizeable-Zombie-Villager-curing-times.patch
+++ b/patches/server/0199-Customizeable-Zombie-Villager-curing-times.patch
@@ -18,10 +18,10 @@ index 135ce8822ed7e3d6182755deca37a2c0531960c6..6a85de8af9b260e92b4ccffa2ae3503c
  
                  return InteractionResult.SUCCESS;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a56818870503b2694d9e4dd232b91e1c6a54333f..1e2860c910db8b2b6a73a67d040528df2c44f5f5 100644
+index a3d20bb3cddeebc7237cf7b7796f37cd2008a4dd..318cbbaf38831008a74d2f7e951db5b67fce55b7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2839,6 +2839,8 @@ public class PurpurWorldConfig {
+@@ -2837,6 +2837,8 @@ public class PurpurWorldConfig {
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
      public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index a56818870503b2694d9e4dd232b91e1c6a54333f..1e2860c910db8b2b6a73a67d040528df
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2854,6 +2856,8 @@ public class PurpurWorldConfig {
+@@ -2852,6 +2854,8 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
diff --git a/patches/server/0201-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0201-Toggle-for-Wither-s-spawn-sound.patch
index da430330d..3751ca82e 100644
--- a/patches/server/0201-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0201-Toggle-for-Wither-s-spawn-sound.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for Wither's spawn sound
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 2447d89f1219736bda0ee80bb5dcf11cc61f5863..dd5552f87ec78c3b16aebe0767e124c368aa8c24 100644
+index b449a7f16bfe591d0659e991c2c1c9ed4ec64dc8..d50b8c407ed30c0bb46159994c1b0e310a15e33a 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -425,7 +425,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -18,10 +18,10 @@ index 2447d89f1219736bda0ee80bb5dcf11cc61f5863..dd5552f87ec78c3b16aebe0767e124c3
                      // this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
                      int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5cbbc7e818ed2e82a2ab17d7f3be35f2fe8c3c21..b7e145289e241c0d2e02d90eafe3f2039be794c5 100644
+index 355e953d2050750aef6b243a5b287a4ab75818be..5d4aa302fca63909f6cee2fea4182da17b270201 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2684,6 +2684,7 @@ public class PurpurWorldConfig {
+@@ -2682,6 +2682,7 @@ public class PurpurWorldConfig {
      public boolean witherTakeDamageFromWater = false;
      public boolean witherCanRideVehicles = false;
      public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 5cbbc7e818ed2e82a2ab17d7f3be35f2fe8c3c21..b7e145289e241c0d2e02d90eafe3f203
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2705,6 +2706,7 @@ public class PurpurWorldConfig {
+@@ -2703,6 +2704,7 @@ public class PurpurWorldConfig {
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
          witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
diff --git a/patches/server/0204-Conduit-behavior-configuration.patch b/patches/server/0204-Conduit-behavior-configuration.patch
index e80543009..bcb1b56cf 100644
--- a/patches/server/0204-Conduit-behavior-configuration.patch
+++ b/patches/server/0204-Conduit-behavior-configuration.patch
@@ -77,10 +77,10 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
          });
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3deab8fff2c67fdc47db8c739a29173d65b13bbf..3252984ac8bf8849f99f40182e8cb24a01ffe7f1 100644
+index 52363f3ee615bbb86ea54a72d5c0274c7699c9dd..3302b7f88ba82620e09ec900b7409267ea55c7b4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2905,4 +2905,27 @@ public class PurpurWorldConfig {
+@@ -2903,4 +2903,27 @@ public class PurpurWorldConfig {
      private void hungerSettings() {
          hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
      }
diff --git a/patches/server/0205-Cauldron-fill-chances.patch b/patches/server/0205-Cauldron-fill-chances.patch
index 0263f152c..64e23346c 100644
--- a/patches/server/0205-Cauldron-fill-chances.patch
+++ b/patches/server/0205-Cauldron-fill-chances.patch
@@ -47,10 +47,10 @@ index bd22d3fdecbc992b11073a74d854b7d1b43c3f6a..0a3b97f18abcc9b385c9efd5a30f3e2c
  
                      if (dripChance < f1) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3252984ac8bf8849f99f40182e8cb24a01ffe7f1..2f5662582492573aef4efee54def5921be7351ea 100644
+index 3302b7f88ba82620e09ec900b7409267ea55c7b4..8e350ec9aa87920537ead51856a9a9ff2f3c47ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2928,4 +2928,15 @@ public class PurpurWorldConfig {
+@@ -2926,4 +2926,15 @@ public class PurpurWorldConfig {
          });
          conduitBlocks = conduitBlockList.toArray(Block[]::new);
      }
diff --git a/patches/server/0221-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0221-Add-option-to-disable-zombie-villagers-cure.patch
index 3b902880d..e5279b764 100644
--- a/patches/server/0221-Add-option-to-disable-zombie-villagers-cure.patch
+++ b/patches/server/0221-Add-option-to-disable-zombie-villagers-cure.patch
@@ -18,10 +18,10 @@ index 6a85de8af9b260e92b4ccffa2ae3503cd29b0b98..faf03e2c69b6b4ee7d7425322b5b1997
                      itemstack.shrink(1);
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index aa8f7692a2638b176e9db935bf1331ee09fc9993..ca922a1805810dab8a225c30f9bc93c7e5347ad2 100644
+index ac8dcd839c1f002c02d2cdb324ec2f44794e3001..bcfe67362f5bd58b071dd96c0fc6804a22184fcd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2905,6 +2905,7 @@ public class PurpurWorldConfig {
+@@ -2903,6 +2903,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerTakeDamageFromWater = false;
      public int zombieVillagerCuringTimeMin = 3600;
      public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index aa8f7692a2638b176e9db935bf1331ee09fc9993..ca922a1805810dab8a225c30f9bc93c7
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2922,6 +2923,7 @@ public class PurpurWorldConfig {
+@@ -2920,6 +2921,7 @@ public class PurpurWorldConfig {
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
          zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
diff --git a/patches/server/0225-Mobs-always-drop-experience.patch b/patches/server/0225-Mobs-always-drop-experience.patch
index 5f9328cf5..ec435109c 100644
--- a/patches/server/0225-Mobs-always-drop-experience.patch
+++ b/patches/server/0225-Mobs-always-drop-experience.patch
@@ -165,7 +165,7 @@ index c2817324ff57860ea2628dc4ac8e78b76cf67a5a..64aba511e615983988cdb6a0fd45b7d9
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 1e51eee2c4e425c7ac0152b55a1d1376a5a5708e..c49d25eae4b9d2cdd15022b32947a94364ea2791 100644
+index 7bd539ed5fea0d4db8e97722bd9bd37e6563185d..5d75e715a2edac73350cd74e2a5184e7fccbad53 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -95,6 +95,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -309,7 +309,7 @@ index e101c3bf425902908c43ffa18867fb83a5e1f16e..382e47f26ee94506cb76463a677351b9
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e0a53c211 100644
+index d1a8b15de4f4aa20d6049135bcbef94f0d1fb388..ae2662a5cdc4e531e09876ff8664eaf66a63a960 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -151,6 +151,11 @@ public class Sheep extends Animal implements Shearable {
@@ -325,7 +325,7 @@ index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 20f2fd0edf290d448d06e4772b5947fc7865c20b..fc8526af7e1df15794b4560b58e7f6a47508aa08 100644
+index 557141d5cf85ef4b23d449fb32c28c25a4a96a33..c11ae706f85119d8dd5ac48e6fd585540779814c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -86,6 +86,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -549,7 +549,7 @@ index dcc1d71c2eeea48669651165868899ba4a797d48..813501e8aac1c121569cb996b47f0293
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index dd5552f87ec78c3b16aebe0767e124c368aa8c24..939f003dd488fe7e6c63db38fddebfb6b5cc0f38 100644
+index d50b8c407ed30c0bb46159994c1b0e310a15e33a..63bddd92fe13c50160acab33016c5b62257ad704 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -132,6 +132,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -837,7 +837,7 @@ index 5e717433ef29d02669ee2e95454c69c36cbafc24..c9c21c87e3bd1c404fbef6768761bcb5
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 47abc81aa04774abeb97c912cd118bbab3b51e86..22669a188c1961783341b22551325e19aaeb8088 100644
+index f7780da77a98b04b570d4c01e2b738dffeeb9415..8a52c1ad5e2872e4b484eebc834fa42fd1930481 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -141,6 +141,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1157,7 +1157,7 @@ index d672c1e381e5c4a4b79a1dfb96f1410ec35cb1b5..08320248a6956d41d60681e3d29f8176
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb5b993dc1 100644
+index ed4c29795aae72d16e26d126888944204cae0291..108554529587f6e7ba56d1eabff8f061a74cc1b0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1109,12 +1109,14 @@ public class PurpurWorldConfig {
@@ -1969,7 +1969,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean snowGolemRidable = false;
-@@ -2422,6 +2524,7 @@ public class PurpurWorldConfig {
+@@ -2421,6 +2523,7 @@ public class PurpurWorldConfig {
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
      public boolean snowGolemTakeDamageFromWater = true;
@@ -1977,7 +1977,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -2441,6 +2544,7 @@ public class PurpurWorldConfig {
+@@ -2439,6 +2542,7 @@ public class PurpurWorldConfig {
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
          snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
          snowGolemTakeDamageFromWater = getBoolean("mobs.snow_golem.takes-damage-from-water", snowGolemTakeDamageFromWater);
@@ -1985,7 +1985,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean snifferRidable = false;
-@@ -2463,6 +2567,7 @@ public class PurpurWorldConfig {
+@@ -2461,6 +2565,7 @@ public class PurpurWorldConfig {
      public double squidOffsetWaterCheck = 0.0D;
      public boolean squidsCanFly = false;
      public boolean squidTakeDamageFromWater = false;
@@ -1993,7 +1993,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -2476,6 +2581,7 @@ public class PurpurWorldConfig {
+@@ -2474,6 +2579,7 @@ public class PurpurWorldConfig {
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
          squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
          squidTakeDamageFromWater = getBoolean("mobs.squid.takes-damage-from-water", squidTakeDamageFromWater);
@@ -2001,7 +2001,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean spiderRidable = false;
-@@ -2483,6 +2589,7 @@ public class PurpurWorldConfig {
+@@ -2481,6 +2587,7 @@ public class PurpurWorldConfig {
      public boolean spiderControllable = true;
      public double spiderMaxHealth = 16.0D;
      public boolean spiderTakeDamageFromWater = false;
@@ -2009,7 +2009,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void spiderSettings() {
          spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
          spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
-@@ -2494,6 +2601,7 @@ public class PurpurWorldConfig {
+@@ -2492,6 +2599,7 @@ public class PurpurWorldConfig {
          }
          spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
          spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
@@ -2017,7 +2017,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean strayRidable = false;
-@@ -2501,6 +2609,7 @@ public class PurpurWorldConfig {
+@@ -2499,6 +2607,7 @@ public class PurpurWorldConfig {
      public boolean strayControllable = true;
      public double strayMaxHealth = 20.0D;
      public boolean strayTakeDamageFromWater = false;
@@ -2025,7 +2025,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void straySettings() {
          strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
          strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
-@@ -2512,6 +2621,7 @@ public class PurpurWorldConfig {
+@@ -2510,6 +2619,7 @@ public class PurpurWorldConfig {
          }
          strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
          strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater);
@@ -2033,7 +2033,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean striderRidable = false;
-@@ -2521,6 +2631,7 @@ public class PurpurWorldConfig {
+@@ -2519,6 +2629,7 @@ public class PurpurWorldConfig {
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
      public boolean striderTakeDamageFromWater = true;
@@ -2041,7 +2041,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -2534,6 +2645,7 @@ public class PurpurWorldConfig {
+@@ -2532,6 +2643,7 @@ public class PurpurWorldConfig {
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
          striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
          striderTakeDamageFromWater = getBoolean("mobs.strider.takes-damage-from-water", striderTakeDamageFromWater);
@@ -2049,7 +2049,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean tadpoleRidable = false;
-@@ -2556,6 +2668,7 @@ public class PurpurWorldConfig {
+@@ -2554,6 +2666,7 @@ public class PurpurWorldConfig {
      public double traderLlamaMovementSpeedMax = 0.175D;
      public int traderLlamaBreedingTicks = 6000;
      public boolean traderLlamaTakeDamageFromWater = false;
@@ -2057,7 +2057,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -2575,12 +2688,14 @@ public class PurpurWorldConfig {
+@@ -2573,12 +2686,14 @@ public class PurpurWorldConfig {
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
          traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
          traderLlamaTakeDamageFromWater = getBoolean("mobs.trader_llama.takes-damage-from-water", traderLlamaTakeDamageFromWater);
@@ -2072,7 +2072,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void tropicalFishSettings() {
          tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
          tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
-@@ -2591,6 +2706,7 @@ public class PurpurWorldConfig {
+@@ -2589,6 +2704,7 @@ public class PurpurWorldConfig {
          }
          tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
          tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
@@ -2080,7 +2080,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean turtleRidable = false;
-@@ -2599,6 +2715,7 @@ public class PurpurWorldConfig {
+@@ -2597,6 +2713,7 @@ public class PurpurWorldConfig {
      public double turtleMaxHealth = 30.0D;
      public int turtleBreedingTicks = 6000;
      public boolean turtleTakeDamageFromWater = false;
@@ -2088,7 +2088,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -2611,6 +2728,7 @@ public class PurpurWorldConfig {
+@@ -2609,6 +2726,7 @@ public class PurpurWorldConfig {
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
          turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
          turtleTakeDamageFromWater = getBoolean("mobs.turtle.takes-damage-from-water", turtleTakeDamageFromWater);
@@ -2096,7 +2096,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean vexRidable = false;
-@@ -2619,6 +2737,7 @@ public class PurpurWorldConfig {
+@@ -2617,6 +2735,7 @@ public class PurpurWorldConfig {
      public double vexMaxY = 320D;
      public double vexMaxHealth = 14.0D;
      public boolean vexTakeDamageFromWater = false;
@@ -2104,7 +2104,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void vexSettings() {
          vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
          vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
-@@ -2631,6 +2750,7 @@ public class PurpurWorldConfig {
+@@ -2629,6 +2748,7 @@ public class PurpurWorldConfig {
          }
          vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
          vexTakeDamageFromWater = getBoolean("mobs.vex.takes-damage-from-water", vexTakeDamageFromWater);
@@ -2112,7 +2112,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean villagerRidable = false;
-@@ -2646,6 +2766,7 @@ public class PurpurWorldConfig {
+@@ -2644,6 +2764,7 @@ public class PurpurWorldConfig {
      public boolean villagerBypassMobGriefing = false;
      public boolean villagerTakeDamageFromWater = false;
      public boolean villagerAllowTrading = true;
@@ -2120,7 +2120,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2665,6 +2786,7 @@ public class PurpurWorldConfig {
+@@ -2663,6 +2784,7 @@ public class PurpurWorldConfig {
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
@@ -2128,7 +2128,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean vindicatorRidable = false;
-@@ -2673,6 +2795,7 @@ public class PurpurWorldConfig {
+@@ -2671,6 +2793,7 @@ public class PurpurWorldConfig {
      public double vindicatorMaxHealth = 24.0D;
      public double vindicatorJohnnySpawnChance = 0D;
      public boolean vindicatorTakeDamageFromWater = false;
@@ -2136,7 +2136,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -2685,6 +2808,7 @@ public class PurpurWorldConfig {
+@@ -2683,6 +2806,7 @@ public class PurpurWorldConfig {
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
          vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
          vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater);
@@ -2144,7 +2144,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean wanderingTraderRidable = false;
-@@ -2695,6 +2819,7 @@ public class PurpurWorldConfig {
+@@ -2693,6 +2817,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderCanBeLeashed = false;
      public boolean wanderingTraderTakeDamageFromWater = false;
      public boolean wanderingTraderAllowTrading = true;
@@ -2152,7 +2152,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -2709,6 +2834,7 @@ public class PurpurWorldConfig {
+@@ -2707,6 +2832,7 @@ public class PurpurWorldConfig {
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
          wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
          wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading);
@@ -2160,7 +2160,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean wardenRidable = false;
-@@ -2725,6 +2851,7 @@ public class PurpurWorldConfig {
+@@ -2723,6 +2849,7 @@ public class PurpurWorldConfig {
      public boolean witchControllable = true;
      public double witchMaxHealth = 26.0D;
      public boolean witchTakeDamageFromWater = false;
@@ -2168,7 +2168,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void witchSettings() {
          witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
          witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
-@@ -2736,6 +2863,7 @@ public class PurpurWorldConfig {
+@@ -2734,6 +2861,7 @@ public class PurpurWorldConfig {
          }
          witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
          witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater);
@@ -2176,7 +2176,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean witherRidable = false;
-@@ -2750,6 +2878,7 @@ public class PurpurWorldConfig {
+@@ -2748,6 +2876,7 @@ public class PurpurWorldConfig {
      public boolean witherCanRideVehicles = false;
      public float witherExplosionRadius = 1.0F;
      public boolean witherPlaySpawnSound = true;
@@ -2184,7 +2184,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2772,6 +2901,7 @@ public class PurpurWorldConfig {
+@@ -2770,6 +2899,7 @@ public class PurpurWorldConfig {
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
          witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
          witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound);
@@ -2192,7 +2192,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -2779,6 +2909,7 @@ public class PurpurWorldConfig {
+@@ -2777,6 +2907,7 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonControllable = true;
      public double witherSkeletonMaxHealth = 20.0D;
      public boolean witherSkeletonTakeDamageFromWater = false;
@@ -2200,7 +2200,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void witherSkeletonSettings() {
          witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
          witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
-@@ -2790,6 +2921,7 @@ public class PurpurWorldConfig {
+@@ -2788,6 +2919,7 @@ public class PurpurWorldConfig {
          }
          witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
          witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater);
@@ -2208,7 +2208,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean wolfRidable = false;
-@@ -2801,6 +2933,7 @@ public class PurpurWorldConfig {
+@@ -2799,6 +2931,7 @@ public class PurpurWorldConfig {
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
      public boolean wolfTakeDamageFromWater = false;
@@ -2216,7 +2216,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -2820,6 +2953,7 @@ public class PurpurWorldConfig {
+@@ -2818,6 +2951,7 @@ public class PurpurWorldConfig {
          wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
          wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
          wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater);
@@ -2224,7 +2224,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean zoglinRidable = false;
-@@ -2827,6 +2961,7 @@ public class PurpurWorldConfig {
+@@ -2825,6 +2959,7 @@ public class PurpurWorldConfig {
      public boolean zoglinControllable = true;
      public double zoglinMaxHealth = 40.0D;
      public boolean zoglinTakeDamageFromWater = false;
@@ -2232,7 +2232,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void zoglinSettings() {
          zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
          zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
-@@ -2838,6 +2973,7 @@ public class PurpurWorldConfig {
+@@ -2836,6 +2971,7 @@ public class PurpurWorldConfig {
          }
          zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
          zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater);
@@ -2240,7 +2240,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean zombieRidable = false;
-@@ -2851,6 +2987,7 @@ public class PurpurWorldConfig {
+@@ -2849,6 +2985,7 @@ public class PurpurWorldConfig {
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public boolean zombieBypassMobGriefing = false;
      public boolean zombieTakeDamageFromWater = false;
@@ -2248,7 +2248,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2868,6 +3005,7 @@ public class PurpurWorldConfig {
+@@ -2866,6 +3003,7 @@ public class PurpurWorldConfig {
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
          zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
@@ -2256,7 +2256,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean zombieHorseRidable = false;
-@@ -2881,6 +3019,7 @@ public class PurpurWorldConfig {
+@@ -2879,6 +3017,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
      public boolean zombieHorseTakeDamageFromWater = false;
@@ -2264,7 +2264,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void zombieHorseSettings() {
          zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-@@ -2899,6 +3038,7 @@ public class PurpurWorldConfig {
+@@ -2897,6 +3036,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
          zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater);
@@ -2272,7 +2272,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -2913,6 +3053,7 @@ public class PurpurWorldConfig {
+@@ -2911,6 +3051,7 @@ public class PurpurWorldConfig {
      public int zombieVillagerCuringTimeMin = 3600;
      public int zombieVillagerCuringTimeMax = 6000;
      public boolean zombieVillagerCureEnabled = true;
@@ -2280,7 +2280,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2931,6 +3072,7 @@ public class PurpurWorldConfig {
+@@ -2929,6 +3070,7 @@ public class PurpurWorldConfig {
          zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
          zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
@@ -2288,7 +2288,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2943,6 +3085,7 @@ public class PurpurWorldConfig {
+@@ -2941,6 +3083,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
      public boolean zombifiedPiglinTakeDamageFromWater = false;
@@ -2296,7 +2296,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2959,6 +3102,7 @@ public class PurpurWorldConfig {
+@@ -2957,6 +3100,7 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
diff --git a/patches/server/0229-Shearing-jeb-produces-random-color-wool.patch b/patches/server/0229-Shearing-jeb-produces-random-color-wool.patch
deleted file mode 100644
index f47593677..000000000
--- a/patches/server/0229-Shearing-jeb-produces-random-color-wool.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 31 Dec 2021 06:03:12 -0600
-Subject: [PATCH] Shearing jeb produces random color wool
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index ae2662a5cdc4e531e09876ff8664eaf66a63a960..4d28cb60f8fa816205699a66a7667358e13c6a01 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -327,7 +327,7 @@ public class Sheep extends Animal implements Shearable {
-         int count = 1 + this.random.nextInt(3);
-         java.util.List<ItemStack> dropEntities = new java.util.ArrayList<>(count);
-         for (int j = 0; j < count; ++j) {
--            dropEntities.add(new ItemStack(Sheep.ITEM_BY_DYE.get(this.getColor())));
-+            dropEntities.add(new ItemStack(Sheep.ITEM_BY_DYE.get(this.level().purpurConfig.sheepShearJebRandomColor && hasCustomName() && getCustomName().getString().equals("jeb_") ? DyeColor.random(this.level().random) : this.getColor())));
-         }
-         return dropEntities;
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 476545737acdb0da8e5f5def12164c7f83cbaa80..375d1deef92f935d8f32166e3a17a84370ad1dcd 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2368,6 +2368,7 @@ public class PurpurWorldConfig {
-     public boolean sheepBypassMobGriefing = false;
-     public boolean sheepTakeDamageFromWater = false;
-     public boolean sheepAlwaysDropExp = false;
-+    public boolean sheepShearJebRandomColor = false;
-     private void sheepSettings() {
-         sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
-         sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -2382,6 +2383,7 @@ public class PurpurWorldConfig {
-         sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
-         sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
-         sheepAlwaysDropExp = getBoolean("mobs.sheep.always-drop-exp", sheepAlwaysDropExp);
-+        sheepShearJebRandomColor = getBoolean("mobs.sheep.jeb-shear-random-color", sheepShearJebRandomColor);
-     }
- 
-     public boolean shulkerRidable = false;
diff --git a/patches/server/0230-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0229-Turtle-eggs-random-tick-crack-chance.patch
similarity index 91%
rename from patches/server/0230-Turtle-eggs-random-tick-crack-chance.patch
rename to patches/server/0229-Turtle-eggs-random-tick-crack-chance.patch
index 7f835ee82..9d7b81406 100644
--- a/patches/server/0230-Turtle-eggs-random-tick-crack-chance.patch
+++ b/patches/server/0229-Turtle-eggs-random-tick-crack-chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Turtle eggs random tick crack chance
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 44bb9930313cae9d150cc08cbdcced10a35bd07d..9756c84e073d9e99ade0ee94c586b8e0fa426138 100644
+index 189cec37228f88c97e1994c40c44461a3321df8b..1099ce368c95ec293b8e6349ee545d3256e93ac3 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -169,7 +169,7 @@ public class TurtleEggBlock extends Block {
@@ -18,7 +18,7 @@ index 44bb9930313cae9d150cc08cbdcced10a35bd07d..9756c84e073d9e99ade0ee94c586b8e0
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 375d1deef92f935d8f32166e3a17a84370ad1dcd..d31aa9b30124832fbc010299b8a24c67624ac6f3 100644
+index 1b1f249659d3d6f80d442439b05dcc88eefd5841..38548885da9d34148589ae0502f0aea7f3faf46e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1076,11 +1076,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0231-Mob-head-visibility-percent.patch b/patches/server/0230-Mob-head-visibility-percent.patch
similarity index 93%
rename from patches/server/0231-Mob-head-visibility-percent.patch
rename to patches/server/0230-Mob-head-visibility-percent.patch
index a02d6c88b..fdc902115 100644
--- a/patches/server/0231-Mob-head-visibility-percent.patch
+++ b/patches/server/0230-Mob-head-visibility-percent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2cefad6730dbd50e41917af287c041a13d81ba2e..fc5dfbeae6bf9256e98eae774ccd77111d3ba280 100644
+index ef739e34184bbaca4a4eb8314357772934b4a065..19529564457dfb0d0a3231341b1a57b72a415d54 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1039,9 +1039,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -32,7 +32,7 @@ index 2cefad6730dbd50e41917af287c041a13d81ba2e..fc5dfbeae6bf9256e98eae774ccd7711
              // Purpur start
              if (entity instanceof LivingEntity entityliving) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d943ba25b 100644
+index 38548885da9d34148589ae0502f0aea7f3faf46e..c793c0c91f7ef6d5e847fd10a908fee09208bc12 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1370,6 +1370,7 @@ public class PurpurWorldConfig {
@@ -67,7 +67,7 @@ index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d
      }
  
      public boolean piglinBruteRidable = false;
-@@ -2448,6 +2452,7 @@ public class PurpurWorldConfig {
+@@ -2446,6 +2450,7 @@ public class PurpurWorldConfig {
      public double skeletonMaxHealth = 20.0D;
      public boolean skeletonTakeDamageFromWater = false;
      public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2460,6 +2465,7 @@ public class PurpurWorldConfig {
+@@ -2458,6 +2463,7 @@ public class PurpurWorldConfig {
          skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
          skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -83,7 +83,7 @@ index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d
      }
  
      public boolean skeletonHorseRidable = false;
-@@ -2996,6 +3002,7 @@ public class PurpurWorldConfig {
+@@ -2992,6 +2998,7 @@ public class PurpurWorldConfig {
      public boolean zombieBypassMobGriefing = false;
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -3014,6 +3021,7 @@ public class PurpurWorldConfig {
+@@ -3010,6 +3017,7 @@ public class PurpurWorldConfig {
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
          zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
          zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
diff --git a/patches/server/0232-Configurable-valid-characters-for-usernames.patch b/patches/server/0231-Configurable-valid-characters-for-usernames.patch
similarity index 100%
rename from patches/server/0232-Configurable-valid-characters-for-usernames.patch
rename to patches/server/0231-Configurable-valid-characters-for-usernames.patch
diff --git a/patches/server/0233-Shears-can-have-looting-enchantment.patch b/patches/server/0232-Shears-can-have-looting-enchantment.patch
similarity index 91%
rename from patches/server/0233-Shears-can-have-looting-enchantment.patch
rename to patches/server/0232-Shears-can-have-looting-enchantment.patch
index 51cbd9812..3c2e41e90 100644
--- a/patches/server/0233-Shears-can-have-looting-enchantment.patch
+++ b/patches/server/0232-Shears-can-have-looting-enchantment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shears can have looting enchantment
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-index ec43e8294d7e7112478a2fc1475f0852690a4882..2f1bd058543af6a7a0b3d94ab0fc9627b4e0da49 100644
+index 887e75c940ab5089f4e42e4553ab95adf172df46..8db955ae0c7eb6f1e53701d9199798e6412e6c69 100644
 --- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
 @@ -104,7 +104,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
@@ -13,12 +13,12 @@ index ec43e8294d7e7112478a2fc1475f0852690a4882..2f1bd058543af6a7a0b3d94ab0fc9627
                      // CraftBukkit start
                      // Paper start
 -                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops());
-+                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MOB_LOOTING, CraftItemStack.asNMSCopy(craftItem))));
++                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MOB_LOOTING, CraftItemStack.asNMSCopy(craftItem)))); // Purpur
                      if (event.isCancelled()) {
                          // Paper end
                          continue;
 diff --git a/src/main/java/net/minecraft/world/entity/Shearable.java b/src/main/java/net/minecraft/world/entity/Shearable.java
-index 4921d1b2ff9112374477c5c9b4a68cc75a51dbf8..40716d46a2d9c1b3b13e92995e6441d83bdd2396 100644
+index 4921d1b2ff9112374477c5c9b4a68cc75a51dbf8..7070ed31869855f5dd911fbe95142fa97b2dc45d 100644
 --- a/src/main/java/net/minecraft/world/entity/Shearable.java
 +++ b/src/main/java/net/minecraft/world/entity/Shearable.java
 @@ -8,7 +8,7 @@ public interface Shearable {
@@ -26,12 +26,12 @@ index 4921d1b2ff9112374477c5c9b4a68cc75a51dbf8..40716d46a2d9c1b3b13e92995e6441d8
      boolean readyForShearing();
      // Paper start - ensure all implementing entities override this
 -    default java.util.List<net.minecraft.world.item.ItemStack> generateDefaultDrops() {
-+    default java.util.List<net.minecraft.world.item.ItemStack> generateDefaultDrops(int looting) {
++    default java.util.List<net.minecraft.world.item.ItemStack> generateDefaultDrops(int looting) { // Purpur
          return java.util.Collections.emptyList();
      }
      // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 5d75e715a2edac73350cd74e2a5184e7fccbad53..9ac87800d1d15ae3431caaf4e86d4fe10e105972 100644
+index 5d75e715a2edac73350cd74e2a5184e7fccbad53..4a520ff6ce7f6011838430b3972e99b8b916db7e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -160,7 +160,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -39,7 +39,7 @@ index 5d75e715a2edac73350cd74e2a5184e7fccbad53..9ac87800d1d15ae3431caaf4e86d4fe1
              // CraftBukkit start
              // Paper start - custom shear drops
 -            List<ItemStack> drops = this.generateDefaultDrops();
-+            List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player));
++            List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
              org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
              if (event != null) {
                  if (event.isCancelled()) {
@@ -56,12 +56,12 @@ index 5d75e715a2edac73350cd74e2a5184e7fccbad53..9ac87800d1d15ae3431caaf4e86d4fe1
 +    public List<ItemStack> generateDefaultDrops(int looting) { // Purpur
          List<ItemStack> dropEntities = new java.util.ArrayList<>(5);
 -        for (int i = 0; i < 5; ++i) {
-+        for (int i = 0; i < 5 + (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? looting : 0); ++i) {
++        for (int i = 0; i < 5 + (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? looting : 0); ++i) { // Purpur
              dropEntities.add(new ItemStack(this.getVariant().getBlockState().getBlock()));
          }
          return dropEntities;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 4d28cb60f8fa816205699a66a7667358e13c6a01..e2f29a1bf72e4a8785397318f159aae8059ac4ed 100644
+index ae2662a5cdc4e531e09876ff8664eaf66a63a960..658f7943d275267d3fc556572831cc095259d12e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -292,7 +292,7 @@ public class Sheep extends Animal implements Shearable {
@@ -69,7 +69,7 @@ index 4d28cb60f8fa816205699a66a7667358e13c6a01..e2f29a1bf72e4a8785397318f159aae8
                  // CraftBukkit start
                  // Paper start - custom shear drops
 -                java.util.List<ItemStack> drops = this.generateDefaultDrops();
-+                java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player));
++                java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
                  org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
                  if (event != null) {
                      if (event.isCancelled()) {
@@ -78,19 +78,19 @@ index 4d28cb60f8fa816205699a66a7667358e13c6a01..e2f29a1bf72e4a8785397318f159aae8
      public void shear(SoundSource shearedSoundCategory) {
          // Paper start - custom shear drops
 -        this.shear(shearedSoundCategory, this.generateDefaultDrops());
-+        this.shear(shearedSoundCategory, this.generateDefaultDrops(0));
++        this.shear(shearedSoundCategory, this.generateDefaultDrops(0)); // Purpur
      }
  
      @Override
 -    public java.util.List<ItemStack> generateDefaultDrops() {
-+    public java.util.List<ItemStack> generateDefaultDrops(int looting) {
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) { // Purpur
          int count = 1 + this.random.nextInt(3);
 +        if (org.purpurmc.purpur.PurpurConfig.allowShearsLooting) count += looting; // Purpur
          java.util.List<ItemStack> dropEntities = new java.util.ArrayList<>(count);
          for (int j = 0; j < count; ++j) {
-             dropEntities.add(new ItemStack(Sheep.ITEM_BY_DYE.get(this.level().purpurConfig.sheepShearJebRandomColor && hasCustomName() && getCustomName().getString().equals("jeb_") ? DyeColor.random(this.level().random) : this.getColor())));
+             dropEntities.add(new ItemStack(Sheep.ITEM_BY_DYE.get(this.getColor())));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 8a0327a870a22def6538bb56df2f2fd384449928..58e101a3963be08c21e6d8c80731d45c0883be8d 100644
+index c11ae706f85119d8dd5ac48e6fd585540779814c..c30b00e5637d3def256c93cc227a15ddaf99bc56 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -196,7 +196,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -98,25 +98,22 @@ index 8a0327a870a22def6538bb56df2f2fd384449928..58e101a3963be08c21e6d8c80731d45c
              // CraftBukkit start
              // Paper start - custom shear drops
 -            java.util.List<ItemStack> drops = this.generateDefaultDrops();
-+            java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player));
++            java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
              org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
              if (event != null) {
                  if (event.isCancelled()) {
-@@ -231,15 +231,22 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -231,11 +231,20 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      @Override
      public void shear(SoundSource shearedSoundCategory) {
          // Paper start - custom shear drops
 -        this.shear(shearedSoundCategory, this.generateDefaultDrops());
-+        this.shear(shearedSoundCategory, this.generateDefaultDrops(0));
++        this.shear(shearedSoundCategory, this.generateDefaultDrops(0)); // Purpur
      }
  
      @Override
 -    public java.util.List<ItemStack> generateDefaultDrops() {
-+    public java.util.List<ItemStack> generateDefaultDrops(int looting) { // Purpur
-         // Purpur start
-         if (!level().purpurConfig.snowGolemDropsPumpkin) {
-             return Shearable.super.generateDefaultDrops(0);
-         }
++    // Purpur start
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) {
 +        if (org.purpurmc.purpur.PurpurConfig.allowShearsLooting) {
 +            java.util.ArrayList<ItemStack> list = new java.util.ArrayList<>();
 +            for (int i = 0; i < 1 + looting; i++) {
@@ -124,9 +121,10 @@ index 8a0327a870a22def6538bb56df2f2fd384449928..58e101a3963be08c21e6d8c80731d45c
 +            }
 +            return java.util.Collections.unmodifiableList(list);
 +        }
-         // Purpur end
++    // Purpur end
          return java.util.Collections.singletonList(new ItemStack(Items.CARVED_PUMPKIN));
      }
+ 
 diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
 index 859435f747ceef860cb4e9e825a7353ea3b90798..fc2c35f57436371cb0111aedfd289ac95d506d07 100644
 --- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
diff --git a/patches/server/0234-Stop-bees-from-dying-after-stinging.patch b/patches/server/0233-Stop-bees-from-dying-after-stinging.patch
similarity index 95%
rename from patches/server/0234-Stop-bees-from-dying-after-stinging.patch
rename to patches/server/0233-Stop-bees-from-dying-after-stinging.patch
index e14cbbdc8..ab2526aff 100644
--- a/patches/server/0234-Stop-bees-from-dying-after-stinging.patch
+++ b/patches/server/0233-Stop-bees-from-dying-after-stinging.patch
@@ -17,7 +17,7 @@ index 6d7b8c9f9bfe296263f1752f485dcf8f53af8142..0a4ca865d1e41efca0eb8287c833e642
              ++this.timeSinceSting;
              if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3760848e35ce82a546fb406ed383be8d943ba25b..62c916dbb715192e9ec56df95672f070e14aea4c 100644
+index c793c0c91f7ef6d5e847fd10a908fee09208bc12..a3ec794d6690574bac653321301668aba420a967 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1171,6 +1171,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0235-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0234-Give-bee-counts-in-beehives-to-Purpur-clients.patch
similarity index 100%
rename from patches/server/0235-Give-bee-counts-in-beehives-to-Purpur-clients.patch
rename to patches/server/0234-Give-bee-counts-in-beehives-to-Purpur-clients.patch
diff --git a/patches/server/0236-Configurable-farmland-trample-height.patch b/patches/server/0235-Configurable-farmland-trample-height.patch
similarity index 97%
rename from patches/server/0236-Configurable-farmland-trample-height.patch
rename to patches/server/0235-Configurable-farmland-trample-height.patch
index 11c7214d4..78ca9e291 100644
--- a/patches/server/0236-Configurable-farmland-trample-height.patch
+++ b/patches/server/0235-Configurable-farmland-trample-height.patch
@@ -35,7 +35,7 @@ index 5c93cf7f97ecf4fba2c905b293ca7d21d1424f30..c4eca9db159d6a581d863558ebc3008d
              org.bukkit.event.Cancellable cancellable;
              if (entity instanceof Player) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 62c916dbb715192e9ec56df95672f070e14aea4c..2f381b23c4193e324ebf04e96f98ae16f457120a 100644
+index a3ec794d6690574bac653321301668aba420a967..63c29714c855f95f62ecdf19b1502881699206c9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -959,6 +959,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0237-Configurable-player-pickup-exp-delay.patch b/patches/server/0236-Configurable-player-pickup-exp-delay.patch
similarity index 93%
rename from patches/server/0237-Configurable-player-pickup-exp-delay.patch
rename to patches/server/0236-Configurable-player-pickup-exp-delay.patch
index 8968d9284..e6679b855 100644
--- a/patches/server/0237-Configurable-player-pickup-exp-delay.patch
+++ b/patches/server/0236-Configurable-player-pickup-exp-delay.patch
@@ -9,7 +9,7 @@ players still only pick up one orb every tick. However, setting this
 to any negative number will pick up all orbs instantly.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 5450058d23f1ab20689183bd284b01fc93628db5..a3ef8e6a698df4c78e0494da48063ddd29caf62f 100644
+index 3a84ea755d33bb882e0f0dace221a2c2246f952c..01f375047998cb68b3ec704aef9f050c9f0630dc 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -313,7 +313,7 @@ public class ExperienceOrb extends Entity {
@@ -22,7 +22,7 @@ index 5450058d23f1ab20689183bd284b01fc93628db5..a3ef8e6a698df4c78e0494da48063ddd
                  int i = this.repairPlayerItems(player, this.value);
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fab644c79287a444fd58c43547beba3e06e9e7ff..f1fe8a0c1ff1514d9a158e18dc6d234d54388573 100644
+index db3afaf25b1991a257bd2d5036527f4cb00c5040..738aca99196c5b88ed5d561d410964c71625578d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -631,7 +631,7 @@ public abstract class Player extends LivingEntity {
@@ -35,7 +35,7 @@ index fab644c79287a444fd58c43547beba3e06e9e7ff..f1fe8a0c1ff1514d9a158e18dc6d234d
                  } else if (!entity.isRemoved()) {
                      this.touch(entity);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2f381b23c4193e324ebf04e96f98ae16f457120a..9ef10d9fad3a2b8a9ff067cb4ee882d17aa16a00 100644
+index 63c29714c855f95f62ecdf19b1502881699206c9..a9dba090d637c5942d09ffc4698e3397a137a7ac 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -420,6 +420,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0238-Allow-void-trading.patch b/patches/server/0237-Allow-void-trading.patch
similarity index 96%
rename from patches/server/0238-Allow-void-trading.patch
rename to patches/server/0237-Allow-void-trading.patch
index 092dfebf1..106e50c41 100644
--- a/patches/server/0238-Allow-void-trading.patch
+++ b/patches/server/0237-Allow-void-trading.patch
@@ -18,7 +18,7 @@ index 603a13a1720123fd987b686d8d881d955d1bab08..fea3f6366606a15ed57c5b23bb4db274
                  }
                  // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9ef10d9fad3a2b8a9ff067cb4ee882d17aa16a00..adc30acd3cead8f557f1016ed5e05edbf2857200 100644
+index a9dba090d637c5942d09ffc4698e3397a137a7ac..09cac0ae130610fd1ce50eb092fe758cfe71a4dd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -421,6 +421,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0239-Configurable-phantom-size.patch b/patches/server/0238-Configurable-phantom-size.patch
similarity index 96%
rename from patches/server/0239-Configurable-phantom-size.patch
rename to patches/server/0238-Configurable-phantom-size.patch
index 42cd9b62e..b3b5ca710 100644
--- a/patches/server/0239-Configurable-phantom-size.patch
+++ b/patches/server/0238-Configurable-phantom-size.patch
@@ -22,7 +22,7 @@ index ab9ed9acc394dedf2151b83ff5cf998e0e0be21e..355445b7f8972cb789d33f59d03c382f
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index adc30acd3cead8f557f1016ed5e05edbf2857200..0cb3e06bab1b897a98fd0a05c65cf025c0356273 100644
+index 09cac0ae130610fd1ce50eb092fe758cfe71a4dd..1620ed5e1fab8575af02fefc910865d1b8a50322 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -2113,6 +2113,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0240-Configurable-food-attributes.patch b/patches/server/0239-Configurable-food-attributes.patch
similarity index 100%
rename from patches/server/0240-Configurable-food-attributes.patch
rename to patches/server/0239-Configurable-food-attributes.patch
diff --git a/patches/server/0241-Max-joins-per-second.patch b/patches/server/0240-Max-joins-per-second.patch
similarity index 100%
rename from patches/server/0241-Max-joins-per-second.patch
rename to patches/server/0240-Max-joins-per-second.patch
diff --git a/patches/server/0242-Configurable-minimum-demand-for-trades.patch b/patches/server/0241-Configurable-minimum-demand-for-trades.patch
similarity index 93%
rename from patches/server/0242-Configurable-minimum-demand-for-trades.patch
rename to patches/server/0241-Configurable-minimum-demand-for-trades.patch
index 4f656ed7e..3902f4aa0 100644
--- a/patches/server/0242-Configurable-minimum-demand-for-trades.patch
+++ b/patches/server/0241-Configurable-minimum-demand-for-trades.patch
@@ -40,10 +40,10 @@ index 4f7457578ab3118d10e0d5dfc23d79c9b20c2f44..e03ce53b93d1b9366f2a7f14f341750a
  
      public ItemStack assemble() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0cb3e06bab1b897a98fd0a05c65cf025c0356273..cae769fde9d58d2a526af769e49d4d63b7bcb3f7 100644
+index 1620ed5e1fab8575af02fefc910865d1b8a50322..e320196cc5f7302377916d5402579632374de09c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2798,6 +2798,7 @@ public class PurpurWorldConfig {
+@@ -2794,6 +2794,7 @@ public class PurpurWorldConfig {
      public boolean villagerTakeDamageFromWater = false;
      public boolean villagerAllowTrading = true;
      public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 0cb3e06bab1b897a98fd0a05c65cf025c0356273..cae769fde9d58d2a526af769e49d4d63
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2818,6 +2819,7 @@ public class PurpurWorldConfig {
+@@ -2814,6 +2815,7 @@ public class PurpurWorldConfig {
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
          villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
diff --git a/patches/server/0243-Lobotomize-stuck-villagers.patch b/patches/server/0242-Lobotomize-stuck-villagers.patch
similarity index 97%
rename from patches/server/0243-Lobotomize-stuck-villagers.patch
rename to patches/server/0242-Lobotomize-stuck-villagers.patch
index 61b484841..d2b2dbdbc 100644
--- a/patches/server/0243-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0242-Lobotomize-stuck-villagers.patch
@@ -104,10 +104,10 @@ index 6c15d40979fd3e3d246a447c432b321fbf29ada3..6ace76a829c88e2e747dbbcce0a6582c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cae769fde9d58d2a526af769e49d4d63b7bcb3f7..cd5dcafe602e494ded07106224857dcea37b5525 100644
+index e320196cc5f7302377916d5402579632374de09c..39f373cfbe0228d2040a9e7616a0491b11ee67a1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2799,6 +2799,8 @@ public class PurpurWorldConfig {
+@@ -2795,6 +2795,8 @@ public class PurpurWorldConfig {
      public boolean villagerAllowTrading = true;
      public boolean villagerAlwaysDropExp = false;
      public int villagerMinimumDemand = 0;
@@ -116,7 +116,7 @@ index cae769fde9d58d2a526af769e49d4d63b7bcb3f7..cd5dcafe602e494ded07106224857dce
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2820,6 +2822,17 @@ public class PurpurWorldConfig {
+@@ -2816,6 +2818,17 @@ public class PurpurWorldConfig {
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
          villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
          villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);
diff --git a/patches/server/0244-Option-for-villager-display-trade-item.patch b/patches/server/0243-Option-for-villager-display-trade-item.patch
similarity index 91%
rename from patches/server/0244-Option-for-villager-display-trade-item.patch
rename to patches/server/0243-Option-for-villager-display-trade-item.patch
index 1a6b86b88..613d8d3e2 100644
--- a/patches/server/0244-Option-for-villager-display-trade-item.patch
+++ b/patches/server/0243-Option-for-villager-display-trade-item.patch
@@ -17,10 +17,10 @@ index c3e0b1f11b58668f9f24eb421abc340e1b49dfac..d809fa4f96e2c528075f544355397903
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cd5dcafe602e494ded07106224857dcea37b5525..4586122457cdbf707cecb0d95110ac64e45a8184 100644
+index 39f373cfbe0228d2040a9e7616a0491b11ee67a1..7f91d3d56f6c4077e773c82da0f96103c892b82b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2801,6 +2801,7 @@ public class PurpurWorldConfig {
+@@ -2797,6 +2797,7 @@ public class PurpurWorldConfig {
      public int villagerMinimumDemand = 0;
      public boolean villagerLobotomizeEnabled = false;
      public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index cd5dcafe602e494ded07106224857dcea37b5525..4586122457cdbf707cecb0d95110ac64
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2833,6 +2834,7 @@ public class PurpurWorldConfig {
+@@ -2829,6 +2830,7 @@ public class PurpurWorldConfig {
          }
          villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
          villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
diff --git a/patches/server/0245-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0244-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
similarity index 95%
rename from patches/server/0245-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
rename to patches/server/0244-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
index a7e7961ca..42734a599 100644
--- a/patches/server/0245-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
+++ b/patches/server/0244-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
@@ -17,7 +17,7 @@ index 827912174ee08cd19249797d351887149b25c880..5b02848ea9f14060353014cada2d5539
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4586122457cdbf707cecb0d95110ac64e45a8184..f00325dff01364cba7aa2f15e945a32a636426ad 100644
+index 7f91d3d56f6c4077e773c82da0f96103c892b82b..440ba9fb9c30973ea3268298923812962034b2db 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1063,8 +1063,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0246-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch
similarity index 95%
rename from patches/server/0246-Config-for-mob-last-hurt-by-player-time.patch
rename to patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch
index ccb84dd6f..cf6559093 100644
--- a/patches/server/0246-Config-for-mob-last-hurt-by-player-time.patch
+++ b/patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for mob last hurt by player time
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fc5dfbeae6bf9256e98eae774ccd77111d3ba280..139f0f8b04c743df6c0534d09493d4f46407006e 100644
+index 19529564457dfb0d0a3231341b1a57b72a415d54..6e7ed46a3a10a1ec69d0b69ee49be304760e419b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1545,13 +1545,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -38,7 +38,7 @@ index 10ca0fdb5b92cc4f1d346540c9129d5c55732985..a2d1c22e778aa4c3c44c3a1a604c1656
      // Paper end
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f00325dff01364cba7aa2f15e945a32a636426ad..29f353f08c968b6c329fcd29e07d3ba3087884df 100644
+index 440ba9fb9c30973ea3268298923812962034b2db..6d1a29d5b9695c4f2392a82f8c1b11db220ea727 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -142,6 +142,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0247-Anvil-repair-damage-options.patch b/patches/server/0246-Anvil-repair-damage-options.patch
similarity index 98%
rename from patches/server/0247-Anvil-repair-damage-options.patch
rename to patches/server/0246-Anvil-repair-damage-options.patch
index ec2f42bab..8c8e01010 100644
--- a/patches/server/0247-Anvil-repair-damage-options.patch
+++ b/patches/server/0246-Anvil-repair-damage-options.patch
@@ -64,7 +64,7 @@ index 9fca247f51e8b4d445f61ab5c16faf3928626deb..583bb1282fedcab75dbe4359a9f53b76
              return InteractionResult.SUCCESS;
          } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 29f353f08c968b6c329fcd29e07d3ba3087884df..e52417b3b696e1068b484daa4c73fe535966de22 100644
+index 6d1a29d5b9695c4f2392a82f8c1b11db220ea727..92019e20b9a67eb3c8be875ed57943c1ee1538d6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -820,9 +820,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0248-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0247-Option-to-disable-turtle-egg-trampling-with-feather-.patch
similarity index 93%
rename from patches/server/0248-Option-to-disable-turtle-egg-trampling-with-feather-.patch
rename to patches/server/0247-Option-to-disable-turtle-egg-trampling-with-feather-.patch
index 27b5071ea..ba7d964a0 100644
--- a/patches/server/0248-Option-to-disable-turtle-egg-trampling-with-feather-.patch
+++ b/patches/server/0247-Option-to-disable-turtle-egg-trampling-with-feather-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable turtle egg trampling with feather falling
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 9756c84e073d9e99ade0ee94c586b8e0fa426138..2c0dcfc916f0845dc830a7ac9ffc828df20f27d0 100644
+index 1099ce368c95ec293b8e6349ee545d3256e93ac3..777ba7b3dfbb8cee8b782490101127271f7320d2 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -218,7 +218,13 @@ public class TurtleEggBlock extends Block {
@@ -24,7 +24,7 @@ index 9756c84e073d9e99ade0ee94c586b8e0fa426138..2c0dcfc916f0845dc830a7ac9ffc828d
          return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
          // Purpur end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e52417b3b696e1068b484daa4c73fe535966de22..39f79210e80825df5a837e5e319f8db0c0e67280 100644
+index 92019e20b9a67eb3c8be875ed57943c1ee1538d6..2a898817bff68402631fbcf9318bed76548c9e21 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1091,12 +1091,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0249-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0248-Add-toggle-for-enchant-level-clamping.patch
similarity index 97%
rename from patches/server/0249-Add-toggle-for-enchant-level-clamping.patch
rename to patches/server/0248-Add-toggle-for-enchant-level-clamping.patch
index 61827c78c..575e13d15 100644
--- a/patches/server/0249-Add-toggle-for-enchant-level-clamping.patch
+++ b/patches/server/0248-Add-toggle-for-enchant-level-clamping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for enchant level clamping
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2b1decf36ff950d9572e3d8790e1f60ff84ce5fa..0505969be72d080c00733615ef5619fa2f4a36d4 100644
+index fa80754217fd43189fe2138322928fa8c4e9c9f4..9ad21a70a4da60307f6531ab3bfdbc7cb353b776 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -1234,7 +1234,7 @@ public final class ItemStack {
diff --git a/patches/server/0250-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0249-Skip-junit-tests-for-purpur-commands.patch
similarity index 100%
rename from patches/server/0250-Skip-junit-tests-for-purpur-commands.patch
rename to patches/server/0249-Skip-junit-tests-for-purpur-commands.patch
diff --git a/patches/server/0251-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0250-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 92%
rename from patches/server/0251-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0250-Implement-configurable-search-radius-for-villagers-t.patch
index d65ed8771..7685ce116 100644
--- a/patches/server/0251-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0250-Implement-configurable-search-radius-for-villagers-t.patch
@@ -18,10 +18,10 @@ index 27e8f8bbaa25227c19399fab2bce8953d098e612..576ac084a97a59f2bd3a1be3d7051564
              AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
              List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 39f79210e80825df5a837e5e319f8db0c0e67280..1d12f5ad5131a71dbf6dba78e31e285a6cfb1a54 100644
+index 2a898817bff68402631fbcf9318bed76548c9e21..05d82f9555b8836b48d076ec38f3aab6c070e58b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2812,6 +2812,8 @@ public class PurpurWorldConfig {
+@@ -2808,6 +2808,8 @@ public class PurpurWorldConfig {
      public boolean villagerLobotomizeEnabled = false;
      public int villagerLobotomizeCheckInterval = 100;
      public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index 39f79210e80825df5a837e5e319f8db0c0e67280..1d12f5ad5131a71dbf6dba78e31e285a
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2845,6 +2847,8 @@ public class PurpurWorldConfig {
+@@ -2841,6 +2843,8 @@ public class PurpurWorldConfig {
          villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
          villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
          villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);
diff --git a/patches/server/0252-Stonecutter-damage.patch b/patches/server/0251-Stonecutter-damage.patch
similarity index 98%
rename from patches/server/0252-Stonecutter-damage.patch
rename to patches/server/0251-Stonecutter-damage.patch
index 7c6064b98..fb3ee6f7d 100644
--- a/patches/server/0252-Stonecutter-damage.patch
+++ b/patches/server/0251-Stonecutter-damage.patch
@@ -105,7 +105,7 @@ index c6628a28387023b334dd99a4e469126a2108c38b..3a49455509a26063a62e39fb3d3ad81e
  
      public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1d12f5ad5131a71dbf6dba78e31e285a6cfb1a54..02eb8f37ccb814df925431280ec34a047592d6d6 100644
+index 05d82f9555b8836b48d076ec38f3aab6c070e58b..0abcb153446080c385d35cea03f6f7e8e9de8ff4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1086,6 +1086,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0253-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0252-Configurable-damage-settings-for-magma-blocks.patch
similarity index 96%
rename from patches/server/0253-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0252-Configurable-damage-settings-for-magma-blocks.patch
index df2fdcb74..73b48d066 100644
--- a/patches/server/0253-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0252-Configurable-damage-settings-for-magma-blocks.patch
@@ -18,7 +18,7 @@ index 10f5ffacc72a5e0116e2599ca83ee57a5b1ce0eb..31e6468f639de3ed0b25c3bc4ee09333
              entity.hurt(world.damageSources().hotFloor(), 1.0F);
              org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 02eb8f37ccb814df925431280ec34a047592d6d6..b75922d2352a1ceb3ad00cbf6f968edaaea243d9 100644
+index 0abcb153446080c385d35cea03f6f7e8e9de8ff4..bbd1eefc53f91adce1102d865bd0c92c2cc090c2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1022,6 +1022,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0254-Add-config-for-snow-on-blue-ice.patch b/patches/server/0253-Add-config-for-snow-on-blue-ice.patch
similarity index 95%
rename from patches/server/0254-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0253-Add-config-for-snow-on-blue-ice.patch
index dbb5d023d..6eadd793b 100644
--- a/patches/server/0254-Add-config-for-snow-on-blue-ice.patch
+++ b/patches/server/0253-Add-config-for-snow-on-blue-ice.patch
@@ -22,7 +22,7 @@ index a3da9536c3a3ad33d1c795673bdd7b05d6534054..9b057f3967aae5d0ca621b19d1212db9
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b75922d2352a1ceb3ad00cbf6f968edaaea243d9..7b74ecc07070bd9fea0ec6ae6ac8e0816a570d57 100644
+index bbd1eefc53f91adce1102d865bd0c92c2cc090c2..b301f0778a2dc0de4a899da06598aed314ef545c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1003,9 +1003,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0255-Skeletons-eat-wither-roses.patch b/patches/server/0254-Skeletons-eat-wither-roses.patch
similarity index 96%
rename from patches/server/0255-Skeletons-eat-wither-roses.patch
rename to patches/server/0254-Skeletons-eat-wither-roses.patch
index 00da6d1ea..0734e9f0a 100644
--- a/patches/server/0255-Skeletons-eat-wither-roses.patch
+++ b/patches/server/0254-Skeletons-eat-wither-roses.patch
@@ -94,10 +94,10 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7b74ecc07070bd9fea0ec6ae6ac8e0816a570d57..06e7305a4d2def94136a9f1f39e3b3c27124ebdd 100644
+index b301f0778a2dc0de4a899da06598aed314ef545c..ef6ed71bf4674b7f0275e3cc4487f9f311d4cf48 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2494,6 +2494,7 @@ public class PurpurWorldConfig {
+@@ -2492,6 +2492,7 @@ public class PurpurWorldConfig {
      public boolean skeletonTakeDamageFromWater = false;
      public boolean skeletonAlwaysDropExp = false;
      public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index 7b74ecc07070bd9fea0ec6ae6ac8e0816a570d57..06e7305a4d2def94136a9f1f39e3b3c2
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2507,6 +2508,7 @@ public class PurpurWorldConfig {
+@@ -2505,6 +2506,7 @@ public class PurpurWorldConfig {
          skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
          skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
diff --git a/patches/server/0256-Enchantment-Table-Persists-Lapis.patch b/patches/server/0255-Enchantment-Table-Persists-Lapis.patch
similarity index 98%
rename from patches/server/0256-Enchantment-Table-Persists-Lapis.patch
rename to patches/server/0255-Enchantment-Table-Persists-Lapis.patch
index bcda870af..bf81e2087 100644
--- a/patches/server/0256-Enchantment-Table-Persists-Lapis.patch
+++ b/patches/server/0255-Enchantment-Table-Persists-Lapis.patch
@@ -146,7 +146,7 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e
 +    // Purpur
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 06e7305a4d2def94136a9f1f39e3b3c27124ebdd..67f442cc85a08a5843763643bc0cb6cfa9097e8f 100644
+index ef6ed71bf4674b7f0275e3cc4487f9f311d4cf48..5af36ce329de61f867e702740edb8c1cebe2cc09 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1529,6 +1529,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0257-Spark-Profiler.patch b/patches/server/0256-Spark-Profiler.patch
similarity index 100%
rename from patches/server/0257-Spark-Profiler.patch
rename to patches/server/0256-Spark-Profiler.patch
diff --git a/patches/server/0258-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0257-Option-to-disable-kick-for-out-of-order-chat.patch
similarity index 95%
rename from patches/server/0258-Option-to-disable-kick-for-out-of-order-chat.patch
rename to patches/server/0257-Option-to-disable-kick-for-out-of-order-chat.patch
index df92aafe0..d48726e50 100644
--- a/patches/server/0258-Option-to-disable-kick-for-out-of-order-chat.patch
+++ b/patches/server/0257-Option-to-disable-kick-for-out-of-order-chat.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable kick for out of order chat
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 13dadd9824a75cd26053aeb93cc95f5bba0622a5..22298bc61205b2da0a13a97144704d0dd1d33260 100644
+index 73d0f3962dd38f015fe022385ec160af9c176c84..709e0c73178e02f181d2d5de8929a3ed7bcab2f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1720,7 +1720,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0259-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0258-Config-for-sculk-shrieker-can_summon-state.patch
similarity index 95%
rename from patches/server/0259-Config-for-sculk-shrieker-can_summon-state.patch
rename to patches/server/0258-Config-for-sculk-shrieker-can_summon-state.patch
index a36dd7719..92986c2fc 100644
--- a/patches/server/0259-Config-for-sculk-shrieker-can_summon-state.patch
+++ b/patches/server/0258-Config-for-sculk-shrieker-can_summon-state.patch
@@ -18,7 +18,7 @@ index 09c61eb5ba129e9630a756b452ef6aa61745c533..837c8399b2f490d98ca556e66018bfd4
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 67f442cc85a08a5843763643bc0cb6cfa9097e8f..da5dfa53adaa85652e2c5db5fbe14307e9ef20c5 100644
+index 5af36ce329de61f867e702740edb8c1cebe2cc09..b2ece6e86bc7eca717ad1143c78a6657a7cbb01e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1067,6 +1067,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0260-Config-to-not-let-coral-die.patch b/patches/server/0259-Config-to-not-let-coral-die.patch
similarity index 96%
rename from patches/server/0260-Config-to-not-let-coral-die.patch
rename to patches/server/0259-Config-to-not-let-coral-die.patch
index e57e68bbd..f06d87123 100644
--- a/patches/server/0260-Config-to-not-let-coral-die.patch
+++ b/patches/server/0259-Config-to-not-let-coral-die.patch
@@ -29,7 +29,7 @@ index 8fd8285e07de4a0457da507501e49a807542f3b1..e580c5a141bebdc45893b5abde01e633
          int i = aenumdirection.length;
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index da5dfa53adaa85652e2c5db5fbe14307e9ef20c5..a1c95d2a69a8eaedefa90e689d5ce1636648fd1e 100644
+index b2ece6e86bc7eca717ad1143c78a6657a7cbb01e..453d4b1c1d6b9a1521ce7a2e179dfcec0bf52a3c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -904,6 +904,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0261-Add-local-difficulty-api.patch b/patches/server/0260-Add-local-difficulty-api.patch
similarity index 100%
rename from patches/server/0261-Add-local-difficulty-api.patch
rename to patches/server/0260-Add-local-difficulty-api.patch
diff --git a/patches/server/0262-Add-toggle-for-RNG-manipulation.patch b/patches/server/0261-Add-toggle-for-RNG-manipulation.patch
similarity index 93%
rename from patches/server/0262-Add-toggle-for-RNG-manipulation.patch
rename to patches/server/0261-Add-toggle-for-RNG-manipulation.patch
index a971edea8..8374c5de5 100644
--- a/patches/server/0262-Add-toggle-for-RNG-manipulation.patch
+++ b/patches/server/0261-Add-toggle-for-RNG-manipulation.patch
@@ -7,7 +7,7 @@ Paper patches RNG maniplulation by using a shared (and locked) random source.
 This comes with a performance gain, but technical players may prefer the ability to manipulate RNG.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a94d7fcec60ffd9826f7c4828f0d98461261fb0b..67ebbf6005cdef280d62e2150287f18699b2fe6a 100644
+index a7efbf24ca52d2303323ae2406cfe4beb7a72d4c..8cfba1af2f4ca7be42d997269187466c130de7b3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -598,7 +598,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -33,7 +33,7 @@ index 88c238e492b1081d1a64a3b6f05d7baa17e5d8c9..dd7f2beabf0edad4143ac2365ac04a22
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a1c95d2a69a8eaedefa90e689d5ce1636648fd1e..81a758847405ca2a4770da8120a9f837662bc3f7 100644
+index 453d4b1c1d6b9a1521ce7a2e179dfcec0bf52a3c..c4174f1f3e6993a38cdb3cbd57553af9807a327b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -204,9 +204,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0263-Send-client-custom-name-of-BE.patch b/patches/server/0262-Send-client-custom-name-of-BE.patch
similarity index 100%
rename from patches/server/0263-Send-client-custom-name-of-BE.patch
rename to patches/server/0262-Send-client-custom-name-of-BE.patch
diff --git a/patches/server/0264-Allow-custom-ChatDecorators.patch b/patches/server/0263-Allow-custom-ChatDecorators.patch
similarity index 100%
rename from patches/server/0264-Allow-custom-ChatDecorators.patch
rename to patches/server/0263-Allow-custom-ChatDecorators.patch
diff --git a/patches/server/0265-Remove-Timings.patch b/patches/server/0264-Remove-Timings.patch
similarity index 100%
rename from patches/server/0265-Remove-Timings.patch
rename to patches/server/0264-Remove-Timings.patch
diff --git a/patches/server/0266-Remove-Mojang-Profiler.patch b/patches/server/0265-Remove-Mojang-Profiler.patch
similarity index 100%
rename from patches/server/0266-Remove-Mojang-Profiler.patch
rename to patches/server/0265-Remove-Mojang-Profiler.patch
diff --git a/patches/server/0267-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0266-Add-more-logger-output-for-invalid-movement-kicks.patch
similarity index 96%
rename from patches/server/0267-Add-more-logger-output-for-invalid-movement-kicks.patch
rename to patches/server/0266-Add-more-logger-output-for-invalid-movement-kicks.patch
index b24eb19d0..bb39d753d 100644
--- a/patches/server/0267-Add-more-logger-output-for-invalid-movement-kicks.patch
+++ b/patches/server/0266-Add-more-logger-output-for-invalid-movement-kicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 56f110d08fa24b26792f55b2ea062249b0f9643d..ba3548498044bbfd8e73967ac3dcec9b8d0a3b88 100644
+index a6a852ccfbe0a039937d9c453276a2ab23a76110..cb2ecffbac74b78aedc38736ca615c47abaa9d5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -737,6 +737,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0268-Add-Bee-API.patch b/patches/server/0267-Add-Bee-API.patch
similarity index 100%
rename from patches/server/0268-Add-Bee-API.patch
rename to patches/server/0267-Add-Bee-API.patch
diff --git a/patches/server/0269-Debug-Marker-API.patch b/patches/server/0268-Debug-Marker-API.patch
similarity index 100%
rename from patches/server/0269-Debug-Marker-API.patch
rename to patches/server/0268-Debug-Marker-API.patch
diff --git a/patches/server/0270-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0269-mob-spawning-option-to-ignore-creative-players.patch
similarity index 96%
rename from patches/server/0270-mob-spawning-option-to-ignore-creative-players.patch
rename to patches/server/0269-mob-spawning-option-to-ignore-creative-players.patch
index 76d49e956..1ab7dd9f3 100644
--- a/patches/server/0270-mob-spawning-option-to-ignore-creative-players.patch
+++ b/patches/server/0269-mob-spawning-option-to-ignore-creative-players.patch
@@ -18,7 +18,7 @@ index 524301e2438ee2938b59eb2b2e9fc4e0eb727a87..a2a59dd2e515bf4dca84a442703c122f
                              if (entityhuman != null) {
                                  double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 81a758847405ca2a4770da8120a9f837662bc3f7..c46408be4ae6d764f233963f17b383ea623561ea 100644
+index c4174f1f3e6993a38cdb3cbd57553af9807a327b..1d9f4ae68eb58683aec4226aa62bf3731e14522b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -377,6 +377,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0271-Add-skeleton-bow-accuracy-option.patch b/patches/server/0270-Add-skeleton-bow-accuracy-option.patch
similarity index 94%
rename from patches/server/0271-Add-skeleton-bow-accuracy-option.patch
rename to patches/server/0270-Add-skeleton-bow-accuracy-option.patch
index 3616e37d9..e88d4fe2d 100644
--- a/patches/server/0271-Add-skeleton-bow-accuracy-option.patch
+++ b/patches/server/0270-Add-skeleton-bow-accuracy-option.patch
@@ -18,10 +18,10 @@ index f3e1fa62d9f067c0fe8aacb88bf30b01ee0562c1..28eb98d383d6846a25c29f8cd8ff211c
          org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
          if (event.isCancelled()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c46408be4ae6d764f233963f17b383ea623561ea..1f5225a7fb1a849884483c1bb1a1514b10a2d113 100644
+index 1d9f4ae68eb58683aec4226aa62bf3731e14522b..1dfaad983ed6d6babf88fb5cd512378110d09143 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2514,6 +2514,8 @@ public class PurpurWorldConfig {
+@@ -2512,6 +2512,8 @@ public class PurpurWorldConfig {
      public boolean skeletonAlwaysDropExp = false;
      public double skeletonHeadVisibilityPercent = 0.5D;
      public int skeletonFeedWitherRoses = 0;
@@ -30,7 +30,7 @@ index c46408be4ae6d764f233963f17b383ea623561ea..1f5225a7fb1a849884483c1bb1a1514b
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2528,6 +2530,18 @@ public class PurpurWorldConfig {
+@@ -2526,6 +2528,18 @@ public class PurpurWorldConfig {
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
          skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
          skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
diff --git a/patches/server/0272-Allay-respect-item-NBT.patch b/patches/server/0271-Allay-respect-item-NBT.patch
similarity index 96%
rename from patches/server/0272-Allay-respect-item-NBT.patch
rename to patches/server/0271-Allay-respect-item-NBT.patch
index 070aa4f96..efc73659d 100644
--- a/patches/server/0272-Allay-respect-item-NBT.patch
+++ b/patches/server/0271-Allay-respect-item-NBT.patch
@@ -44,7 +44,7 @@ index 9bf06cf7b3706f8883e1a0ceac8b1aebb52ba475..c783ce59ea766e6c46a3313628b961f2
  
      private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1f5225a7fb1a849884483c1bb1a1514b10a2d113..c7584f2cd12a75f61ca94100718df200b6c373e7 100644
+index 1dfaad983ed6d6babf88fb5cd512378110d09143..0c928efa4e11a85901ece3dbc849c8c0c652cc71 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1148,10 +1148,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0273-Add-death-screen-API.patch b/patches/server/0272-Add-death-screen-API.patch
similarity index 100%
rename from patches/server/0273-Add-death-screen-API.patch
rename to patches/server/0272-Add-death-screen-API.patch
diff --git a/patches/server/0274-Make-pufferfish-config-relocatable.patch b/patches/server/0273-Make-pufferfish-config-relocatable.patch
similarity index 100%
rename from patches/server/0274-Make-pufferfish-config-relocatable.patch
rename to patches/server/0273-Make-pufferfish-config-relocatable.patch
diff --git a/patches/server/0275-Implement-ram-and-rambar-commands.patch b/patches/server/0274-Implement-ram-and-rambar-commands.patch
similarity index 99%
rename from patches/server/0275-Implement-ram-and-rambar-commands.patch
rename to patches/server/0274-Implement-ram-and-rambar-commands.patch
index f0e5e0658..148255826 100644
--- a/patches/server/0275-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0274-Implement-ram-and-rambar-commands.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement ram and rambar commands
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index c1202a56b560269e132eafd8bb12383473d4d33e..815af29d1aae935264a400bdb9c3d676e81a841a 100644
+index 2fd8940727e4f361c67114794233d4ddc6548dbb..f50258436fd80e0793d867c67ad5653cb13b6609 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -256,6 +256,8 @@ public class Commands {
diff --git a/patches/server/0276-Add-item-packet-serialize-event.patch b/patches/server/0275-Add-item-packet-serialize-event.patch
similarity index 97%
rename from patches/server/0276-Add-item-packet-serialize-event.patch
rename to patches/server/0275-Add-item-packet-serialize-event.patch
index d961628b5..e8f93a227 100644
--- a/patches/server/0276-Add-item-packet-serialize-event.patch
+++ b/patches/server/0275-Add-item-packet-serialize-event.patch
@@ -48,7 +48,7 @@ index b563b1d4129cf3fb15f5ab4e08acfd380d0ddf12..f69976dcba060027c67c2e1b49fa28d3
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba3548498044bbfd8e73967ac3dcec9b8d0a3b88..819906c465debe02192084968bf3d17d69cdd8c8 100644
+index cb2ecffbac74b78aedc38736ca615c47abaa9d5d..68d4ccd7ae5719e66fd3f14e5bfce4675eb73a17 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3380,6 +3380,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0277-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0276-Add-an-option-to-fix-MC-3304-projectile-looting.patch
similarity index 98%
rename from patches/server/0277-Add-an-option-to-fix-MC-3304-projectile-looting.patch
rename to patches/server/0276-Add-an-option-to-fix-MC-3304-projectile-looting.patch
index 6993b1c4d..6b8f51c09 100644
--- a/patches/server/0277-Add-an-option-to-fix-MC-3304-projectile-looting.patch
+++ b/patches/server/0276-Add-an-option-to-fix-MC-3304-projectile-looting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add an option to fix MC-3304 (projectile looting)
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 49b55db16c8c2f389fb6990b3b3ad7dc29eb10c3..0dad432fdff9156e09a57f5776fd3307b1577558 100644
+index 8127456194ef6bdd6212553d0d78618519e6a429..e352dc0fa07f0b5431c4d4b2cff95fa3485d31dd 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -74,6 +74,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0278-Configurable-block-blast-resistance.patch b/patches/server/0277-Configurable-block-blast-resistance.patch
similarity index 96%
rename from patches/server/0278-Configurable-block-blast-resistance.patch
rename to patches/server/0277-Configurable-block-blast-resistance.patch
index 8b504364c..6442cb4ea 100644
--- a/patches/server/0278-Configurable-block-blast-resistance.patch
+++ b/patches/server/0277-Configurable-block-blast-resistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable block blast resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 06b07927aba82084bd2996be92b9e340a9bf2ad2..0b6ab25fb59a7dd713a0fa9063f8590cad8414de 100644
+index 7875df22641e9eb152135c87b86d30a0c6158858..6aebdd936728be10b5cbf0a71fd9a2a66596afc0 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -85,7 +85,7 @@ public abstract class BlockBehaviour implements FeatureElement {
diff --git a/patches/server/0279-Configurable-block-fall-damage-modifiers.patch b/patches/server/0278-Configurable-block-fall-damage-modifiers.patch
similarity index 100%
rename from patches/server/0279-Configurable-block-fall-damage-modifiers.patch
rename to patches/server/0278-Configurable-block-fall-damage-modifiers.patch
diff --git a/patches/server/0280-Language-API.patch b/patches/server/0279-Language-API.patch
similarity index 93%
rename from patches/server/0280-Language-API.patch
rename to patches/server/0279-Language-API.patch
index 7f4b559fb..f9e28ff77 100644
--- a/patches/server/0280-Language-API.patch
+++ b/patches/server/0279-Language-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Language API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e4f0b1a5b2165610c533f9a661341e5c46ffb63e..aef22db014c81332ba599ddb931afb264dc12a84 100644
+index 067164b3698bcb89ae2f8d09cb7009108a999670..aa04387019f2aef5e7e54a9654c05f832d508295 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -398,6 +398,20 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0281-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0280-Milk-Keeps-Beneficial-Effects.patch
similarity index 95%
rename from patches/server/0281-Milk-Keeps-Beneficial-Effects.patch
rename to patches/server/0280-Milk-Keeps-Beneficial-Effects.patch
index 64696e48f..4c666c93c 100644
--- a/patches/server/0281-Milk-Keeps-Beneficial-Effects.patch
+++ b/patches/server/0280-Milk-Keeps-Beneficial-Effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ae8efb754e89c925647aa515f2e5bfc4c75a3857..1425a8321e3bc988a88ca45e3d3f0fcee18df58f 100644
+index f9e035405c42fbe0a8c0dca2157798d69214914b..8fd6e46882a1828abdf858c0b10f955c9f2718eb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1123,6 +1123,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -30,7 +30,7 @@ index 08320248a6956d41d60681e3d29f81768c80fd3d..237247cb91248eb2d05e967e95cb8ad0
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
          this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c7584f2cd12a75f61ca94100718df200b6c373e7..e3d9bd8fc246771a6d612d0c834a47c7a3255f74 100644
+index 0c928efa4e11a85901ece3dbc849c8c0c652cc71..1fc1c9d3f90fec901bddce5e55ab682bfa495b8f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -128,6 +128,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0282-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0281-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
similarity index 100%
rename from patches/server/0282-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
rename to patches/server/0281-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
diff --git a/patches/server/0283-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0282-Add-log-suppression-for-LibraryLoader.patch
similarity index 100%
rename from patches/server/0283-Add-log-suppression-for-LibraryLoader.patch
rename to patches/server/0282-Add-log-suppression-for-LibraryLoader.patch
diff --git a/patches/server/0284-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0283-Add-option-to-allow-creeper-to-encircle-target-when-.patch
similarity index 96%
rename from patches/server/0284-Add-option-to-allow-creeper-to-encircle-target-when-.patch
rename to patches/server/0283-Add-option-to-allow-creeper-to-encircle-target-when-.patch
index 23904467d..f819c8dab 100644
--- a/patches/server/0284-Add-option-to-allow-creeper-to-encircle-target-when-.patch
+++ b/patches/server/0283-Add-option-to-allow-creeper-to-encircle-target-when-.patch
@@ -24,7 +24,7 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..7b99c3446b50939241d3e220d93e0564
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e3d9bd8fc246771a6d612d0c834a47c7a3255f74..39726c991874b631545e0a06fa5b06383e7b7115 100644
+index 1fc1c9d3f90fec901bddce5e55ab682bfa495b8f..92d16b3c5f2170c30019c093ca81aa85c92d0828 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1422,6 +1422,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0285-Fire-Immunity-API.patch b/patches/server/0284-Fire-Immunity-API.patch
similarity index 100%
rename from patches/server/0285-Fire-Immunity-API.patch
rename to patches/server/0284-Fire-Immunity-API.patch
diff --git a/patches/server/0286-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0285-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
similarity index 96%
rename from patches/server/0286-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
rename to patches/server/0285-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
index 34649b32b..1b9a56822 100644
--- a/patches/server/0286-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
+++ b/patches/server/0285-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
@@ -17,7 +17,7 @@ index 7d0aee4be3a240df18b47c583581ad9c7af5fdb6..251b336c1915f173c975fd0c568dfb04
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 39726c991874b631545e0a06fa5b06383e7b7115..7234603063091d3999f71e5d7781c6468665c8f3 100644
+index 92d16b3c5f2170c30019c093ca81aa85c92d0828..029e989caeb427997821216d14ef03b2099bcd58 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -417,6 +417,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0287-Added-got-ram-event.patch b/patches/server/0286-Added-got-ram-event.patch
similarity index 100%
rename from patches/server/0287-Added-got-ram-event.patch
rename to patches/server/0286-Added-got-ram-event.patch
diff --git a/patches/server/0288-Log-skipped-entity-s-position.patch b/patches/server/0287-Log-skipped-entity-s-position.patch
similarity index 100%
rename from patches/server/0288-Log-skipped-entity-s-position.patch
rename to patches/server/0287-Log-skipped-entity-s-position.patch
diff --git a/patches/server/0289-End-Crystal-Cramming.patch b/patches/server/0288-End-Crystal-Cramming.patch
similarity index 96%
rename from patches/server/0289-End-Crystal-Cramming.patch
rename to patches/server/0288-End-Crystal-Cramming.patch
index 0dae8b87c..f972b87aa 100644
--- a/patches/server/0289-End-Crystal-Cramming.patch
+++ b/patches/server/0288-End-Crystal-Cramming.patch
@@ -17,7 +17,7 @@ index 564d17bc460e2a04947ff9676fbf4c8b1569659c..440add62fcfa62d483409e1aecfc9159
  
          // Purpur start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7234603063091d3999f71e5d7781c6468665c8f3..8f7f5b89efadc60dc8f95b5b4e002836b758be7c 100644
+index 029e989caeb427997821216d14ef03b2099bcd58..cd0ce2e5e80ab2519247d8e6cfa2084455101034 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -947,6 +947,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0290-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0289-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
similarity index 97%
rename from patches/server/0290-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
rename to patches/server/0289-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
index 0251391a6..03fc4c199 100644
--- a/patches/server/0290-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
+++ b/patches/server/0289-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
@@ -36,7 +36,7 @@ index a5f9747be5503dd24abd98f11cfa8229448ca3bf..99ef8d7e3ee0ee9777d12ad825e728c3
                  BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8f7f5b89efadc60dc8f95b5b4e002836b758be7c..6523578f35da2977567f0011a9f9f9a96b538560 100644
+index cd0ce2e5e80ab2519247d8e6cfa2084455101034..36aa99f6dd6fad2185890e5a3e126ae3a14aff06 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -846,11 +846,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0291-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0290-Add-attribute-clamping-and-armor-limit-config.patch
similarity index 100%
rename from patches/server/0291-Add-attribute-clamping-and-armor-limit-config.patch
rename to patches/server/0290-Add-attribute-clamping-and-armor-limit-config.patch
diff --git a/patches/server/0292-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0291-Config-to-remove-explosion-radius-clamp.patch
similarity index 95%
rename from patches/server/0292-Config-to-remove-explosion-radius-clamp.patch
rename to patches/server/0291-Config-to-remove-explosion-radius-clamp.patch
index 15e7361a6..7ac6a5f80 100644
--- a/patches/server/0292-Config-to-remove-explosion-radius-clamp.patch
+++ b/patches/server/0291-Config-to-remove-explosion-radius-clamp.patch
@@ -27,7 +27,7 @@ index 17abd085b3faf88e10a44a6c98af996892cc4e58..0c08a07d3d1efa35646dbaa5cc887bf9
          }
          // CraftBukkit end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6523578f35da2977567f0011a9f9f9a96b538560..2bb310f0a7c94f036c0e849d8a3defb47a115f04 100644
+index 36aa99f6dd6fad2185890e5a3e126ae3a14aff06..d809d6062e3ecfd8c86c7dcc712363430ed88923 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -213,6 +213,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0293-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0292-bonemealable-sugarcane-cactus-and-netherwart.patch
similarity index 98%
rename from patches/server/0293-bonemealable-sugarcane-cactus-and-netherwart.patch
rename to patches/server/0292-bonemealable-sugarcane-cactus-and-netherwart.patch
index dff31886d..8d8938d71 100644
--- a/patches/server/0293-bonemealable-sugarcane-cactus-and-netherwart.patch
+++ b/patches/server/0292-bonemealable-sugarcane-cactus-and-netherwart.patch
@@ -137,7 +137,7 @@ index ceaec1776067b7635c3952025f00f13f4ea86c88..8b6c43b0a2fb4b89d6f63716e56074ef
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2bb310f0a7c94f036c0e849d8a3defb47a115f04..ec46c926e6df9101322df22853d03eba05b48896 100644
+index d809d6062e3ecfd8c86c7dcc712363430ed88923..856a7576ecfb8d2ca5bffa594ad9da6f605917ab 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -900,8 +900,20 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0294-Add-PreExplodeEvents.patch b/patches/server/0293-Add-PreExplodeEvents.patch
similarity index 100%
rename from patches/server/0294-Add-PreExplodeEvents.patch
rename to patches/server/0293-Add-PreExplodeEvents.patch
diff --git a/patches/server/0295-Improve-output-of-plugins-command.patch b/patches/server/0294-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/server/0295-Improve-output-of-plugins-command.patch
rename to patches/server/0294-Improve-output-of-plugins-command.patch
diff --git a/patches/server/0296-Add-mending-multiplier.patch b/patches/server/0295-Add-mending-multiplier.patch
similarity index 92%
rename from patches/server/0296-Add-mending-multiplier.patch
rename to patches/server/0295-Add-mending-multiplier.patch
index b41257e2d..0efcbf1f8 100644
--- a/patches/server/0296-Add-mending-multiplier.patch
+++ b/patches/server/0295-Add-mending-multiplier.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mending multiplier
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index a3ef8e6a698df4c78e0494da48063ddd29caf62f..1b8f5680c4122c7b6b19e2bc1ed6295caa024622 100644
+index 01f375047998cb68b3ec704aef9f050c9f0630dc..e594a6f318d34debdf884d4d98b11d53b4b8734a 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -359,13 +359,15 @@ public class ExperienceOrb extends Entity {
@@ -27,7 +27,7 @@ index a3ef8e6a698df4c78e0494da48063ddd29caf62f..1b8f5680c4122c7b6b19e2bc1ed6295c
      public int getValue() {
          return this.value;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ec46c926e6df9101322df22853d03eba05b48896..2c9c5f8e432f076559bdb88e4485399ff74c8cd5 100644
+index 856a7576ecfb8d2ca5bffa594ad9da6f605917ab..4fa20bdc2a9ca0906f4fd32d7b1d2590da6094a3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -119,6 +119,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0297-Make-GUI-Great-Again.patch b/patches/server/0296-Make-GUI-Great-Again.patch
similarity index 100%
rename from patches/server/0297-Make-GUI-Great-Again.patch
rename to patches/server/0296-Make-GUI-Great-Again.patch
diff --git a/patches/server/0298-Stored-Bee-API.patch b/patches/server/0297-Stored-Bee-API.patch
similarity index 100%
rename from patches/server/0298-Stored-Bee-API.patch
rename to patches/server/0297-Stored-Bee-API.patch
diff --git a/patches/server/0299-Shears-can-defuse-TNT.patch b/patches/server/0298-Shears-can-defuse-TNT.patch
similarity index 95%
rename from patches/server/0299-Shears-can-defuse-TNT.patch
rename to patches/server/0298-Shears-can-defuse-TNT.patch
index f43459e76..258a72eb9 100644
--- a/patches/server/0299-Shears-can-defuse-TNT.patch
+++ b/patches/server/0298-Shears-can-defuse-TNT.patch
@@ -42,10 +42,10 @@ index c3e47426382296d650fa00ce0bc1a82bf23c7877..dfc3e9d2611ce418ac6f6cc5a23bb744
 +    // Purpur end - Shears can defuse TNT
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2c9c5f8e432f076559bdb88e4485399ff74c8cd5..3cefadcca5c0ab367fbb15a1b8565aed8f7e8689 100644
+index 4fa20bdc2a9ca0906f4fd32d7b1d2590da6094a3..4d6679eba841dc6d9b2d227d99ab5842adb1caeb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -3288,4 +3288,11 @@ public class PurpurWorldConfig {
+@@ -3284,4 +3284,11 @@ public class PurpurWorldConfig {
          cauldronDripstoneWaterFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-water", cauldronDripstoneWaterFillChance);
          cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance);
      }
diff --git a/patches/server/0300-Explorer-Map-API.patch b/patches/server/0299-Explorer-Map-API.patch
similarity index 100%
rename from patches/server/0300-Explorer-Map-API.patch
rename to patches/server/0299-Explorer-Map-API.patch
diff --git a/patches/server/0301-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0300-Option-Ocelot-Spawn-Under-Sea-Level.patch
similarity index 95%
rename from patches/server/0301-Option-Ocelot-Spawn-Under-Sea-Level.patch
rename to patches/server/0300-Option-Ocelot-Spawn-Under-Sea-Level.patch
index f36aa2272..beb3ac572 100644
--- a/patches/server/0301-Option-Ocelot-Spawn-Under-Sea-Level.patch
+++ b/patches/server/0300-Option-Ocelot-Spawn-Under-Sea-Level.patch
@@ -18,7 +18,7 @@ index af275fc579d66bb098c08e88e4186846a1174c02..3c5f25300d1c7800144a459cc8bf5983
              }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3cefadcca5c0ab367fbb15a1b8565aed8f7e8689..8da2d5defa55484dcaf7f448db586b412479fdb6 100644
+index 4d6679eba841dc6d9b2d227d99ab5842adb1caeb..2f0e119e6e630eba8229011d42185de40860f202 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -2101,6 +2101,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0302-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0301-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
similarity index 97%
rename from patches/server/0302-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
rename to patches/server/0301-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
index c1da3ff32..6211f52a7 100644
--- a/patches/server/0302-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
+++ b/patches/server/0301-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
@@ -45,7 +45,7 @@ index 372d084609216d5437b92ee60810a9efbb0b6f31..a5a7ea0ddad31e3633647f823df86ddb
          piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET);
          piglin.getNavigation().stop();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8da2d5defa55484dcaf7f448db586b412479fdb6..eeaf4da4dff16d89f5e7ab350b411800c4fbfa88 100644
+index 2f0e119e6e630eba8229011d42185de40860f202..c1354f18f7dd11d1f28f37d38ad4db4b671e3af1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -2270,6 +2270,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0303-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch
similarity index 100%
rename from patches/server/0303-Add-option-for-always-showing-item-in-player-death-m.patch
rename to patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch
diff --git a/patches/server/0304-place-end-crystal-on-any-block.patch b/patches/server/0303-place-end-crystal-on-any-block.patch
similarity index 96%
rename from patches/server/0304-place-end-crystal-on-any-block.patch
rename to patches/server/0303-place-end-crystal-on-any-block.patch
index 96733c1dc..bc7ea97f2 100644
--- a/patches/server/0304-place-end-crystal-on-any-block.patch
+++ b/patches/server/0303-place-end-crystal-on-any-block.patch
@@ -18,7 +18,7 @@ index 3688e9f8c6c6d1239095e3a87060ccca90386d0c..34254eec36d34ae343733fa1abbaaba6
          } else {
              BlockPos blockposition1 = blockposition.above(); final BlockPos aboveBlockPosition = blockposition1; // Paper - OBFHELPER
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index eeaf4da4dff16d89f5e7ab350b411800c4fbfa88..fb7bdaa64002729f9f9cd0fbbd2ae289643628b4 100644
+index c1354f18f7dd11d1f28f37d38ad4db4b671e3af1..68b86e3f9914b05312b94cc9f16ad8c39de103c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -969,6 +969,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0305-Add-hover-lines-API.patch b/patches/server/0304-Add-hover-lines-API.patch
similarity index 100%
rename from patches/server/0305-Add-hover-lines-API.patch
rename to patches/server/0304-Add-hover-lines-API.patch
diff --git a/patches/server/0306-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0305-Add-option-to-disable-the-copper-oxidation-proximity.patch
similarity index 96%
rename from patches/server/0306-Add-option-to-disable-the-copper-oxidation-proximity.patch
rename to patches/server/0305-Add-option-to-disable-the-copper-oxidation-proximity.patch
index 0174a203c..1d6285652 100644
--- a/patches/server/0306-Add-option-to-disable-the-copper-oxidation-proximity.patch
+++ b/patches/server/0305-Add-option-to-disable-the-copper-oxidation-proximity.patch
@@ -18,7 +18,7 @@ index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2
          return random.nextFloat() < f1 ? this.getNext(state) : Optional.empty();
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fb7bdaa64002729f9f9cd0fbbd2ae289643628b4..bbf371428e343cfad0ae118c387fd2342541fe53 100644
+index 68b86e3f9914b05312b94cc9f16ad8c39de103c6..dab252cbadffbcdf19bacc0b378d671b29393e9c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -145,6 +145,7 @@ public class PurpurWorldConfig {