From 31306b4b0ebcbdaea258b30a7f24495defaaca26 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 21 Jul 2021 10:49:16 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b79bc31 Fix MerchantOffer BuyB Only AssertionError (#6206)
d6c81c8 Don't apply cramming damage to players (#5903)
12942dc Add rate options and timings for sensors and behaviors (#6027)
fc47872 Use mapped names for sensor and behavior timings/config (#6228)
c75a837 Don't expose ASM in API (#6229)
c225bf9 Fix book title and author being improperly serialized as components (#6190)
f25facb Update email & name (DenWav)
44516b1 [ci skip] Put mappings util in a separate class to the stacktrace deobfuscator
---
 gradle.properties                             |  2 +-
 patches/api/0002-Build-System-Changes.patch   | 12 +--
 .../server/0001-Tuinity-Server-Changes.patch  | 20 ++---
 patches/server/0002-Rebrand.patch             | 10 +--
 patches/server/0003-Purpur-config-files.patch |  4 +-
 patches/server/0023-Silk-touch-spawners.patch |  4 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |  4 +-
 ...050-Players-should-not-cram-to-death.patch | 39 --------
 ...ould-check-if-entity-can-use-portal.patch} |  0
 ...052-Fix-the-dead-lagging-the-server.patch} |  4 +-
 ...Skip-events-if-there-s-no-listeners.patch} |  2 +-
 ... 0054-Add-permission-for-F3-N-debug.patch} |  0
 ...ch => 0055-Configurable-TPS-Catchup.patch} |  0
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |  4 +-
 ...erman-and-creeper-griefing-controls.patch} | 10 +--
 ...058-Villagers-follow-emerald-blocks.patch} | 10 +--
 ...ch => 0059-Allow-leashing-villagers.patch} | 10 +--
 ...rable-search-radius-for-villagers-t.patch} |  6 +-
 ...tch => 0061-Implement-infinite-lava.patch} |  4 +-
 ...2-Make-lava-flow-speed-configurable.patch} |  4 +-
 ...dd-player-death-exp-control-options.patch} | 10 +--
 ...rable-void-damage-height-and-damage.patch} |  4 +-
 ...=> 0065-Add-canSaveToDisk-to-Entity.patch} |  0
 ...spenser-curse-of-binding-protection.patch} |  4 +-
 ...-for-boats-to-eject-players-on-land.patch} |  4 +-
 ...-mends-most-damages-equipment-first.patch} |  8 +-
 ...069-Add-5-second-tps-average-in-tps.patch} |  2 +-
 ...h => 0070-Implement-elytra-settings.patch} |  4 +-
 ...atch => 0071-Item-entity-immunities.patch} |  2 +-
 ...mand.patch => 0072-Add-ping-command.patch} |  0
 ...mand.patch => 0073-Add-demo-command.patch} |  0
 ...d.patch => 0074-Add-credits-command.patch} |  0
 ...=> 0075-Configurable-jockey-options.patch} | 20 ++---
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  6 +-
 ...> 0077-Add-phantom-spawning-options.patch} |  6 +-
 ...078-Implement-bed-explosion-options.patch} |  4 +-
 ...nt-respawn-anchor-explosion-options.patch} |  4 +-
 ...Add-allow-water-in-end-world-option.patch} |  0
 ... => 0081-Allow-color-codes-in-books.patch} |  2 +-
 ...espan.patch => 0082-Entity-lifespan.patch} |  2 +-
 ...eport-to-spawn-if-outside-world-bor.patch} | 12 +--
 ...ty.patch => 0084-Squid-EAR-immunity.patch} |  6 +-
 ...-Configurable-feature-seed-settings.patch} |  0
 ...atch => 0086-Phantoms-burn-in-light.patch} |  6 +-
 ...0087-Configurable-villager-breeding.patch} |  6 +-
 ... 0088-Redstone-deactivates-spawners.patch} |  4 +-
 ...ch => 0089-Totems-work-in-inventory.patch} |  6 +-
 ...-Add-vindicator-johnny-spawn-chance.patch} |  6 +-
 ...on-to-disable-certain-block-updates.patch} |  0
 ...0092-Dispensers-place-anvils-option.patch} |  4 +-
 ...rs.patch => 0093-Allow-anvil-colors.patch} |  4 +-
 ... 0094-Add-no-random-tick-block-list.patch} |  4 +-
 ...-disable-dolphin-treasure-searching.patch} |  6 +-
 ...patch => 0096-Short-enderman-height.patch} |  0
 ...top-squids-floating-on-top-of-water.patch} |  6 +-
 ...-height-for-nether-surface-builders.patch} |  0
 ...ng-obsidian-valid-for-portal-frames.patch} |  0
 ...ities-can-use-portals-configuration.patch} |  6 +-
 ...101-LivingEntity-broadcastItemBreak.patch} |  0
 ...tomizable-wither-health-and-healing.patch} |  6 +-
 ...gling-special-MobSpawners-per-world.patch} |  2 +-
 ...patch => 0104-Raid-cooldown-setting.patch} |  6 +-
 ...-config-options-per-projectile-type.patch} |  4 +-
 ...able-zombie-aggressiveness-towards-.patch} |  6 +-
 ...ent-TileEntity-Lore-and-DisplayName.patch} |  6 +-
 ...-to-recipe-s-ExactChoice-ingredient.patch} |  0
 ...y.patch => 0109-Flying-squids-Oh-my.patch} |  8 +-
 ...patch => 0110-Infinity-bow-settings.patch} |  2 +-
 ...ge.patch => 0111-Stonecutter-damage.patch} |  4 +-
 ...=> 0112-Configurable-daylight-cycle.patch} |  2 +-
 ...e-and-mending-enchantments-together.patch} |  0
 ...4-Furnace-uses-lava-from-underneath.patch} |  4 +-
 ...ws-should-not-reset-despawn-counter.patch} |  0
 ...e-add-farmland-mechanics-from-Alpha.patch} |  4 +-
 ...ustable-breeding-cooldown-to-config.patch} |  6 +-
 ...-entity-breeding-times-configurable.patch} | 90 +++++++++----------
 ...es-from-item-forms-of-entities-to-e.patch} |  6 +-
 ...when-using-a-Name-Tag-on-an-Armor-S.patch} |  2 +-
 ...ting-and-weeping-vines-growth-rates.patch} |  6 +-
 ...twisting-vines-configurable-max-gro.patch} |  8 +-
 ...lowing-Endermen-to-despawn-even-whi.patch} |  6 +-
 ...check-to-EntityDamagedByEntityEvent.patch} |  0
 ...25-Add-configurable-snowball-damage.patch} |  4 +-
 ...reak-door-minimum-difficulty-option.patch} |  6 +-
 ...d-API.patch => 0127-Left-handed-API.patch} |  0
 ...8-Changeable-Mob-Left-Handed-Chance.patch} |  2 +-
 ...=> 0129-Add-boat-fall-damage-config.patch} |  8 +-
 ...0130-Snow-Golem-rate-of-fire-config.patch} |  6 +-
 ...-option-for-Piglins-guarding-chests.patch} |  4 +-
 ...-Configurable-disable-give-dropping.patch} |  0
 ... => 0133-Lobotomize-stuck-villagers.patch} |  6 +-
 ...illager-Clerics-to-farm-Nether-Wart.patch} |  6 +-
 ...ied-Piglin-death-always-counting-as.patch} |  6 +-
 ...timise-player-list-ticksSpread-out-.patch} |  2 +-
 ...le-chance-for-wolves-to-spawn-rabid.patch} |  6 +-
 ...figurable-default-wolf-collar-color.patch} |  6 +-
 ...tch => 0139-Phantom-flames-on-swoop.patch} |  6 +-
 ...-to-open-even-with-a-solid-block-on.patch} |  4 +-
 ...SBar.patch => 0141-Implement-TPSBar.patch} |  4 +-
 ...h => 0142-Striders-give-saddle-back.patch} |  6 +-
 ...tch => 0143-PlayerBookTooLargeEvent.patch} |  2 +-
 ...herite-armor-grants-fire-resistance.patch} |  2 +-
 ...145-Fix-rotating-UP-DOWN-CW-and-CCW.patch} |  0
 ...ack.patch => 0146-Add-MC-4-fix-back.patch} |  0
 ...efing-bypass-to-everything-affected.patch} | 70 +++++++--------
 ...llow-Note-Block-sounds-when-blocked.patch} |  6 +-
 ...149-Add-EntityTeleportHinderedEvent.patch} |  6 +-
 ... => 0150-Add-StructureGenerateEvent.patch} |  0
 ... => 0151-Farmland-trampling-changes.patch} |  4 +-
 ...2-Movement-options-for-armor-stands.patch} |  2 +-
 ....patch => 0153-Fix-stuck-in-portals.patch} |  8 +-
 ...ggle-for-water-sensitive-mob-damage.patch} | 18 ++--
 ...5-Config-to-always-tame-in-Creative.patch} |  6 +-
 ... 0156-End-crystal-explosion-options.patch} |  4 +-
 ...Add-unsafe-Entity-serialization-API.patch} |  2 +-
 ...ther-Ender-Dragon-can-ride-vehicles.patch} | 10 +--
 ...atch => 0159-Dont-run-with-scissors.patch} |  4 +-
 ...nch-Man.patch => 0160-One-Punch-Man.patch} |  6 +-
 ...161-Add-config-for-snow-on-blue-ice.patch} |  4 +-
 ...r-Pearl-cooldown-damage-and-Endermi.patch} |  2 +-
 ...to-ignore-nearby-mobs-when-sleeping.patch} |  8 +-
 ...d-back-player-spawned-endermite-API.patch} |  0
 ...n-aggressiveness-towards-Endermites.patch} |  6 +-
 ...Dragon-Head-wearers-and-stare-aggro.patch} |  6 +-
 ...ig.patch => 0167-Tick-fluids-config.patch} |  6 +-
 ...68-Config-to-disable-Llama-caravans.patch} |  6 +-
 ...g-to-make-Creepers-explode-on-death.patch} |  6 +-
 ...rable-ravager-griefable-blocks-list.patch} |  6 +-
 ...171-Sneak-to-bulk-process-composter.patch} |  4 +-
 ...h => 0172-Config-for-skipping-night.patch} |  6 +-
 ...173-Add-config-for-villager-trading.patch} | 10 +--
 ...=> 0174-Allow-infinity-on-crossbows.patch} |  0
 ...ngs.patch => 0175-Drowning-Settings.patch} |  2 +-
 ...reak-individual-slabs-when-sneaking.patch} |  4 +-
 ...to-disable-hostile-mob-spawn-on-ice.patch} |  4 +-
 ...g-to-show-Armor-Stand-arms-on-spawn.patch} |  2 +-
 ...tion-to-make-doors-require-redstone.patch} |  4 +-
 ...Config-to-allow-for-unsafe-enchants.patch} |  2 +-
 ...0181-Configurable-sponge-absorption.patch} |  4 +-
 ...ch => 0182-Projectile-offset-config.patch} |  4 +-
 ...or-powered-rail-activation-distance.patch} |  4 +-
 ...> 0184-Piglin-portal-spawn-modifier.patch} |  6 +-
 ...Config-to-change-max-number-of-bees.patch} |  0
 ...le-damage-settings-for-magma-blocks.patch} |  4 +-
 ...-Config-for-wither-explosion-radius.patch} |  6 +-
 ... => 0188-Gamemode-extra-permissions.patch} |  0
 ...ng-the-blocks-that-turn-into-dirt-p.patch} |  4 +-
 ...0190-Configurable-piston-push-limit.patch} |  4 +-
 ...191-Configurable-broadcast-settings.patch} |  2 +-
 ...-6278.patch => 0192-Fix-SPIGOT-6278.patch} |  0
 ... => 0193-Configurable-mob-blindness.patch} |  6 +-
 ...hidden-players-from-entity-selector.patch} |  0
 ...-to-impact-Creeper-explosion-radius.patch} |  6 +-
 ...> 0196-Iron-golem-poppy-calms-anger.patch} |  6 +-
 ...ots.patch => 0197-Breedable-parrots.patch} |  6 +-
 ...gurable-powered-rail-boost-modifier.patch} |  2 +-
 ...ge-multiplier-critical-damage-value.patch} |  6 +-
 ...n-to-disable-dragon-egg-teleporting.patch} |  4 +-
 ...fig-for-unverified-username-message.patch} |  2 +-
 ...-anvil-cumulative-cost-configurable.patch} |  0
 ...3-ShulkerBox-allow-oversized-stacks.patch} |  4 +-
 ...e-can-work-when-raining-or-at-night.patch} |  6 +-
 ...05-API-for-any-mob-to-burn-daylight.patch} |  2 +-
 ...dvancement-triggers-on-entity-death.patch} |  2 +-
 ...h => 0207-Config-MobEffect-by-world.patch} |  2 +-
 ...eacon-Activation-Range-Configurable.patch} |  4 +-
 ...0209-Add-toggle-for-sand-duping-fix.patch} |  4 +-
 ...gle-for-end-portal-safe-teleporting.patch} |  4 +-
 ...atch => 0211-Flying-Fall-Damage-API.patch} |  2 +-
 ...ke-lightning-rod-range-configurable.patch} |  0
 ...ng-food-fills-hunger-bar-completely.patch} |  6 +-
 ...ayer-join-full-server-by-permission.patch} |  0
 ...tch => 0215-Populator-seed-controls.patch} |  4 +-
 ...ermission-bypass-for-portal-waiting.patch} |  0
 ...7-Shulker-spawn-from-bullet-options.patch} |  6 +-
 ...ating-glow-berries-adds-glow-effect.patch} |  2 +-
 ...-Option-to-make-drowned-break-doors.patch} |  6 +-
 ...nfigurable-hunger-starvation-damage.patch} |  4 +-
 ...-System.out-calls-to-plugin-loggers.patch} |  2 +-
 ...h => 0222-Armor-click-equip-options.patch} |  6 +-
 ...nd.patch => 0223-Add-uptime-command.patch} |  0
 ...atch => 0224-Structure-seed-options.patch} |  2 +-
 ...tch => 0225-Tool-actionable-options.patch} |  4 +-
 ...-bed-respawn-location-not-resetting.patch} |  0
 ...7-Store-placer-on-Block-when-placed.patch} |  2 +-
 ...oner-API.patch => 0228-Summoner-API.patch} |  0
 ...mizable-sleeping-actionbar-messages.patch} |  0
 ...-shulker-box-items-from-dropping-co.patch} |  2 +-
 ...231-Silk-touchable-budding-amethyst.patch} |  4 +-
 ...tch => 0232-Big-dripleaf-tilt-delay.patch} |  4 +-
 ...0233-Player-ridable-in-water-option.patch} |  6 +-
 ...-Enderman-teleport-on-projectile-hi.patch} |  6 +-
 192 files changed, 469 insertions(+), 508 deletions(-)
 rename patches/server/{0051-Option-to-toggle-milk-curing-bad-omen.patch => 0050-Option-to-toggle-milk-curing-bad-omen.patch} (93%)
 delete mode 100644 patches/server/0050-Players-should-not-cram-to-death.patch
 rename patches/server/{0052-End-gateway-should-check-if-entity-can-use-portal.patch => 0051-End-gateway-should-check-if-entity-can-use-portal.patch} (100%)
 rename patches/server/{0053-Fix-the-dead-lagging-the-server.patch => 0052-Fix-the-dead-lagging-the-server.patch} (88%)
 rename patches/server/{0054-Skip-events-if-there-s-no-listeners.patch => 0053-Skip-events-if-there-s-no-listeners.patch} (93%)
 rename patches/server/{0055-Add-permission-for-F3-N-debug.patch => 0054-Add-permission-for-F3-N-debug.patch} (100%)
 rename patches/server/{0056-Configurable-TPS-Catchup.patch => 0055-Configurable-TPS-Catchup.patch} (100%)
 rename patches/server/{0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (93%)
 rename patches/server/{0058-Add-enderman-and-creeper-griefing-controls.patch => 0057-Add-enderman-and-creeper-griefing-controls.patch} (93%)
 rename patches/server/{0059-Villagers-follow-emerald-blocks.patch => 0058-Villagers-follow-emerald-blocks.patch} (94%)
 rename patches/server/{0060-Allow-leashing-villagers.patch => 0059-Allow-leashing-villagers.patch} (94%)
 rename patches/server/{0061-Implement-configurable-search-radius-for-villagers-t.patch => 0060-Implement-configurable-search-radius-for-villagers-t.patch} (92%)
 rename patches/server/{0062-Implement-infinite-lava.patch => 0061-Implement-infinite-lava.patch} (95%)
 rename patches/server/{0063-Make-lava-flow-speed-configurable.patch => 0062-Make-lava-flow-speed-configurable.patch} (92%)
 rename patches/server/{0064-Add-player-death-exp-control-options.patch => 0063-Add-player-death-exp-control-options.patch} (88%)
 rename patches/server/{0065-Configurable-void-damage-height-and-damage.patch => 0064-Configurable-void-damage-height-and-damage.patch} (95%)
 rename patches/server/{0066-Add-canSaveToDisk-to-Entity.patch => 0065-Add-canSaveToDisk-to-Entity.patch} (100%)
 rename patches/server/{0067-Dispenser-curse-of-binding-protection.patch => 0066-Dispenser-curse-of-binding-protection.patch} (95%)
 rename patches/server/{0068-Add-option-for-boats-to-eject-players-on-land.patch => 0067-Add-option-for-boats-to-eject-players-on-land.patch} (93%)
 rename patches/server/{0069-Mending-mends-most-damages-equipment-first.patch => 0068-Mending-mends-most-damages-equipment-first.patch} (94%)
 rename patches/server/{0070-Add-5-second-tps-average-in-tps.patch => 0069-Add-5-second-tps-average-in-tps.patch} (98%)
 rename patches/server/{0071-Implement-elytra-settings.patch => 0070-Implement-elytra-settings.patch} (97%)
 rename patches/server/{0072-Item-entity-immunities.patch => 0071-Item-entity-immunities.patch} (98%)
 rename patches/server/{0073-Add-ping-command.patch => 0072-Add-ping-command.patch} (100%)
 rename patches/server/{0074-Add-demo-command.patch => 0073-Add-demo-command.patch} (100%)
 rename patches/server/{0075-Add-credits-command.patch => 0074-Add-credits-command.patch} (100%)
 rename patches/server/{0076-Configurable-jockey-options.patch => 0075-Configurable-jockey-options.patch} (96%)
 rename patches/server/{0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (98%)
 rename patches/server/{0078-Add-phantom-spawning-options.patch => 0077-Add-phantom-spawning-options.patch} (97%)
 rename patches/server/{0079-Implement-bed-explosion-options.patch => 0078-Implement-bed-explosion-options.patch} (96%)
 rename patches/server/{0080-Implement-respawn-anchor-explosion-options.patch => 0079-Implement-respawn-anchor-explosion-options.patch} (95%)
 rename patches/server/{0081-Add-allow-water-in-end-world-option.patch => 0080-Add-allow-water-in-end-world-option.patch} (100%)
 rename patches/server/{0082-Allow-color-codes-in-books.patch => 0081-Allow-color-codes-in-books.patch} (97%)
 rename patches/server/{0083-Entity-lifespan.patch => 0082-Entity-lifespan.patch} (97%)
 rename patches/server/{0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (87%)
 rename patches/server/{0085-Squid-EAR-immunity.patch => 0084-Squid-EAR-immunity.patch} (91%)
 rename patches/server/{0086-Configurable-feature-seed-settings.patch => 0085-Configurable-feature-seed-settings.patch} (100%)
 rename patches/server/{0087-Phantoms-burn-in-light.patch => 0086-Phantoms-burn-in-light.patch} (95%)
 rename patches/server/{0088-Configurable-villager-breeding.patch => 0087-Configurable-villager-breeding.patch} (91%)
 rename patches/server/{0089-Redstone-deactivates-spawners.patch => 0088-Redstone-deactivates-spawners.patch} (92%)
 rename patches/server/{0090-Totems-work-in-inventory.patch => 0089-Totems-work-in-inventory.patch} (93%)
 rename patches/server/{0091-Add-vindicator-johnny-spawn-chance.patch => 0090-Add-vindicator-johnny-spawn-chance.patch} (92%)
 rename patches/server/{0092-Add-option-to-disable-certain-block-updates.patch => 0091-Add-option-to-disable-certain-block-updates.patch} (100%)
 rename patches/server/{0093-Dispensers-place-anvils-option.patch => 0092-Dispensers-place-anvils-option.patch} (95%)
 rename patches/server/{0094-Allow-anvil-colors.patch => 0093-Allow-anvil-colors.patch} (94%)
 rename patches/server/{0095-Add-no-random-tick-block-list.patch => 0094-Add-no-random-tick-block-list.patch} (96%)
 rename patches/server/{0096-Add-option-to-disable-dolphin-treasure-searching.patch => 0095-Add-option-to-disable-dolphin-treasure-searching.patch} (90%)
 rename patches/server/{0097-Short-enderman-height.patch => 0096-Short-enderman-height.patch} (100%)
 rename patches/server/{0098-Stop-squids-floating-on-top-of-water.patch => 0097-Stop-squids-floating-on-top-of-water.patch} (94%)
 rename patches/server/{0099-Use-configured-height-for-nether-surface-builders.patch => 0098-Use-configured-height-for-nether-surface-builders.patch} (100%)
 rename patches/server/{0100-Crying-obsidian-valid-for-portal-frames.patch => 0099-Crying-obsidian-valid-for-portal-frames.patch} (100%)
 rename patches/server/{0101-Entities-can-use-portals-configuration.patch => 0100-Entities-can-use-portals-configuration.patch} (93%)
 rename patches/server/{0102-LivingEntity-broadcastItemBreak.patch => 0101-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/server/{0103-Customizable-wither-health-and-healing.patch => 0102-Customizable-wither-health-and-healing.patch} (92%)
 rename patches/server/{0104-Allow-toggling-special-MobSpawners-per-world.patch => 0103-Allow-toggling-special-MobSpawners-per-world.patch} (98%)
 rename patches/server/{0105-Raid-cooldown-setting.patch => 0104-Raid-cooldown-setting.patch} (94%)
 rename patches/server/{0106-Despawn-rate-config-options-per-projectile-type.patch => 0105-Despawn-rate-config-options-per-projectile-type.patch} (99%)
 rename patches/server/{0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (96%)
 rename patches/server/{0108-Persistent-TileEntity-Lore-and-DisplayName.patch => 0107-Persistent-TileEntity-Lore-and-DisplayName.patch} (98%)
 rename patches/server/{0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0108-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0110-Flying-squids-Oh-my.patch => 0109-Flying-squids-Oh-my.patch} (94%)
 rename patches/server/{0111-Infinity-bow-settings.patch => 0110-Infinity-bow-settings.patch} (97%)
 rename patches/server/{0112-Stonecutter-damage.patch => 0111-Stonecutter-damage.patch} (96%)
 rename patches/server/{0113-Configurable-daylight-cycle.patch => 0112-Configurable-daylight-cycle.patch} (98%)
 rename patches/server/{0114-Allow-infinite-and-mending-enchantments-together.patch => 0113-Allow-infinite-and-mending-enchantments-together.patch} (100%)
 rename patches/server/{0115-Furnace-uses-lava-from-underneath.patch => 0114-Furnace-uses-lava-from-underneath.patch} (96%)
 rename patches/server/{0116-Arrows-should-not-reset-despawn-counter.patch => 0115-Arrows-should-not-reset-despawn-counter.patch} (100%)
 rename patches/server/{0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (92%)
 rename patches/server/{0118-Add-adjustable-breeding-cooldown-to-config.patch => 0117-Add-adjustable-breeding-cooldown-to-config.patch} (97%)
 rename patches/server/{0119-Make-entity-breeding-times-configurable.patch => 0118-Make-entity-breeding-times-configurable.patch} (94%)
 rename patches/server/{0120-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0119-Apply-display-names-from-item-forms-of-entities-to-e.patch} (98%)
 rename patches/server/{0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (95%)
 rename patches/server/{0122-Add-twisting-and-weeping-vines-growth-rates.patch => 0121-Add-twisting-and-weeping-vines-growth-rates.patch} (96%)
 rename patches/server/{0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (96%)
 rename patches/server/{0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (91%)
 rename patches/server/{0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch => 0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch} (100%)
 rename patches/server/{0126-Add-configurable-snowball-damage.patch => 0125-Add-configurable-snowball-damage.patch} (92%)
 rename patches/server/{0127-Zombie-break-door-minimum-difficulty-option.patch => 0126-Zombie-break-door-minimum-difficulty-option.patch} (94%)
 rename patches/server/{0128-Left-handed-API.patch => 0127-Left-handed-API.patch} (100%)
 rename patches/server/{0129-Changeable-Mob-Left-Handed-Chance.patch => 0128-Changeable-Mob-Left-Handed-Chance.patch} (95%)
 rename patches/server/{0130-Add-boat-fall-damage-config.patch => 0129-Add-boat-fall-damage-config.patch} (90%)
 rename patches/server/{0131-Snow-Golem-rate-of-fire-config.patch => 0130-Snow-Golem-rate-of-fire-config.patch} (94%)
 rename patches/server/{0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch => 0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch} (92%)
 rename patches/server/{0133-EMC-Configurable-disable-give-dropping.patch => 0132-EMC-Configurable-disable-give-dropping.patch} (100%)
 rename patches/server/{0134-Lobotomize-stuck-villagers.patch => 0133-Lobotomize-stuck-villagers.patch} (95%)
 rename patches/server/{0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (98%)
 rename patches/server/{0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (93%)
 rename patches/server/{0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch => 0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch} (96%)
 rename patches/server/{0138-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0137-Configurable-chance-for-wolves-to-spawn-rabid.patch} (98%)
 rename patches/server/{0139-Configurable-default-wolf-collar-color.patch => 0138-Configurable-default-wolf-collar-color.patch} (91%)
 rename patches/server/{0140-Phantom-flames-on-swoop.patch => 0139-Phantom-flames-on-swoop.patch} (91%)
 rename patches/server/{0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (92%)
 rename patches/server/{0142-Implement-TPSBar.patch => 0141-Implement-TPSBar.patch} (98%)
 rename patches/server/{0143-Striders-give-saddle-back.patch => 0142-Striders-give-saddle-back.patch} (92%)
 rename patches/server/{0144-PlayerBookTooLargeEvent.patch => 0143-PlayerBookTooLargeEvent.patch} (96%)
 rename patches/server/{0145-Full-netherite-armor-grants-fire-resistance.patch => 0144-Full-netherite-armor-grants-fire-resistance.patch} (97%)
 rename patches/server/{0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%)
 rename patches/server/{0147-Add-MC-4-fix-back.patch => 0146-Add-MC-4-fix-back.patch} (100%)
 rename patches/server/{0148-Add-mobGriefing-bypass-to-everything-affected.patch => 0147-Add-mobGriefing-bypass-to-everything-affected.patch} (96%)
 rename patches/server/{0149-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0148-Config-to-allow-Note-Block-sounds-when-blocked.patch} (93%)
 rename patches/server/{0150-Add-EntityTeleportHinderedEvent.patch => 0149-Add-EntityTeleportHinderedEvent.patch} (98%)
 rename patches/server/{0151-Add-StructureGenerateEvent.patch => 0150-Add-StructureGenerateEvent.patch} (100%)
 rename patches/server/{0152-Farmland-trampling-changes.patch => 0151-Farmland-trampling-changes.patch} (95%)
 rename patches/server/{0153-Movement-options-for-armor-stands.patch => 0152-Movement-options-for-armor-stands.patch} (98%)
 rename patches/server/{0154-Fix-stuck-in-portals.patch => 0153-Fix-stuck-in-portals.patch} (91%)
 rename patches/server/{0155-Toggle-for-water-sensitive-mob-damage.patch => 0154-Toggle-for-water-sensitive-mob-damage.patch} (93%)
 rename patches/server/{0156-Config-to-always-tame-in-Creative.patch => 0155-Config-to-always-tame-in-Creative.patch} (96%)
 rename patches/server/{0157-End-crystal-explosion-options.patch => 0156-End-crystal-explosion-options.patch} (97%)
 rename patches/server/{0158-Add-unsafe-Entity-serialization-API.patch => 0157-Add-unsafe-Entity-serialization-API.patch} (98%)
 rename patches/server/{0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (92%)
 rename patches/server/{0160-Dont-run-with-scissors.patch => 0159-Dont-run-with-scissors.patch} (95%)
 rename patches/server/{0161-One-Punch-Man.patch => 0160-One-Punch-Man.patch} (93%)
 rename patches/server/{0162-Add-config-for-snow-on-blue-ice.patch => 0161-Add-config-for-snow-on-blue-ice.patch} (94%)
 rename patches/server/{0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (98%)
 rename patches/server/{0164-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0163-Config-to-ignore-nearby-mobs-when-sleeping.patch} (88%)
 rename patches/server/{0165-Add-back-player-spawned-endermite-API.patch => 0164-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/server/{0166-Config-Enderman-aggressiveness-towards-Endermites.patch => 0165-Config-Enderman-aggressiveness-towards-Endermites.patch} (94%)
 rename patches/server/{0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (93%)
 rename patches/server/{0168-Tick-fluids-config.patch => 0167-Tick-fluids-config.patch} (94%)
 rename patches/server/{0169-Config-to-disable-Llama-caravans.patch => 0168-Config-to-disable-Llama-caravans.patch} (94%)
 rename patches/server/{0170-Config-to-make-Creepers-explode-on-death.patch => 0169-Config-to-make-Creepers-explode-on-death.patch} (94%)
 rename patches/server/{0171-Configurable-ravager-griefable-blocks-list.patch => 0170-Configurable-ravager-griefable-blocks-list.patch} (95%)
 rename patches/server/{0172-Sneak-to-bulk-process-composter.patch => 0171-Sneak-to-bulk-process-composter.patch} (97%)
 rename patches/server/{0173-Config-for-skipping-night.patch => 0172-Config-for-skipping-night.patch} (92%)
 rename patches/server/{0174-Add-config-for-villager-trading.patch => 0173-Add-config-for-villager-trading.patch} (93%)
 rename patches/server/{0175-Allow-infinity-on-crossbows.patch => 0174-Allow-infinity-on-crossbows.patch} (100%)
 rename patches/server/{0176-Drowning-Settings.patch => 0175-Drowning-Settings.patch} (97%)
 rename patches/server/{0177-Break-individual-slabs-when-sneaking.patch => 0176-Break-individual-slabs-when-sneaking.patch} (95%)
 rename patches/server/{0178-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0177-Config-to-disable-hostile-mob-spawn-on-ice.patch} (93%)
 rename patches/server/{0179-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0178-Config-to-show-Armor-Stand-arms-on-spawn.patch} (96%)
 rename patches/server/{0180-Option-to-make-doors-require-redstone.patch => 0179-Option-to-make-doors-require-redstone.patch} (97%)
 rename patches/server/{0181-Config-to-allow-for-unsafe-enchants.patch => 0180-Config-to-allow-for-unsafe-enchants.patch} (98%)
 rename patches/server/{0182-Configurable-sponge-absorption.patch => 0181-Configurable-sponge-absorption.patch} (95%)
 rename patches/server/{0183-Projectile-offset-config.patch => 0182-Projectile-offset-config.patch} (98%)
 rename patches/server/{0184-Config-for-powered-rail-activation-distance.patch => 0183-Config-for-powered-rail-activation-distance.patch} (92%)
 rename patches/server/{0185-Piglin-portal-spawn-modifier.patch => 0184-Piglin-portal-spawn-modifier.patch} (93%)
 rename patches/server/{0186-Config-to-change-max-number-of-bees.patch => 0185-Config-to-change-max-number-of-bees.patch} (100%)
 rename patches/server/{0187-Configurable-damage-settings-for-magma-blocks.patch => 0186-Configurable-damage-settings-for-magma-blocks.patch} (95%)
 rename patches/server/{0188-Config-for-wither-explosion-radius.patch => 0187-Config-for-wither-explosion-radius.patch} (91%)
 rename patches/server/{0189-Gamemode-extra-permissions.patch => 0188-Gamemode-extra-permissions.patch} (100%)
 rename patches/server/{0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (94%)
 rename patches/server/{0191-Configurable-piston-push-limit.patch => 0190-Configurable-piston-push-limit.patch} (94%)
 rename patches/server/{0192-Configurable-broadcast-settings.patch => 0191-Configurable-broadcast-settings.patch} (97%)
 rename patches/server/{0193-Fix-SPIGOT-6278.patch => 0192-Fix-SPIGOT-6278.patch} (100%)
 rename patches/server/{0194-Configurable-mob-blindness.patch => 0193-Configurable-mob-blindness.patch} (93%)
 rename patches/server/{0195-Hide-hidden-players-from-entity-selector.patch => 0194-Hide-hidden-players-from-entity-selector.patch} (100%)
 rename patches/server/{0196-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0195-Config-for-health-to-impact-Creeper-explosion-radius.patch} (93%)
 rename patches/server/{0197-Iron-golem-poppy-calms-anger.patch => 0196-Iron-golem-poppy-calms-anger.patch} (96%)
 rename patches/server/{0198-Breedable-parrots.patch => 0197-Breedable-parrots.patch} (94%)
 rename patches/server/{0199-Configurable-powered-rail-boost-modifier.patch => 0198-Configurable-powered-rail-boost-modifier.patch} (96%)
 rename patches/server/{0200-Add-config-change-multiplier-critical-damage-value.patch => 0199-Add-config-change-multiplier-critical-damage-value.patch} (91%)
 rename patches/server/{0201-Option-to-disable-dragon-egg-teleporting.patch => 0200-Option-to-disable-dragon-egg-teleporting.patch} (91%)
 rename patches/server/{0202-Config-for-unverified-username-message.patch => 0201-Config-for-unverified-username-message.patch} (97%)
 rename patches/server/{0203-Make-anvil-cumulative-cost-configurable.patch => 0202-Make-anvil-cumulative-cost-configurable.patch} (100%)
 rename patches/server/{0204-ShulkerBox-allow-oversized-stacks.patch => 0203-ShulkerBox-allow-oversized-stacks.patch} (95%)
 rename patches/server/{0205-Bee-can-work-when-raining-or-at-night.patch => 0204-Bee-can-work-when-raining-or-at-night.patch} (94%)
 rename patches/server/{0206-API-for-any-mob-to-burn-daylight.patch => 0205-API-for-any-mob-to-burn-daylight.patch} (99%)
 rename patches/server/{0207-Fix-advancement-triggers-on-entity-death.patch => 0206-Fix-advancement-triggers-on-entity-death.patch} (98%)
 rename patches/server/{0208-Config-MobEffect-by-world.patch => 0207-Config-MobEffect-by-world.patch} (98%)
 rename patches/server/{0209-Beacon-Activation-Range-Configurable.patch => 0208-Beacon-Activation-Range-Configurable.patch} (94%)
 rename patches/server/{0210-Add-toggle-for-sand-duping-fix.patch => 0209-Add-toggle-for-sand-duping-fix.patch} (93%)
 rename patches/server/{0211-Add-toggle-for-end-portal-safe-teleporting.patch => 0210-Add-toggle-for-end-portal-safe-teleporting.patch} (95%)
 rename patches/server/{0212-Flying-Fall-Damage-API.patch => 0211-Flying-Fall-Damage-API.patch} (95%)
 rename patches/server/{0213-Make-lightning-rod-range-configurable.patch => 0212-Make-lightning-rod-range-configurable.patch} (100%)
 rename patches/server/{0214-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0213-Burp-after-eating-food-fills-hunger-bar-completely.patch} (95%)
 rename patches/server/{0215-Allow-player-join-full-server-by-permission.patch => 0214-Allow-player-join-full-server-by-permission.patch} (100%)
 rename patches/server/{0216-Populator-seed-controls.patch => 0215-Populator-seed-controls.patch} (95%)
 rename patches/server/{0217-Add-permission-bypass-for-portal-waiting.patch => 0216-Add-permission-bypass-for-portal-waiting.patch} (100%)
 rename patches/server/{0218-Shulker-spawn-from-bullet-options.patch => 0217-Shulker-spawn-from-bullet-options.patch} (96%)
 rename patches/server/{0219-Eating-glow-berries-adds-glow-effect.patch => 0218-Eating-glow-berries-adds-glow-effect.patch} (97%)
 rename patches/server/{0220-Option-to-make-drowned-break-doors.patch => 0219-Option-to-make-drowned-break-doors.patch} (94%)
 rename patches/server/{0221-Configurable-hunger-starvation-damage.patch => 0220-Configurable-hunger-starvation-damage.patch} (91%)
 rename patches/server/{0222-Redirect-System.out-calls-to-plugin-loggers.patch => 0221-Redirect-System.out-calls-to-plugin-loggers.patch} (97%)
 rename patches/server/{0223-Armor-click-equip-options.patch => 0222-Armor-click-equip-options.patch} (96%)
 rename patches/server/{0224-Add-uptime-command.patch => 0223-Add-uptime-command.patch} (100%)
 rename patches/server/{0225-Structure-seed-options.patch => 0224-Structure-seed-options.patch} (97%)
 rename patches/server/{0226-Tool-actionable-options.patch => 0225-Tool-actionable-options.patch} (99%)
 rename patches/server/{0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch => 0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch} (100%)
 rename patches/server/{0228-Store-placer-on-Block-when-placed.patch => 0227-Store-placer-on-Block-when-placed.patch} (96%)
 rename patches/server/{0229-Summoner-API.patch => 0228-Summoner-API.patch} (100%)
 rename patches/server/{0230-Customizable-sleeping-actionbar-messages.patch => 0229-Customizable-sleeping-actionbar-messages.patch} (100%)
 rename patches/server/{0231-option-to-disable-shulker-box-items-from-dropping-co.patch => 0230-option-to-disable-shulker-box-items-from-dropping-co.patch} (96%)
 rename patches/server/{0232-Silk-touchable-budding-amethyst.patch => 0231-Silk-touchable-budding-amethyst.patch} (93%)
 rename patches/server/{0233-Big-dripleaf-tilt-delay.patch => 0232-Big-dripleaf-tilt-delay.patch} (94%)
 rename patches/server/{0234-Player-ridable-in-water-option.patch => 0233-Player-ridable-in-water-option.patch} (92%)
 rename patches/server/{0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (93%)

diff --git a/gradle.properties b/gradle.properties
index e65928ba2..28a56cb36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = bc127ea819df17e60ecb76e3cd0abec730422de1
+paperCommit = 44516b1d8a04b9b93b50d4fdba7298ce84411a10
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
diff --git a/patches/api/0002-Build-System-Changes.patch b/patches/api/0002-Build-System-Changes.patch
index c5f0d5db5..1aa56fc50 100644
--- a/patches/api/0002-Build-System-Changes.patch
+++ b/patches/api/0002-Build-System-Changes.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7ad3e5153718f6d4ce8293a9790bc3c1158aeb8e..309d201b7d551efd4a5903e6d990b0e718af6a78 100644
+index 15b8f4708887535383bb74bd922f893231737599..8d19658eb77565524f6d36debcb7629db56f04c6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -29,6 +29,7 @@ dependencies {
-     api("org.ow2.asm:asm:9.0")
-     api("org.ow2.asm:asm-commons:9.0")
+@@ -27,6 +27,7 @@ dependencies {
+     api("net.kyori:adventure-text-serializer-legacy")
+     api("net.kyori:adventure-text-serializer-plain")
      api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
 +    api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+     implementation("org.ow2.asm:asm:9.1")
+     implementation("org.ow2.asm:asm-commons:9.1")
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 22c0dd51b..477ed58c4 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dfffb5b03ea 100644
+index b50463c2356301a1b47a0bf4f50dc1f121d363a1..b7e5bdcfe04ab7d8d8d453a787849963640262a5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,10 +1,16 @@
@@ -36,8 +36,8 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
 +import io.papermc.paperweight.util.set
  import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
  import java.nio.file.Files
- import java.text.SimpleDateFormat
-@@ -30,8 +36,8 @@ repositories {
+ import java.util.Locale
+@@ -28,8 +34,8 @@ repositories {
  }
  
  dependencies {
@@ -48,7 +48,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -81,7 +87,7 @@ tasks.jar {
+@@ -80,7 +86,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -57,7 +57,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -106,6 +112,22 @@ publishing {
+@@ -105,6 +111,22 @@ publishing {
      }
  }
  
@@ -80,7 +80,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
  val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
  
  tasks.shadowJar {
-@@ -177,7 +199,7 @@ tasks.test {
+@@ -176,7 +198,7 @@ tasks.test {
  fun TaskContainer.registerRunTask(
      name: String, block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -3765,7 +3765,7 @@ index 0000000000000000000000000000000000000000..300364f693583be802a71d94cda5d96c
 +    }
 +}
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index b9cdbf8acccfd6b207a0116f068168f3b8c8e17d..7404989c37ee1b7aa4e6999a063180d099532f7e 100644
+index fe225310e4b62e7bded3521d3ddf4092c25a3645..76699e10923c72d5ab9884eb89c47a7c209f9817 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -45,6 +45,8 @@ public final class MinecraftTimings {
@@ -11352,12 +11352,12 @@ index 3dded5c491ace6b073a7bc3178976bd70f0b9393..f25bb4214cffd0050241ea229b6acb0c
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6d7eef79de7a899ccdbc3194d925bb4caa0a4b03..9667a74c9b77ea6acd9d2ebce30c685ed4b53e59 100644
+index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..1b324839e37d510552f5f5497de009add69ecda5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -223,6 +223,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
+         io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
          // Paper end
 +        com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
  
@@ -13611,7 +13611,7 @@ index c2e0417ee15018ec31c4aa8eec3dff7a0d16aa9e..631bc406d9bb193ac2d1d433519c2c3a
  
          public void onTrackingStart(Entity entity) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8e2bccc3a9ddb17a4978596056189eb776976338..dcba69c0ad3288ddc64dacc58b6fb857eed3109c 100644
+index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412685ed4b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,7 +261,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index 8e7b9a204..5e6ab6fad 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa258207686e64ab3e 100644
+index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f909cf5043 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -36,8 +36,8 @@ repositories {
+@@ -34,8 +34,8 @@ repositories {
  }
  
  dependencies {
@@ -19,7 +19,7 @@ index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa25820768
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -67,6 +67,7 @@ dependencies {
+@@ -66,6 +66,7 @@ dependencies {
  
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -27,7 +27,7 @@ index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa25820768
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
  
-@@ -87,7 +88,7 @@ tasks.jar {
+@@ -86,7 +87,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -171,7 +171,7 @@ index f25bb4214cffd0050241ea229b6acb0c16b2b0a5..be1bc7fda4104d61f91c2815c6ba3c61
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9667a74c9b77ea6acd9d2ebce30c685ed4b53e59..1749d134260adcb33d1757630c6ba2fdc43d2e6d 100644
+index 1b324839e37d510552f5f5497de009add69ecda5..6e530a9a2c176b1a9ef00ddd730de069d647859c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -282,11 +282,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index 8be63565a..444c1147a 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -80,7 +80,7 @@ index 134bb2a4826419110c10a483834747b942576e58..d9e868b6c70da18b4ce23c80e2aaf347
          if (this.source.acceptsSuccess() && !this.silent) {
              this.source.sendMessage(message, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1749d134260adcb33d1757630c6ba2fdc43d2e6d..1b8d836607d52c3bc67ad5f2accbc94663637d49 100644
+index 6e530a9a2c176b1a9ef00ddd730de069d647859c..fc6a6e88486c5c2dca1b10bfeae24124690d7b8d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -98,7 +98,7 @@ index 1749d134260adcb33d1757630c6ba2fdc43d2e6d..1b8d836607d52c3bc67ad5f2accbc946
 +        // Purpur end
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
+         io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 61a4dea715689b0ce9247040db5dd2080ee2e167..ffe76b8afd2a2c3153751c73ee7bbf4c9351e12c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
diff --git a/patches/server/0023-Silk-touch-spawners.patch b/patches/server/0023-Silk-touch-spawners.patch
index c3c12a8c1..f81c76172 100644
--- a/patches/server/0023-Silk-touch-spawners.patch
+++ b/patches/server/0023-Silk-touch-spawners.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Silk touch spawners
 
 
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index d24c569f00786b2bde953429aad57025abee72d6..44d837f624e2a23b0412cca4c0646f489c79d34f 100644
+index f63b80a1120b2bf5f77f1c1edb928309a1272f79..363f94e86e3349d9ed03b692e136307fe9fa5e28 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -79,6 +79,7 @@ public final class PaperAdventure {
+@@ -80,6 +80,7 @@ public final class PaperAdventure {
          })
          .build();
      public static final LegacyComponentSerializer LEGACY_SECTION_UXRC = LegacyComponentSerializer.builder().flattener(FLATTENER).hexColors().useUnusualXRepeatedCharacterHexFormat().build();
diff --git a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 93%
rename from patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
index 827c84187..7d4974218 100644
--- a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
@@ -28,10 +28,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
  
          return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5fd8eb62a249987cfe9e232724f58dd44a7e4837..cb86a58f96c8d9b91c69603dbd507fcb81a45cfd 100644
+index 85c6d25580ebcb885e82b21bdac5330583825430..9c6314e42ac283eed107c238d954c0dfed424b24 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -203,8 +203,10 @@ public class PurpurWorldConfig {
+@@ -201,8 +201,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean disableDropsOnCrammingDeath = false;
diff --git a/patches/server/0050-Players-should-not-cram-to-death.patch b/patches/server/0050-Players-should-not-cram-to-death.patch
deleted file mode 100644
index f70f8f850..000000000
--- a/patches/server/0050-Players-should-not-cram-to-death.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 21 Jul 2019 18:01:46 -0500
-Subject: [PATCH] Players should not cram to death
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 394da2bb29809477351da3cb782bf5b8e3aadc3b..c5618b6231ffcb711cf9e2b2d6b739e42ecba7fd 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1438,7 +1438,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     public boolean isInvulnerableTo(DamageSource damageSource) {
--        return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER;
-+        return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || (!level.purpurConfig.playersShouldCramToDeath && damageSource == DamageSource.CRAMMING) || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER; // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 85c6d25580ebcb885e82b21bdac5330583825430..5fd8eb62a249987cfe9e232724f58dd44a7e4837 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -166,6 +166,7 @@ public class PurpurWorldConfig {
-     public boolean idleTimeoutUpdateTabList = false;
-     public int playerSpawnInvulnerableTicks = 60;
-     public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-+    public boolean playersShouldCramToDeath = true;
-     private void playerSettings() {
-         idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
-         idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -173,6 +174,7 @@ public class PurpurWorldConfig {
-         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-         playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
-         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
-+        playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
-     }
- 
-     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0053-Fix-the-dead-lagging-the-server.patch b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
similarity index 88%
rename from patches/server/0053-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0052-Fix-the-dead-lagging-the-server.patch
index e6468825a..af6883484 100644
--- a/patches/server/0053-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41ab056778 100644
+index 1d6e063e1cf5435b123d5789d7fcf03503cc0821..46b6e0fcf662472b7fcccc33f859c5e33340d7bb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -17,7 +17,7 @@ index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41
  
      public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a88b37884e564303a86422cf50faadaf41b9d3f3..df6e71ee5b151b0b319defb4b9fd10858ff03bbd 100644
+index 172f7746a93afa1ee7990eeab1d3da2fc210aa99..31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2883,7 +2883,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0054-Skip-events-if-there-s-no-listeners.patch b/patches/server/0053-Skip-events-if-there-s-no-listeners.patch
similarity index 93%
rename from patches/server/0054-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0053-Skip-events-if-there-s-no-listeners.patch
index eeb57b00d..40b4a367a 100644
--- a/patches/server/0054-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0053-Skip-events-if-there-s-no-listeners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index ff4f48f6646060b398e8bf90a078e7fbf84beada..d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb 100644
+index a6f10d47bc4e2cadcc3e06cffa011ed7fb97c68d..59881c845cc88508736cc3d2a61860512d28964d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -375,6 +375,7 @@ public class Commands {
diff --git a/patches/server/0055-Add-permission-for-F3-N-debug.patch b/patches/server/0054-Add-permission-for-F3-N-debug.patch
similarity index 100%
rename from patches/server/0055-Add-permission-for-F3-N-debug.patch
rename to patches/server/0054-Add-permission-for-F3-N-debug.patch
diff --git a/patches/server/0056-Configurable-TPS-Catchup.patch b/patches/server/0055-Configurable-TPS-Catchup.patch
similarity index 100%
rename from patches/server/0056-Configurable-TPS-Catchup.patch
rename to patches/server/0055-Configurable-TPS-Catchup.patch
diff --git a/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 93%
rename from patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index b4c1b2efb..48887ce4d 100644
--- a/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -18,10 +18,10 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41
                  if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                      this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cb86a58f96c8d9b91c69603dbd507fcb81a45cfd..cb44ee2bb42963d9adb8abb813a27fa18670a02e 100644
+index 9c6314e42ac283eed107c238d954c0dfed424b24..72a8880827607bc727806b0c677eb48376835cf2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -204,9 +204,11 @@ public class PurpurWorldConfig {
+@@ -202,9 +202,11 @@ public class PurpurWorldConfig {
  
      public boolean disableDropsOnCrammingDeath = false;
      public boolean milkCuresBadOmen = true;
diff --git a/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
similarity index 93%
rename from patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
index deb22526d..3f37bc888 100644
--- a/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
@@ -38,10 +38,10 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40045b6b04 100644
+index 72a8880827607bc727806b0c677eb48376835cf2..a5fd10b8a1464fdc22c070df4f0387e6e796b25c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -376,6 +376,7 @@ public class PurpurWorldConfig {
+@@ -374,6 +374,7 @@ public class PurpurWorldConfig {
      public boolean creeperRidableInWater = false;
      public double creeperMaxHealth = 20.0D;
      public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
+@@ -384,6 +385,7 @@ public class PurpurWorldConfig {
          }
          creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
      }
  
      public boolean dolphinRidable = false;
-@@ -483,6 +485,7 @@ public class PurpurWorldConfig {
+@@ -481,6 +483,7 @@ public class PurpurWorldConfig {
      public boolean endermanRidable = false;
      public boolean endermanRidableInWater = false;
      public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -492,6 +495,7 @@ public class PurpurWorldConfig {
+@@ -490,6 +493,7 @@ public class PurpurWorldConfig {
              set("mobs.enderman.attributes.max_health", oldValue);
          }
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
diff --git a/patches/server/0059-Villagers-follow-emerald-blocks.patch b/patches/server/0058-Villagers-follow-emerald-blocks.patch
similarity index 94%
rename from patches/server/0059-Villagers-follow-emerald-blocks.patch
rename to patches/server/0058-Villagers-follow-emerald-blocks.patch
index 96b5d4582..a2d7604f7 100644
--- a/patches/server/0059-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0058-Villagers-follow-emerald-blocks.patch
@@ -41,10 +41,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
          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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41c3c46c17 100644
+index a5fd10b8a1464fdc22c070df4f0387e6e796b25c..79992f590de1b122ef7be4ed2f3c7385f3ca8a7d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1235,6 +1235,7 @@ public class PurpurWorldConfig {
+@@ -1233,6 +1233,7 @@ public class PurpurWorldConfig {
      public double villagerMaxHealth = 20.0D;
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -52,7 +52,7 @@ index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1246,6 +1247,7 @@ public class PurpurWorldConfig {
+@@ -1244,6 +1245,7 @@ public class PurpurWorldConfig {
          villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -60,7 +60,7 @@ index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
      }
  
      public boolean vindicatorRidable = false;
-@@ -1265,6 +1267,7 @@ public class PurpurWorldConfig {
+@@ -1263,6 +1265,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderRidable = false;
      public boolean wanderingTraderRidableInWater = false;
      public double wanderingTraderMaxHealth = 20.0D;
@@ -68,7 +68,7 @@ index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1274,6 +1277,7 @@ public class PurpurWorldConfig {
+@@ -1272,6 +1275,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/0060-Allow-leashing-villagers.patch b/patches/server/0059-Allow-leashing-villagers.patch
similarity index 94%
rename from patches/server/0060-Allow-leashing-villagers.patch
rename to patches/server/0059-Allow-leashing-villagers.patch
index 67e0c61b9..7e43f5b95 100644
--- a/patches/server/0060-Allow-leashing-villagers.patch
+++ b/patches/server/0059-Allow-leashing-villagers.patch
@@ -49,10 +49,10 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f3da30d20 100644
+index 79992f590de1b122ef7be4ed2f3c7385f3ca8a7d..7fb7fdd26a84e13fd9a8368397fe7d2c7ced12b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1236,6 +1236,7 @@ public class PurpurWorldConfig {
+@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1248,6 +1249,7 @@ public class PurpurWorldConfig {
+@@ -1246,6 +1247,7 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
      }
  
      public boolean vindicatorRidable = false;
-@@ -1268,6 +1270,7 @@ public class PurpurWorldConfig {
+@@ -1266,6 +1268,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderRidableInWater = false;
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1278,6 +1281,7 @@ public class PurpurWorldConfig {
+@@ -1276,6 +1279,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/0061-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 92%
rename from patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
index c9ba6a685..b54f7590a 100644
--- a/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
@@ -18,10 +18,10 @@ index 0c6583751e75d175338aaf411fb26baa1946a9b4..bad3b9eb0ab8612f9c80c52caff38ffe
  
          for (int i = 0; i < 10; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 04ad7b73d2a482abe9bfe9b100950e6f3da30d20..b37d922ba6082f21057b924e1184a81371a50840 100644
+index 7fb7fdd26a84e13fd9a8368397fe7d2c7ced12b8..cd2f74fe19ab8c22d0bee93787c45a45d1c7b15c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1237,6 +1237,8 @@ public class PurpurWorldConfig {
+@@ -1235,6 +1235,8 @@ public class PurpurWorldConfig {
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index 04ad7b73d2a482abe9bfe9b100950e6f3da30d20..b37d922ba6082f21057b924e1184a813
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1250,6 +1252,8 @@ public class PurpurWorldConfig {
+@@ -1248,6 +1250,8 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
diff --git a/patches/server/0062-Implement-infinite-lava.patch b/patches/server/0061-Implement-infinite-lava.patch
similarity index 95%
rename from patches/server/0062-Implement-infinite-lava.patch
rename to patches/server/0061-Implement-infinite-lava.patch
index 2369795a2..54aacd282 100644
--- a/patches/server/0062-Implement-infinite-lava.patch
+++ b/patches/server/0061-Implement-infinite-lava.patch
@@ -58,10 +58,10 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34
      protected boolean canConvertToSource() {
          return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b37d922ba6082f21057b924e1184a81371a50840..ef1be8d744283b74ff09c0d5badaed77c31e004a 100644
+index cd2f74fe19ab8c22d0bee93787c45a45d1c7b15c..a75d3ac8c04b9ca81547bcb8d8488f0a4cc1e05b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -216,6 +216,13 @@ public class PurpurWorldConfig {
+@@ -214,6 +214,13 @@ public class PurpurWorldConfig {
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
      }
  
diff --git a/patches/server/0063-Make-lava-flow-speed-configurable.patch b/patches/server/0062-Make-lava-flow-speed-configurable.patch
similarity index 92%
rename from patches/server/0063-Make-lava-flow-speed-configurable.patch
rename to patches/server/0062-Make-lava-flow-speed-configurable.patch
index 07d9b398b..ca3154227 100644
--- a/patches/server/0063-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0062-Make-lava-flow-speed-configurable.patch
@@ -18,10 +18,10 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef1be8d744283b74ff09c0d5badaed77c31e004a..6ae6000856817e3951e01980d68ea359078886ed 100644
+index a75d3ac8c04b9ca81547bcb8d8488f0a4cc1e05b..8e2d401e10c2fc7e748fd28073d94f09d228e445 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -218,9 +218,13 @@ public class PurpurWorldConfig {
+@@ -216,9 +216,13 @@ public class PurpurWorldConfig {
  
      public boolean lavaInfinite = false;
      public int lavaInfiniteRequiredSources = 2;
diff --git a/patches/server/0064-Add-player-death-exp-control-options.patch b/patches/server/0063-Add-player-death-exp-control-options.patch
similarity index 88%
rename from patches/server/0064-Add-player-death-exp-control-options.patch
rename to patches/server/0063-Add-player-death-exp-control-options.patch
index ddd664d1d..98914ba49 100644
--- a/patches/server/0064-Add-player-death-exp-control-options.patch
+++ b/patches/server/0063-Add-player-death-exp-control-options.patch
@@ -31,22 +31,22 @@ index d6b610a848f37db24af9b219be2f22aeaf892388..52d43c2bf1fa1bfa97aab02a9837c6b1
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6ae6000856817e3951e01980d68ea359078886ed..ac018249cdb97c679d5a48fcd6d6142228940d85 100644
+index 8e2d401e10c2fc7e748fd28073d94f09d228e445..d3aa93b934972758c50bd89ba951c5e2f54251a5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -167,6 +167,8 @@ public class PurpurWorldConfig {
+@@ -166,6 +166,8 @@ public class PurpurWorldConfig {
+     public boolean idleTimeoutUpdateTabList = false;
      public int playerSpawnInvulnerableTicks = 60;
      public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-     public boolean playersShouldCramToDeath = true;
 +    public String playerDeathExpDropEquation = "expLevel * 7";
 +    public int playerDeathExpDropMax = 100;
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -175,6 +177,8 @@ public class PurpurWorldConfig {
+@@ -173,6 +175,8 @@ public class PurpurWorldConfig {
+         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
          playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
          playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
-         playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
 +        playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
 +        playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
      }
diff --git a/patches/server/0065-Configurable-void-damage-height-and-damage.patch b/patches/server/0064-Configurable-void-damage-height-and-damage.patch
similarity index 95%
rename from patches/server/0065-Configurable-void-damage-height-and-damage.patch
rename to patches/server/0064-Configurable-void-damage-height-and-damage.patch
index 3d3266028..abca16b81 100644
--- a/patches/server/0065-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0064-Configurable-void-damage-height-and-damage.patch
@@ -31,10 +31,10 @@ index 31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db..8f550154b12521662889bbc91f5cd8e2
  
      protected void updateSwingTime() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ac018249cdb97c679d5a48fcd6d6142228940d85..7fb6bedf494add10b2b5cc849f89f87b12821b94 100644
+index d3aa93b934972758c50bd89ba951c5e2f54251a5..f50bbee171ec14c5f574a58f4ac50a96751c0a28 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -209,10 +209,14 @@ public class PurpurWorldConfig {
+@@ -207,10 +207,14 @@ public class PurpurWorldConfig {
      public boolean disableDropsOnCrammingDeath = false;
      public boolean milkCuresBadOmen = true;
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
diff --git a/patches/server/0066-Add-canSaveToDisk-to-Entity.patch b/patches/server/0065-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0066-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0065-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0067-Dispenser-curse-of-binding-protection.patch b/patches/server/0066-Dispenser-curse-of-binding-protection.patch
similarity index 95%
rename from patches/server/0067-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0066-Dispenser-curse-of-binding-protection.patch
index 1e58e1b69..0df14b94a 100644
--- a/patches/server/0067-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0066-Dispenser-curse-of-binding-protection.patch
@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e2
              // CraftBukkit start
              Level world = pointer.getLevel();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7fb6bedf494add10b2b5cc849f89f87b12821b94..78af09318d961ef8355e0c92f7a572d4d9a572b3 100644
+index f50bbee171ec14c5f574a58f4ac50a96751c0a28..173d8eb4a1baffb2802dcf82dd2aad5a48a4cd9e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -219,6 +219,11 @@ public class PurpurWorldConfig {
+@@ -217,6 +217,11 @@ public class PurpurWorldConfig {
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
      }
  
diff --git a/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 93%
rename from patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
index 77d3ec132..c05c6c9f7 100644
--- a/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
@@ -17,10 +17,10 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 78af09318d961ef8355e0c92f7a572d4d9a572b3..b022574dca704f93df22bef22d26f1cdc4ec4e20 100644
+index 173d8eb4a1baffb2802dcf82dd2aad5a48a4cd9e..0db73ef0552263437ba87281a179d1643b42cd83 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -206,12 +206,14 @@ public class PurpurWorldConfig {
+@@ -204,12 +204,14 @@ public class PurpurWorldConfig {
          });
      }
  
diff --git a/patches/server/0069-Mending-mends-most-damages-equipment-first.patch b/patches/server/0068-Mending-mends-most-damages-equipment-first.patch
similarity index 94%
rename from patches/server/0069-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0068-Mending-mends-most-damages-equipment-first.patch
index dfb181628..c445735f1 100644
--- a/patches/server/0069-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0068-Mending-mends-most-damages-equipment-first.patch
@@ -18,7 +18,7 @@ index 1caf10ecf949e0f465ffe573f3bed1a3c5733a7f..8b6614bde99b17db2e161f3fe4ab2491
          if (entry != null) {
              ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 86aa07827ce0e02939ebb594956b1023ffd83ad4..e2cc529405d80f4e8f22117da98ee6474351c218 100644
+index ae6638e44b5562436e8d3ad89167663c6f3961b1..9106d48e1ffab9687cd3295d9bb0410cdf875df4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -511,6 +511,16 @@ public final class ItemStack {
@@ -73,10 +73,10 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
          Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
          return entry != null ? entry.getValue() : ItemStack.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b022574dca704f93df22bef22d26f1cdc4ec4e20..47f3934b297d8cdf1d5983a66b8542854e38e3a5 100644
+index 0db73ef0552263437ba87281a179d1643b42cd83..996346851c4b3ce181b1ae5431bea693d04b923f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -206,6 +206,7 @@ public class PurpurWorldConfig {
+@@ -204,6 +204,7 @@ public class PurpurWorldConfig {
          });
      }
  
@@ -84,7 +84,7 @@ index b022574dca704f93df22bef22d26f1cdc4ec4e20..47f3934b297d8cdf1d5983a66b854285
      public boolean boatEjectPlayersOnLand = false;
      public boolean disableDropsOnCrammingDeath = false;
      public boolean milkCuresBadOmen = true;
-@@ -213,6 +214,7 @@ public class PurpurWorldConfig {
+@@ -211,6 +212,7 @@ public class PurpurWorldConfig {
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
      private void miscGameplayMechanicsSettings() {
diff --git a/patches/server/0070-Add-5-second-tps-average-in-tps.patch b/patches/server/0069-Add-5-second-tps-average-in-tps.patch
similarity index 98%
rename from patches/server/0070-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0069-Add-5-second-tps-average-in-tps.patch
index 0eb77b8d9..799b2e048 100644
--- a/patches/server/0070-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0069-Add-5-second-tps-average-in-tps.patch
@@ -69,7 +69,7 @@ index c96feac8afa0e0ea05513692d1e937ae7cbecd66..214b25f57f15e2127b92ec88117c36d4
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0c63bb38dd3e088fd4e5d232713c86649f77e9c9..a16f8d1c1faa5bc69a6ea5165f5e44d7e6ae35f5 100644
+index cbf3817adb3c4a0dd818898f886d21e74d662a47..ef1004a277e4ae0bdec410c42271b4060227313f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0071-Implement-elytra-settings.patch b/patches/server/0070-Implement-elytra-settings.patch
similarity index 97%
rename from patches/server/0071-Implement-elytra-settings.patch
rename to patches/server/0070-Implement-elytra-settings.patch
index 3a39138dd..c56f6d6c3 100644
--- a/patches/server/0071-Implement-elytra-settings.patch
+++ b/patches/server/0070-Implement-elytra-settings.patch
@@ -54,7 +54,7 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
                      itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e2cc529405d80f4e8f22117da98ee6474351c218..18da9a82fb2ca4b9b8d80e37df29c76c8214c37f 100644
+index 9106d48e1ffab9687cd3295d9bb0410cdf875df4..1ecc0b740758c878a5a196524fbaa238b6689ac5 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -540,7 +540,7 @@ public final class ItemStack {
@@ -99,7 +99,7 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
                          entityhuman.startAutoSpinAttack(20);
                          if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 47f3934b297d8cdf1d5983a66b8542854e38e3a5..e4ba096aea461c4fcdcb50f2343eaf4feb3027b6 100644
+index 996346851c4b3ce181b1ae5431bea693d04b923f..c54e3fe327a677e622b2a6b300c8e6fe72d13ca6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -98,6 +98,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0072-Item-entity-immunities.patch b/patches/server/0071-Item-entity-immunities.patch
similarity index 98%
rename from patches/server/0072-Item-entity-immunities.patch
rename to patches/server/0071-Item-entity-immunities.patch
index 9af6c8df4..df5d3da21 100644
--- a/patches/server/0072-Item-entity-immunities.patch
+++ b/patches/server/0071-Item-entity-immunities.patch
@@ -94,7 +94,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e4ba096aea461c4fcdcb50f2343eaf4feb3027b6..d4f79d0132122fc8f039f08db6f1f262e50c6d3e 100644
+index c54e3fe327a677e622b2a6b300c8e6fe72d13ca6..6bca783ce69f503f4ff192d2c406b2126c5d4d4a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -111,6 +111,49 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0073-Add-ping-command.patch b/patches/server/0072-Add-ping-command.patch
similarity index 100%
rename from patches/server/0073-Add-ping-command.patch
rename to patches/server/0072-Add-ping-command.patch
diff --git a/patches/server/0074-Add-demo-command.patch b/patches/server/0073-Add-demo-command.patch
similarity index 100%
rename from patches/server/0074-Add-demo-command.patch
rename to patches/server/0073-Add-demo-command.patch
diff --git a/patches/server/0075-Add-credits-command.patch b/patches/server/0074-Add-credits-command.patch
similarity index 100%
rename from patches/server/0075-Add-credits-command.patch
rename to patches/server/0074-Add-credits-command.patch
diff --git a/patches/server/0076-Configurable-jockey-options.patch b/patches/server/0075-Configurable-jockey-options.patch
similarity index 96%
rename from patches/server/0076-Configurable-jockey-options.patch
rename to patches/server/0075-Configurable-jockey-options.patch
index fc14a7bd7..a782fde94 100644
--- a/patches/server/0076-Configurable-jockey-options.patch
+++ b/patches/server/0075-Configurable-jockey-options.patch
@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598ca1f779a 100644
+index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c1970439776b63 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -520,6 +520,9 @@ public class PurpurWorldConfig {
+@@ -518,6 +518,9 @@ public class PurpurWorldConfig {
      public boolean drownedRidableInWater = false;
      public double drownedMaxHealth = 20.0D;
      public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -530,6 +533,9 @@ public class PurpurWorldConfig {
+@@ -528,6 +531,9 @@ public class PurpurWorldConfig {
          }
          drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
          drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      }
  
      public boolean elderGuardianRidable = false;
-@@ -742,6 +748,9 @@ public class PurpurWorldConfig {
+@@ -740,6 +746,9 @@ public class PurpurWorldConfig {
      public boolean huskRidableInWater = false;
      public double huskMaxHealth = 20.0D;
      public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      private void huskSettings() {
          huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
          huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
-@@ -752,6 +761,9 @@ public class PurpurWorldConfig {
+@@ -750,6 +759,9 @@ public class PurpurWorldConfig {
          }
          huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
          huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      }
  
      public boolean illusionerRidable = false;
-@@ -1452,6 +1464,9 @@ public class PurpurWorldConfig {
+@@ -1450,6 +1462,9 @@ public class PurpurWorldConfig {
      public boolean zombieRidableInWater = false;
      public double zombieMaxHealth = 20.0D;
      public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1462,6 +1477,9 @@ public class PurpurWorldConfig {
+@@ -1460,6 +1475,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 d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      }
  
      public boolean zombieHorseRidableInWater = false;
-@@ -1495,6 +1513,9 @@ public class PurpurWorldConfig {
+@@ -1493,6 +1511,9 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerRidableInWater = false;
      public double zombieVillagerMaxHealth = 20.0D;
      public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1505,12 +1526,18 @@ public class PurpurWorldConfig {
+@@ -1503,12 +1524,18 @@ public class PurpurWorldConfig {
          }
          zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
          zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1521,5 +1548,8 @@ public class PurpurWorldConfig {
+@@ -1519,5 +1546,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/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 98%
rename from patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index ef78f217c..0dd7e08e2 100644
--- a/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -258,10 +258,10 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736
  
          private float speed = 0.1F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f1f9ed6311b69d8c1a2e439f76496598ca1f779a..8ce8fa59d89a50f9afc3808b8521d76da76f8ad0 100644
+index 0aa486b5af62df7e0bfe394ff9c1970439776b63..2bc0bab30ccf67fce236dcf74593d67c57ec13ff 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -933,6 +933,9 @@ public class PurpurWorldConfig {
+@@ -931,6 +931,9 @@ public class PurpurWorldConfig {
      public int phantomFlameFireTime = 8;
      public boolean phantomAllowGriefing = false;
      public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index f1f9ed6311b69d8c1a2e439f76496598ca1f779a..8ce8fa59d89a50f9afc3808b8521d76d
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -946,6 +949,9 @@ public class PurpurWorldConfig {
+@@ -944,6 +947,9 @@ public class PurpurWorldConfig {
              set("mobs.phantom.attributes.max_health", oldValue);
          }
          phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);
diff --git a/patches/server/0078-Add-phantom-spawning-options.patch b/patches/server/0077-Add-phantom-spawning-options.patch
similarity index 97%
rename from patches/server/0078-Add-phantom-spawning-options.patch
rename to patches/server/0077-Add-phantom-spawning-options.patch
index 9b30aeb8e..d15d45efa 100644
--- a/patches/server/0078-Add-phantom-spawning-options.patch
+++ b/patches/server/0077-Add-phantom-spawning-options.patch
@@ -48,10 +48,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184
                                              for (int l = 0; l < k; ++l) {
                                                  // Paper start
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8ce8fa59d89a50f9afc3808b8521d76da76f8ad0..0f192f2f487a16fd881aee9bc66198aa514167d7 100644
+index 2bc0bab30ccf67fce236dcf74593d67c57ec13ff..5004f8879909c6b226ab3ce6a60fee0113b67de6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -936,6 +936,18 @@ public class PurpurWorldConfig {
+@@ -934,6 +934,18 @@ public class PurpurWorldConfig {
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
      public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index 8ce8fa59d89a50f9afc3808b8521d76da76f8ad0..0f192f2f487a16fd881aee9bc66198aa
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -952,6 +964,18 @@ public class PurpurWorldConfig {
+@@ -950,6 +962,18 @@ public class PurpurWorldConfig {
          phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
          phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
          phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
diff --git a/patches/server/0079-Implement-bed-explosion-options.patch b/patches/server/0078-Implement-bed-explosion-options.patch
similarity index 96%
rename from patches/server/0079-Implement-bed-explosion-options.patch
rename to patches/server/0078-Implement-bed-explosion-options.patch
index 5bda4b5ba..26152806f 100644
--- a/patches/server/0079-Implement-bed-explosion-options.patch
+++ b/patches/server/0078-Implement-bed-explosion-options.patch
@@ -27,10 +27,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0f192f2f487a16fd881aee9bc66198aa514167d7..ecd50e72600cdec834c57570565bc5f19faaecb0 100644
+index 5004f8879909c6b226ab3ce6a60fee0113b67de6..c10c8b0d6f622bafca3db6b58dd8525310d0ba31 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -279,6 +279,22 @@ public class PurpurWorldConfig {
+@@ -277,6 +277,22 @@ public class PurpurWorldConfig {
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
      }
  
diff --git a/patches/server/0080-Implement-respawn-anchor-explosion-options.patch b/patches/server/0079-Implement-respawn-anchor-explosion-options.patch
similarity index 95%
rename from patches/server/0080-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0079-Implement-respawn-anchor-explosion-options.patch
index 2177f1df4..a3eb8651f 100644
--- a/patches/server/0080-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0079-Implement-respawn-anchor-explosion-options.patch
@@ -18,10 +18,10 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ecd50e72600cdec834c57570565bc5f19faaecb0..091aa1b404a8d8b2f71501d3a3425c2e56114829 100644
+index c10c8b0d6f622bafca3db6b58dd8525310d0ba31..93fb8838b802476ab184f17e9fc880cd64de9f41 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -316,6 +316,22 @@ public class PurpurWorldConfig {
+@@ -314,6 +314,22 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  
diff --git a/patches/server/0081-Add-allow-water-in-end-world-option.patch b/patches/server/0080-Add-allow-water-in-end-world-option.patch
similarity index 100%
rename from patches/server/0081-Add-allow-water-in-end-world-option.patch
rename to patches/server/0080-Add-allow-water-in-end-world-option.patch
diff --git a/patches/server/0082-Allow-color-codes-in-books.patch b/patches/server/0081-Allow-color-codes-in-books.patch
similarity index 97%
rename from patches/server/0082-Allow-color-codes-in-books.patch
rename to patches/server/0081-Allow-color-codes-in-books.patch
index 2e20d5c43..a690b276c 100644
--- a/patches/server/0082-Allow-color-codes-in-books.patch
+++ b/patches/server/0081-Allow-color-codes-in-books.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0be0d27e2534fccf0f8ff828476e2a0612c60d71..a1687fe41480048a1d98fda8c5b704d874c47708 100644
+index 0fbf66540e6beee964096a8f2a0312509449ff14..547572a579c434055956eab627195dbb5e5d4fa8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0083-Entity-lifespan.patch b/patches/server/0082-Entity-lifespan.patch
similarity index 97%
rename from patches/server/0083-Entity-lifespan.patch
rename to patches/server/0082-Entity-lifespan.patch
index 65223d753..a98cd0e8f 100644
--- a/patches/server/0083-Entity-lifespan.patch
+++ b/patches/server/0082-Entity-lifespan.patch
@@ -89,7 +89,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..ea53ece9afe9e35323a88647901a83a4
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 091aa1b404a8d8b2f71501d3a3425c2e56114829..591aabe5c297bcecdb23c7c901c6e9737369d119 100644
+index 93fb8838b802476ab184f17e9fc880cd64de9f41..786415c28dc7d8b601410b10d9257419481e1065 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -111,6 +111,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 87%
rename from patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 2adf20b42..68a1a8cd0 100644
--- a/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c5618b6231ffcb711cf9e2b2d6b739e42ecba7fd..e57e8e7553d41af9686283b74cc01791a76c5b0e 100644
+index 92be3472f97a8d3e916af198c1278773aa1b7d3a..074abae3d83c3f170b1d4e5134a204c7acdc49bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2490,5 +2490,25 @@ public class ServerPlayer extends Player {
@@ -55,19 +55,19 @@ index f1a8b91f620152a3da3c11769c3c2353ccdba3cf..0c14ccc74abcc68ecc5422b38bc729dc
                      }
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 591aabe5c297bcecdb23c7c901c6e9737369d119..2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe 100644
+index 786415c28dc7d8b601410b10d9257419481e1065..1df372f35183fd45c69a20233b194b6a09a13861 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
-     public boolean playersShouldCramToDeath = true;
+@@ -229,6 +229,7 @@ public class PurpurWorldConfig {
+     public boolean playerInvulnerableWhileAcceptingResourcePack = false;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
 +    public boolean teleportIfOutsideBorder = false;
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -240,6 +241,7 @@ public class PurpurWorldConfig {
-         playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
+@@ -238,6 +239,7 @@ public class PurpurWorldConfig {
+         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
          playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
          playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
 +        teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
diff --git a/patches/server/0085-Squid-EAR-immunity.patch b/patches/server/0084-Squid-EAR-immunity.patch
similarity index 91%
rename from patches/server/0085-Squid-EAR-immunity.patch
rename to patches/server/0084-Squid-EAR-immunity.patch
index 934187e9d..3f52d073a 100644
--- a/patches/server/0085-Squid-EAR-immunity.patch
+++ b/patches/server/0084-Squid-EAR-immunity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe..d1e5cbb239b043aade27d5e6e058a91241cce65a 100644
+index 1df372f35183fd45c69a20233b194b6a09a13861..5d91ae6b45f598df7402db420f451a8b1e9cfb39 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1269,6 +1269,7 @@ public class PurpurWorldConfig {
+@@ -1267,6 +1267,7 @@ public class PurpurWorldConfig {
  
      public boolean squidRidable = false;
      public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe..d1e5cbb239b043aade27d5e6e058a912
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          if (PurpurConfig.version < 10) {
-@@ -1277,6 +1278,7 @@ public class PurpurWorldConfig {
+@@ -1275,6 +1276,7 @@ public class PurpurWorldConfig {
              set("mobs.squid.attributes.max_health", oldValue);
          }
          squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
diff --git a/patches/server/0086-Configurable-feature-seed-settings.patch b/patches/server/0085-Configurable-feature-seed-settings.patch
similarity index 100%
rename from patches/server/0086-Configurable-feature-seed-settings.patch
rename to patches/server/0085-Configurable-feature-seed-settings.patch
diff --git a/patches/server/0087-Phantoms-burn-in-light.patch b/patches/server/0086-Phantoms-burn-in-light.patch
similarity index 95%
rename from patches/server/0087-Phantoms-burn-in-light.patch
rename to patches/server/0086-Phantoms-burn-in-light.patch
index 31c33547b..79dfb7305 100644
--- a/patches/server/0087-Phantoms-burn-in-light.patch
+++ b/patches/server/0086-Phantoms-burn-in-light.patch
@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
                      list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
                      Iterator iterator = list.iterator();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d1e5cbb239b043aade27d5e6e058a91241cce65a..0c69310177c648357486ab18b3921e4c49041590 100644
+index 5d91ae6b45f598df7402db420f451a8b1e9cfb39..de92cd0eb830f6787f4d5b31b66543b332f0d8e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -987,6 +987,9 @@ public class PurpurWorldConfig {
+@@ -985,6 +985,9 @@ public class PurpurWorldConfig {
      public int phantomSpawnOverheadRadius = 10;
      public int phantomSpawnMinPerAttempt = 1;
      public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index d1e5cbb239b043aade27d5e6e058a91241cce65a..0c69310177c648357486ab18b3921e4c
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1015,6 +1018,9 @@ public class PurpurWorldConfig {
+@@ -1013,6 +1016,9 @@ public class PurpurWorldConfig {
          phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
          phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
          phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);
diff --git a/patches/server/0088-Configurable-villager-breeding.patch b/patches/server/0087-Configurable-villager-breeding.patch
similarity index 91%
rename from patches/server/0088-Configurable-villager-breeding.patch
rename to patches/server/0087-Configurable-villager-breeding.patch
index 4b02d6a65..68f8a8352 100644
--- a/patches/server/0088-Configurable-villager-breeding.patch
+++ b/patches/server/0087-Configurable-villager-breeding.patch
@@ -18,10 +18,10 @@ index bad3b9eb0ab8612f9c80c52caff38ffe791d112c..4752205ab570ab8f6ae7f0a15ae610b6
  
      private boolean hungry() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c69310177c648357486ab18b3921e4c49041590..1556c9a9f99078eb970993aa90e96313acb71e09 100644
+index de92cd0eb830f6787f4d5b31b66543b332f0d8e8..8b164645a22e60980c036ac272e8b77b11de7b86 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1412,6 +1412,7 @@ public class PurpurWorldConfig {
+@@ -1410,6 +1410,7 @@ public class PurpurWorldConfig {
      public boolean villagerCanBeLeashed = false;
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index 0c69310177c648357486ab18b3921e4c49041590..1556c9a9f99078eb970993aa90e96313
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1427,6 +1428,7 @@ public class PurpurWorldConfig {
+@@ -1425,6 +1426,7 @@ public class PurpurWorldConfig {
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
diff --git a/patches/server/0089-Redstone-deactivates-spawners.patch b/patches/server/0088-Redstone-deactivates-spawners.patch
similarity index 92%
rename from patches/server/0089-Redstone-deactivates-spawners.patch
rename to patches/server/0088-Redstone-deactivates-spawners.patch
index 7114f1299..ebc660716 100644
--- a/patches/server/0089-Redstone-deactivates-spawners.patch
+++ b/patches/server/0088-Redstone-deactivates-spawners.patch
@@ -17,10 +17,10 @@ index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1556c9a9f99078eb970993aa90e96313acb71e09..341bb1676190ccf67b1dce42e3e5aed97dc9bef8 100644
+index 8b164645a22e60980c036ac272e8b77b11de7b86..79e193fbf4e8f6cf42496f09debf88ccc99bf11b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -346,6 +346,11 @@ public class PurpurWorldConfig {
+@@ -344,6 +344,11 @@ public class PurpurWorldConfig {
          signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  
diff --git a/patches/server/0090-Totems-work-in-inventory.patch b/patches/server/0089-Totems-work-in-inventory.patch
similarity index 93%
rename from patches/server/0090-Totems-work-in-inventory.patch
rename to patches/server/0089-Totems-work-in-inventory.patch
index bcb7e833a..6cabb03dd 100644
--- a/patches/server/0090-Totems-work-in-inventory.patch
+++ b/patches/server/0089-Totems-work-in-inventory.patch
@@ -29,10 +29,10 @@ index 0c14ccc74abcc68ecc5422b38bc729dc659b9b8b..b909eeba0539ab133e274a15b0b479b5
              event.setCancelled(itemstack == null);
              this.level.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 341bb1676190ccf67b1dce42e3e5aed97dc9bef8..58c1f069281866488f0b83f2c6c2de715b7ff98c 100644
+index 79e193fbf4e8f6cf42496f09debf88ccc99bf11b..8255fd95f0bfb45b3f2f714b0f624c12ff33a4a5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -231,6 +231,7 @@ public class PurpurWorldConfig {
+@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
      public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index 341bb1676190ccf67b1dce42e3e5aed97dc9bef8..58c1f069281866488f0b83f2c6c2de71
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -242,6 +243,7 @@ public class PurpurWorldConfig {
+@@ -240,6 +241,7 @@ public class PurpurWorldConfig {
          playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
          playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
          teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
diff --git a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0090-Add-vindicator-johnny-spawn-chance.patch
similarity index 92%
rename from patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0090-Add-vindicator-johnny-spawn-chance.patch
index 979997bc5..694137ab3 100644
--- a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0090-Add-vindicator-johnny-spawn-chance.patch
@@ -30,10 +30,10 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58c1f069281866488f0b83f2c6c2de715b7ff98c..cd05aad2e21d37e2e75866d061256e881f6b124a 100644
+index 8255fd95f0bfb45b3f2f714b0f624c12ff33a4a5..097ae958a8c2b2d8cd4ab9d758ddc1359fa91d0a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1441,6 +1441,7 @@ public class PurpurWorldConfig {
+@@ -1439,6 +1439,7 @@ public class PurpurWorldConfig {
      public boolean vindicatorRidable = false;
      public boolean vindicatorRidableInWater = false;
      public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index 58c1f069281866488f0b83f2c6c2de715b7ff98c..cd05aad2e21d37e2e75866d061256e88
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -1450,6 +1451,7 @@ public class PurpurWorldConfig {
+@@ -1448,6 +1449,7 @@ public class PurpurWorldConfig {
              set("mobs.vindicator.attributes.max_health", oldValue);
          }
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
diff --git a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch b/patches/server/0091-Add-option-to-disable-certain-block-updates.patch
similarity index 100%
rename from patches/server/0092-Add-option-to-disable-certain-block-updates.patch
rename to patches/server/0091-Add-option-to-disable-certain-block-updates.patch
diff --git a/patches/server/0093-Dispensers-place-anvils-option.patch b/patches/server/0092-Dispensers-place-anvils-option.patch
similarity index 95%
rename from patches/server/0093-Dispensers-place-anvils-option.patch
rename to patches/server/0092-Dispensers-place-anvils-option.patch
index 38e3d3613..1438ab28f 100644
--- a/patches/server/0093-Dispensers-place-anvils-option.patch
+++ b/patches/server/0092-Dispensers-place-anvils-option.patch
@@ -41,10 +41,10 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a
  
      static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cd05aad2e21d37e2e75866d061256e881f6b124a..fee446ecacad393f8e7dcd56fbcabfb6e15bb0f6 100644
+index 097ae958a8c2b2d8cd4ab9d758ddc1359fa91d0a..b36000b78370c6bb8678dc22a006b4baad22080a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -305,8 +305,10 @@ public class PurpurWorldConfig {
+@@ -303,8 +303,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean dispenserApplyCursedArmor = true;
diff --git a/patches/server/0094-Allow-anvil-colors.patch b/patches/server/0093-Allow-anvil-colors.patch
similarity index 94%
rename from patches/server/0094-Allow-anvil-colors.patch
rename to patches/server/0093-Allow-anvil-colors.patch
index b157fb100..0a60e447f 100644
--- a/patches/server/0094-Allow-anvil-colors.patch
+++ b/patches/server/0093-Allow-anvil-colors.patch
@@ -37,10 +37,10 @@ index ddfb89d62d2ec316683e9f0f5550e298ab26d137..410ac71efff92dfa1f1e11895d0f5bf3
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fee446ecacad393f8e7dcd56fbcabfb6e15bb0f6..40e4b8ae6a3347203dff7af4fc99e53ba752cf91 100644
+index b36000b78370c6bb8678dc22a006b4baad22080a..f72e9dfc464a3d79ed6a37d52da0acc097adc0ba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -288,6 +288,11 @@ public class PurpurWorldConfig {
+@@ -286,6 +286,11 @@ public class PurpurWorldConfig {
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
      }
  
diff --git a/patches/server/0095-Add-no-random-tick-block-list.patch b/patches/server/0094-Add-no-random-tick-block-list.patch
similarity index 96%
rename from patches/server/0095-Add-no-random-tick-block-list.patch
rename to patches/server/0094-Add-no-random-tick-block-list.patch
index 82f2e5a1a..82164ec8b 100644
--- a/patches/server/0095-Add-no-random-tick-block-list.patch
+++ b/patches/server/0094-Add-no-random-tick-block-list.patch
@@ -35,10 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 40e4b8ae6a3347203dff7af4fc99e53ba752cf91..a418801c944abe432f083dc77c60ce479ac3e7c8 100644
+index f72e9dfc464a3d79ed6a37d52da0acc097adc0ba..52401f529231706188415417d9b5f93bc73de983 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -288,6 +288,28 @@ public class PurpurWorldConfig {
+@@ -286,6 +286,28 @@ public class PurpurWorldConfig {
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
      }
  
diff --git a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0095-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 90%
rename from patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0095-Add-option-to-disable-dolphin-treasure-searching.patch
index 4a06f8280..d843e5e9f 100644
--- a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0095-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -17,10 +17,10 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a418801c944abe432f083dc77c60ce479ac3e7c8..329d5badbe340f9473d370b99b844dd6e7288f70 100644
+index 52401f529231706188415417d9b5f93bc73de983..102d88156ac24a8a41bbbabb6ad450a8d1e7a9bf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -554,6 +554,7 @@ public class PurpurWorldConfig {
+@@ -552,6 +552,7 @@ public class PurpurWorldConfig {
      public float dolphinSpitSpeed = 1.0F;
      public float dolphinSpitDamage = 2.0F;
      public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index a418801c944abe432f083dc77c60ce479ac3e7c8..329d5badbe340f9473d370b99b844dd6
      private void dolphinSettings() {
          dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
          dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
-@@ -565,6 +566,7 @@ public class PurpurWorldConfig {
+@@ -563,6 +564,7 @@ public class PurpurWorldConfig {
              set("mobs.dolphin.attributes.max_health", oldValue);
          }
          dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
diff --git a/patches/server/0097-Short-enderman-height.patch b/patches/server/0096-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0097-Short-enderman-height.patch
rename to patches/server/0096-Short-enderman-height.patch
diff --git a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch b/patches/server/0097-Stop-squids-floating-on-top-of-water.patch
similarity index 94%
rename from patches/server/0098-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0097-Stop-squids-floating-on-top-of-water.patch
index b5a69a8ff..01a1face4 100644
--- a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0097-Stop-squids-floating-on-top-of-water.patch
@@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
 +    // Purpur
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 329d5badbe340f9473d370b99b844dd6e7288f70..e79e9037fba32c9904583e6b2c7980faf0c2eae9 100644
+index 102d88156ac24a8a41bbbabb6ad450a8d1e7a9bf..4ff6aaeb9238326f650f98ead61deecc4ae47265 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1314,6 +1314,7 @@ public class PurpurWorldConfig {
+@@ -1312,6 +1312,7 @@ public class PurpurWorldConfig {
      public boolean squidRidable = false;
      public double squidMaxHealth = 10.0D;
      public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index 329d5badbe340f9473d370b99b844dd6e7288f70..e79e9037fba32c9904583e6b2c7980fa
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          if (PurpurConfig.version < 10) {
-@@ -1323,6 +1324,7 @@ public class PurpurWorldConfig {
+@@ -1321,6 +1322,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/0099-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0098-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server/0099-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0098-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0101-Entities-can-use-portals-configuration.patch b/patches/server/0100-Entities-can-use-portals-configuration.patch
similarity index 93%
rename from patches/server/0101-Entities-can-use-portals-configuration.patch
rename to patches/server/0100-Entities-can-use-portals-configuration.patch
index 75879c43b..a914638e6 100644
--- a/patches/server/0101-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0100-Entities-can-use-portals-configuration.patch
@@ -27,10 +27,10 @@ index c5a1e46cc01e0f296a02536e70dc1443bb23a26f..63ab08c00048feba74e4b3c25308ee75
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e79e9037fba32c9904583e6b2c7980faf0c2eae9..c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76 100644
+index 4ff6aaeb9238326f650f98ead61deecc4ae47265..ce3e424ef0933d80b23eb5a1762d55a9e69280f1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -274,6 +274,7 @@ public class PurpurWorldConfig {
+@@ -272,6 +272,7 @@ public class PurpurWorldConfig {
      public boolean useBetterMending = false;
      public boolean boatEjectPlayersOnLand = false;
      public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index e79e9037fba32c9904583e6b2c7980faf0c2eae9..c50c21d3bb03c6f7ba87cfea4a28bf9b
      public boolean milkCuresBadOmen = true;
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
-@@ -282,6 +283,7 @@ public class PurpurWorldConfig {
+@@ -280,6 +281,7 @@ public class PurpurWorldConfig {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
diff --git a/patches/server/0102-LivingEntity-broadcastItemBreak.patch b/patches/server/0101-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0102-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0101-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0103-Customizable-wither-health-and-healing.patch b/patches/server/0102-Customizable-wither-health-and-healing.patch
similarity index 92%
rename from patches/server/0103-Customizable-wither-health-and-healing.patch
rename to patches/server/0102-Customizable-wither-health-and-healing.patch
index df838c2d4..eb05bad59 100644
--- a/patches/server/0103-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0102-Customizable-wither-health-and-healing.patch
@@ -23,10 +23,10 @@ index 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb5
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76..dc7bba566ec321f645848c734ab00a627e85bcb8 100644
+index ce3e424ef0933d80b23eb5a1762d55a9e69280f1..a2612c026ae87995881cb339f4d3481a3274c509 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1525,6 +1525,8 @@ public class PurpurWorldConfig {
+@@ -1523,6 +1523,8 @@ public class PurpurWorldConfig {
      public boolean witherRidableInWater = false;
      public double witherMaxY = 256D;
      public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76..dc7bba566ec321f645848c734ab00a62
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1539,6 +1541,8 @@ public class PurpurWorldConfig {
+@@ -1537,6 +1539,8 @@ public class PurpurWorldConfig {
              set("mobs.wither.attributes.max_health", oldValue);
          }
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
diff --git a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 98%
rename from patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch
index 77f76d25c..76d3a1cd5 100644
--- a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
              if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dc7bba566ec321f645848c734ab00a627e85bcb8..2cb1d795b11203c2f5cd85d7ff049faeac7ac71a 100644
+index a2612c026ae87995881cb339f4d3481a3274c509..23d31f27239d937ec38909e8faa3e9276c76ab37 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -72,6 +72,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0105-Raid-cooldown-setting.patch b/patches/server/0104-Raid-cooldown-setting.patch
similarity index 94%
rename from patches/server/0105-Raid-cooldown-setting.patch
rename to patches/server/0104-Raid-cooldown-setting.patch
index aade6f3fd..fed1f08b5 100644
--- a/patches/server/0105-Raid-cooldown-setting.patch
+++ b/patches/server/0104-Raid-cooldown-setting.patch
@@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
                      if (!this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2cb1d795b11203c2f5cd85d7ff049faeac7ac71a..5dd75f2766558101726eac91a66b44fe424036ce 100644
+index 23d31f27239d937ec38909e8faa3e9276c76ab37..e372a4f1434f95be1f76f192c16f95403e3fbed2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -300,6 +300,7 @@ public class PurpurWorldConfig {
+@@ -298,6 +298,7 @@ public class PurpurWorldConfig {
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index 2cb1d795b11203c2f5cd85d7ff049faeac7ac71a..5dd75f2766558101726eac91a66b44fe
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -309,6 +310,7 @@ public class PurpurWorldConfig {
+@@ -307,6 +308,7 @@ public class PurpurWorldConfig {
          tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
diff --git a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0105-Despawn-rate-config-options-per-projectile-type.patch
similarity index 99%
rename from patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0105-Despawn-rate-config-options-per-projectile-type.patch
index 006a4d5e5..a59c5f695 100644
--- a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0105-Despawn-rate-config-options-per-projectile-type.patch
@@ -289,10 +289,10 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5dd75f2766558101726eac91a66b44fe424036ce..9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e 100644
+index e372a4f1434f95be1f76f192c16f95403e3fbed2..2ff62f1637a3157b8b088d2156e809ff835f52d3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -267,6 +267,35 @@ public class PurpurWorldConfig {
+@@ -265,6 +265,35 @@ public class PurpurWorldConfig {
          totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
      }
  
diff --git a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 96%
rename from patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index 06bb3ca76..38dbcd1a6 100644
--- a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -71,10 +71,10 @@ index f6e33ca1933792a3a417f54d20fea8dc4a41c1b5..7eed6c176345c766a99d4304d61d2835
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e..ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780 100644
+index 2ff62f1637a3157b8b088d2156e809ff835f52d3..428efdab81fdc2e345b9d92e58c1cb7d0d9202c2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1646,6 +1646,7 @@ public class PurpurWorldConfig {
+@@ -1644,6 +1644,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index 9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e..ff4ed0c1bdf5fbf2c137f0d059b6f696
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1659,6 +1660,7 @@ public class PurpurWorldConfig {
+@@ -1657,6 +1658,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/0108-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0107-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 98%
rename from patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0107-Persistent-TileEntity-Lore-and-DisplayName.patch
index eef154140..144a29225 100644
--- a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0107-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -189,10 +189,10 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780..4339e247345cc6d007fcb1a84cdb65d7b5667f25 100644
+index 428efdab81fdc2e345b9d92e58c1cb7d0d9202c2..300741d57574757bf9fed8bee27cbb1bed63a652 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -326,6 +326,7 @@ public class PurpurWorldConfig {
+@@ -324,6 +324,7 @@ public class PurpurWorldConfig {
      public boolean disableDropsOnCrammingDeath = false;
      public boolean entitiesCanUsePortals = true;
      public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780..4339e247345cc6d007fcb1a84cdb65d7
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
-@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
+@@ -334,6 +335,7 @@ public class PurpurWorldConfig {
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
diff --git a/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0108-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0108-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0110-Flying-squids-Oh-my.patch b/patches/server/0109-Flying-squids-Oh-my.patch
similarity index 94%
rename from patches/server/0110-Flying-squids-Oh-my.patch
rename to patches/server/0109-Flying-squids-Oh-my.patch
index 777584991..a7d8a912b 100644
--- a/patches/server/0110-Flying-squids-Oh-my.patch
+++ b/patches/server/0109-Flying-squids-Oh-my.patch
@@ -58,10 +58,10 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256
                  float f1 = Mth.cos(f) * 0.2F;
                  float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a470498a5a7bd 100644
+index 300741d57574757bf9fed8bee27cbb1bed63a652..cd0fce795cbd75acc8bbc8f5bd098286d281ac5d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -813,9 +813,11 @@ public class PurpurWorldConfig {
+@@ -811,9 +811,11 @@ public class PurpurWorldConfig {
  
      public boolean glowSquidRidable = false;
      public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a4704
      }
  
      public boolean goatRidable = false;
-@@ -1371,6 +1373,7 @@ public class PurpurWorldConfig {
+@@ -1369,6 +1371,7 @@ public class PurpurWorldConfig {
      public double squidMaxHealth = 10.0D;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a4704
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          if (PurpurConfig.version < 10) {
-@@ -1381,6 +1384,7 @@ public class PurpurWorldConfig {
+@@ -1379,6 +1382,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/0111-Infinity-bow-settings.patch b/patches/server/0110-Infinity-bow-settings.patch
similarity index 97%
rename from patches/server/0111-Infinity-bow-settings.patch
rename to patches/server/0110-Infinity-bow-settings.patch
index bbf26abcd..113d44d6d 100644
--- a/patches/server/0111-Infinity-bow-settings.patch
+++ b/patches/server/0110-Infinity-bow-settings.patch
@@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
          } else {
              user.startUsingItem(hand);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ad05c691e51e30d44b5bb807228a470498a5a7bd..54c5e96002a25f7f9d8c876c3d57aced6e5b2d25 100644
+index cd0fce795cbd75acc8bbc8f5bd098286d281ac5d..419ed2a7778699831fc43e53eb3940d735dce6f4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -122,6 +122,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0112-Stonecutter-damage.patch b/patches/server/0111-Stonecutter-damage.patch
similarity index 96%
rename from patches/server/0112-Stonecutter-damage.patch
rename to patches/server/0111-Stonecutter-damage.patch
index aa9aa1e37..e7474106b 100644
--- a/patches/server/0112-Stonecutter-damage.patch
+++ b/patches/server/0111-Stonecutter-damage.patch
@@ -61,10 +61,10 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
              } else if (blockState.is(Blocks.HONEY_BLOCK)) {
                  return BlockPathTypes.STICKY_HONEY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 54c5e96002a25f7f9d8c876c3d57aced6e5b2d25..0f6af8555c9acbe3eb3088859557adc6b9742c88 100644
+index 419ed2a7778699831fc43e53eb3940d735dce6f4..02716d2cdaccb386bb84329dce02a175b03fd656 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -449,6 +449,11 @@ public class PurpurWorldConfig {
+@@ -447,6 +447,11 @@ public class PurpurWorldConfig {
          spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
      }
  
diff --git a/patches/server/0113-Configurable-daylight-cycle.patch b/patches/server/0112-Configurable-daylight-cycle.patch
similarity index 98%
rename from patches/server/0113-Configurable-daylight-cycle.patch
rename to patches/server/0112-Configurable-daylight-cycle.patch
index 0359fe849..0a66c058b 100644
--- a/patches/server/0113-Configurable-daylight-cycle.patch
+++ b/patches/server/0112-Configurable-daylight-cycle.patch
@@ -70,7 +70,7 @@ index 7944a33cf36878c9e4853637bfb9cba22ba8bc4d..3bc63f24bf8c07b89562887bdc8cf756
  
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0f6af8555c9acbe3eb3088859557adc6b9742c88..875f1265f36d2c7785d525ccd8ce3fca17922f9b 100644
+index 02716d2cdaccb386bb84329dce02a175b03fd656..5d29dfbeefb325117c68d5a9dd8b97939a28c726 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -104,6 +104,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0115-Furnace-uses-lava-from-underneath.patch b/patches/server/0114-Furnace-uses-lava-from-underneath.patch
similarity index 96%
rename from patches/server/0115-Furnace-uses-lava-from-underneath.patch
rename to patches/server/0114-Furnace-uses-lava-from-underneath.patch
index be5cb02fa..8fa5b0cb9 100644
--- a/patches/server/0115-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0114-Furnace-uses-lava-from-underneath.patch
@@ -48,10 +48,10 @@ index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b6
  
      private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 875f1265f36d2c7785d525ccd8ce3fca17922f9b..b03f972040cf11a659560afa696a2f0498a6dd53 100644
+index 5d29dfbeefb325117c68d5a9dd8b97939a28c726..9ff0f451016a2753ac020ca2573ed6c4833790d3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -417,6 +417,17 @@ public class PurpurWorldConfig {
+@@ -415,6 +415,17 @@ public class PurpurWorldConfig {
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
      }
  
diff --git a/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0115-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0116-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0115-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 92%
rename from patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index 977c64ead..44c302924 100644
--- a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -24,10 +24,10 @@ index ee5bc54e37e5ae120e846ddd2cae5ca39c293c98..f2ddc1c9c4fa029544866b779b4b0359
                  return;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b03f972040cf11a659560afa696a2f0498a6dd53..5d428641a91c73bccf65e5a8247a64bf958d7a9e 100644
+index 9ff0f451016a2753ac020ca2573ed6c4833790d3..18aa966b09283b9f6cfa5a1ed55c4be9c0adfc5a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -413,8 +413,10 @@ public class PurpurWorldConfig {
+@@ -411,8 +411,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean farmlandGetsMoistFromBelow = false;
diff --git a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 97%
rename from patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch
index e2324756b..657b3d7cb 100644
--- a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch
@@ -95,10 +95,10 @@ index e52a708904d7c7d8d19e9def3bc915a9141c2bed..42c9952ee868fa54d9b6f2db8e08e3bc
          this.world = new CraftWorld((ServerLevel) this, gen, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5d428641a91c73bccf65e5a8247a64bf958d7a9e..db5bbd12e6f9d2ab173b0d186f449a26c9562091 100644
+index 18aa966b09283b9f6cfa5a1ed55c4be9c0adfc5a..024dfc34ad2b059ae00c9c98b03ff6213cf99f2b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
+@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
      public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index 5d428641a91c73bccf65e5a8247a64bf958d7a9e..db5bbd12e6f9d2ab173b0d186f449a26
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -360,6 +361,7 @@ public class PurpurWorldConfig {
+@@ -358,6 +359,7 @@ public class PurpurWorldConfig {
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
          raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
diff --git a/patches/server/0119-Make-entity-breeding-times-configurable.patch b/patches/server/0118-Make-entity-breeding-times-configurable.patch
similarity index 94%
rename from patches/server/0119-Make-entity-breeding-times-configurable.patch
rename to patches/server/0118-Make-entity-breeding-times-configurable.patch
index d88a7097f..fce2ebb0a 100644
--- a/patches/server/0119-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0118-Make-entity-breeding-times-configurable.patch
@@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee321063c07 100644
+index 024dfc34ad2b059ae00c9c98b03ff6213cf99f2b..e2fba907cad997006557c43e627df1a419c7ca75 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -487,9 +487,11 @@ public class PurpurWorldConfig {
+@@ -485,9 +485,11 @@ public class PurpurWorldConfig {
  
      public boolean axolotlRidable = false;
      public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean batRidable = false;
-@@ -519,6 +521,7 @@ public class PurpurWorldConfig {
+@@ -517,6 +519,7 @@ public class PurpurWorldConfig {
      public boolean beeRidableInWater = false;
      public double beeMaxY = 256D;
      public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -529,6 +532,7 @@ public class PurpurWorldConfig {
+@@ -527,6 +530,7 @@ public class PurpurWorldConfig {
              set("mobs.bee.attributes.max_health", oldValue);
          }
          beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean blazeRidable = false;
-@@ -553,6 +557,7 @@ public class PurpurWorldConfig {
+@@ -551,6 +555,7 @@ public class PurpurWorldConfig {
      public int catSpawnDelay = 1200;
      public int catSpawnSwampHutScanRange = 16;
      public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void catSettings() {
          catRidable = getBoolean("mobs.cat.ridable", catRidable);
          catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -565,6 +570,7 @@ public class PurpurWorldConfig {
+@@ -563,6 +568,7 @@ public class PurpurWorldConfig {
          catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
          catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
          catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -521,7 +521,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean caveSpiderRidable = false;
-@@ -585,6 +591,7 @@ public class PurpurWorldConfig {
+@@ -583,6 +589,7 @@ public class PurpurWorldConfig {
      public boolean chickenRidableInWater = false;
      public double chickenMaxHealth = 4.0D;
      public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void chickenSettings() {
          chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
          chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -595,6 +602,7 @@ public class PurpurWorldConfig {
+@@ -593,6 +600,7 @@ public class PurpurWorldConfig {
          }
          chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
          chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean codRidable = false;
-@@ -613,6 +621,7 @@ public class PurpurWorldConfig {
+@@ -611,6 +619,7 @@ public class PurpurWorldConfig {
      public boolean cowRidableInWater = false;
      public double cowMaxHealth = 10.0D;
      public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void cowSettings() {
          cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
          cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
-@@ -623,6 +632,7 @@ public class PurpurWorldConfig {
+@@ -621,6 +630,7 @@ public class PurpurWorldConfig {
          }
          cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
          cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -553,7 +553,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean creeperRidable = false;
-@@ -670,6 +680,7 @@ public class PurpurWorldConfig {
+@@ -668,6 +678,7 @@ public class PurpurWorldConfig {
      public double donkeyJumpStrengthMax = 0.5D;
      public double donkeyMovementSpeedMin = 0.175D;
      public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void donkeySettings() {
          donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -685,6 +696,7 @@ public class PurpurWorldConfig {
+@@ -683,6 +694,7 @@ public class PurpurWorldConfig {
          donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
          donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
          donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -569,7 +569,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean drownedRidable = false;
-@@ -791,6 +803,7 @@ public class PurpurWorldConfig {
+@@ -789,6 +801,7 @@ public class PurpurWorldConfig {
      public boolean foxRidableInWater = false;
      public double foxMaxHealth = 10.0D;
      public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -801,6 +814,7 @@ public class PurpurWorldConfig {
+@@ -799,6 +812,7 @@ public class PurpurWorldConfig {
          }
          foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -585,7 +585,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean ghastRidable = false;
-@@ -861,10 +875,12 @@ public class PurpurWorldConfig {
+@@ -859,10 +873,12 @@ public class PurpurWorldConfig {
      public boolean goatRidable = false;
      public boolean goatRidableInWater = false;
      public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean guardianRidable = false;
-@@ -882,6 +898,7 @@ public class PurpurWorldConfig {
+@@ -880,6 +896,7 @@ public class PurpurWorldConfig {
      public boolean hoglinRidable = false;
      public boolean hoglinRidableInWater = false;
      public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void hoglinSettings() {
          hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
          hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
-@@ -891,6 +908,7 @@ public class PurpurWorldConfig {
+@@ -889,6 +906,7 @@ public class PurpurWorldConfig {
              set("mobs.hoglin.attributes.max_health", oldValue);
          }
          hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean horseRidableInWater = false;
-@@ -900,6 +918,7 @@ public class PurpurWorldConfig {
+@@ -898,6 +916,7 @@ public class PurpurWorldConfig {
      public double horseJumpStrengthMax = 1.0D;
      public double horseMovementSpeedMin = 0.1125D;
      public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -915,6 +934,7 @@ public class PurpurWorldConfig {
+@@ -913,6 +932,7 @@ public class PurpurWorldConfig {
          horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
          horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean huskRidable = false;
-@@ -985,6 +1005,7 @@ public class PurpurWorldConfig {
+@@ -983,6 +1003,7 @@ public class PurpurWorldConfig {
      public double llamaJumpStrengthMax = 0.5D;
      public double llamaMovementSpeedMin = 0.175D;
      public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1001,6 +1022,7 @@ public class PurpurWorldConfig {
+@@ -999,6 +1020,7 @@ public class PurpurWorldConfig {
          llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
          llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean magmaCubeRidable = false;
-@@ -1020,6 +1042,7 @@ public class PurpurWorldConfig {
+@@ -1018,6 +1040,7 @@ public class PurpurWorldConfig {
      public boolean mooshroomRidable = false;
      public boolean mooshroomRidableInWater = false;
      public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void mooshroomSettings() {
          mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
          mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
-@@ -1029,6 +1052,7 @@ public class PurpurWorldConfig {
+@@ -1027,6 +1050,7 @@ public class PurpurWorldConfig {
              set("mobs.mooshroom.attributes.max_health", oldValue);
          }
          mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean muleRidableInWater = false;
-@@ -1038,6 +1062,7 @@ public class PurpurWorldConfig {
+@@ -1036,6 +1060,7 @@ public class PurpurWorldConfig {
      public double muleJumpStrengthMax = 0.5D;
      public double muleMovementSpeedMin = 0.175D;
      public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void muleSettings() {
          muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1053,11 +1078,13 @@ public class PurpurWorldConfig {
+@@ -1051,11 +1076,13 @@ public class PurpurWorldConfig {
          muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
          muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
          muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void ocelotSettings() {
          ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
          ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
-@@ -1067,11 +1094,13 @@ public class PurpurWorldConfig {
+@@ -1065,11 +1092,13 @@ public class PurpurWorldConfig {
              set("mobs.ocelot.attributes.max_health", oldValue);
          }
          ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void pandaSettings() {
          pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
          pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
-@@ -1081,6 +1110,7 @@ public class PurpurWorldConfig {
+@@ -1079,6 +1108,7 @@ public class PurpurWorldConfig {
              set("mobs.panda.attributes.max_health", oldValue);
          }
          pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean parrotRidable = false;
-@@ -1161,6 +1191,7 @@ public class PurpurWorldConfig {
+@@ -1159,6 +1189,7 @@ public class PurpurWorldConfig {
      public boolean pigRidableInWater = false;
      public double pigMaxHealth = 10.0D;
      public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void pigSettings() {
          pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
          pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -1171,6 +1202,7 @@ public class PurpurWorldConfig {
+@@ -1169,6 +1200,7 @@ public class PurpurWorldConfig {
          }
          pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
          pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean piglinRidable = false;
-@@ -1220,6 +1252,7 @@ public class PurpurWorldConfig {
+@@ -1218,6 +1250,7 @@ public class PurpurWorldConfig {
      public double polarBearMaxHealth = 30.0D;
      public String polarBearBreedableItemString = "";
      public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void polarBearSettings() {
          polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
          polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -1232,6 +1265,7 @@ public class PurpurWorldConfig {
+@@ -1230,6 +1263,7 @@ public class PurpurWorldConfig {
          polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
          Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
          if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean pufferfishRidable = false;
-@@ -1251,6 +1285,7 @@ public class PurpurWorldConfig {
+@@ -1249,6 +1283,7 @@ public class PurpurWorldConfig {
      public double rabbitMaxHealth = 3.0D;
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1262,6 +1297,7 @@ public class PurpurWorldConfig {
+@@ -1260,6 +1295,7 @@ public class PurpurWorldConfig {
          rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
          rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean ravagerRidable = false;
-@@ -1293,6 +1329,7 @@ public class PurpurWorldConfig {
+@@ -1291,6 +1327,7 @@ public class PurpurWorldConfig {
      public boolean sheepRidable = false;
      public boolean sheepRidableInWater = false;
      public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1302,6 +1339,7 @@ public class PurpurWorldConfig {
+@@ -1300,6 +1337,7 @@ public class PurpurWorldConfig {
              set("mobs.sheep.attributes.max_health", oldValue);
          }
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean shulkerRidable = false;
-@@ -1456,6 +1494,7 @@ public class PurpurWorldConfig {
+@@ -1454,6 +1492,7 @@ public class PurpurWorldConfig {
      public boolean striderRidable = false;
      public boolean striderRidableInWater = false;
      public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1465,6 +1504,7 @@ public class PurpurWorldConfig {
+@@ -1463,6 +1502,7 @@ public class PurpurWorldConfig {
              set("mobs.strider.attributes.max_health", oldValue);
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean traderLlamaRidable = false;
-@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
+@@ -1473,6 +1513,7 @@ public class PurpurWorldConfig {
      public double traderLlamaJumpStrengthMax = 0.5D;
      public double traderLlamaMovementSpeedMin = 0.175D;
      public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
+@@ -1489,6 +1530,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);
@@ -802,7 +802,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean tropicalFishRidable = false;
-@@ -1511,6 +1553,7 @@ public class PurpurWorldConfig {
+@@ -1509,6 +1551,7 @@ public class PurpurWorldConfig {
      public boolean turtleEggsBreakFromExpOrbs = true;
      public boolean turtleEggsBreakFromItems = true;
      public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void turtleEggSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -1523,6 +1566,7 @@ public class PurpurWorldConfig {
+@@ -1521,6 +1564,7 @@ public class PurpurWorldConfig {
          turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
          turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
          turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean vexRidable = false;
-@@ -1551,6 +1595,7 @@ public class PurpurWorldConfig {
+@@ -1549,6 +1593,7 @@ public class PurpurWorldConfig {
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
      public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1567,6 +1612,7 @@ public class PurpurWorldConfig {
+@@ -1565,6 +1610,7 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      }
  
      public boolean vindicatorRidable = false;
-@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
+@@ -1656,6 +1702,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;
      public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -1667,6 +1714,7 @@ public class PurpurWorldConfig {
+@@ -1665,6 +1712,7 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 98%
rename from patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch
index 427aec272..63edcb307 100644
--- a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -142,7 +142,7 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5
  
              if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf009d50296d 100644
+index e2fba907cad997006557c43e627df1a419c7ca75..ccb2c68b8c0a62ea20f8585bfcd750c7a4a23982 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -100,8 +100,10 @@ public class PurpurWorldConfig {
@@ -156,7 +156,7 @@ index ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf00
      }
  
      public int daytimeTicks = 12000;
-@@ -345,6 +347,7 @@ public class PurpurWorldConfig {
+@@ -343,6 +345,7 @@ public class PurpurWorldConfig {
      public boolean entitiesCanUsePortals = true;
      public boolean milkCuresBadOmen = true;
      public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf00
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
-@@ -357,6 +360,7 @@ public class PurpurWorldConfig {
+@@ -355,6 +358,7 @@ public class PurpurWorldConfig {
          entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
          persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
diff --git a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 95%
rename from patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
index 858c70985..f3731b0fb 100644
--- a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
                      ((Mob) newEntityLiving).setPersistenceRequired();
                  // Paper end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef724d7ad3598786e885d472bbb9bf009d50296d..18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45 100644
+index ccb2c68b8c0a62ea20f8585bfcd750c7a4a23982..9940426744c681ec20c10cb3008170b25d6125d5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -101,9 +101,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0121-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 96%
rename from patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server/0121-Add-twisting-and-weeping-vines-growth-rates.patch
index 68b939666..3ca54c581 100644
--- a/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
+++ b/patches/server/0121-Add-twisting-and-weeping-vines-growth-rates.patch
@@ -82,10 +82,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45..1b6684f9069180b99ea5f404ec6520741b62b805 100644
+index 9940426744c681ec20c10cb3008170b25d6125d5..49addc31c041203942036fd23d519f22f5477a1a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -413,6 +413,11 @@ public class PurpurWorldConfig {
+@@ -411,6 +411,11 @@ public class PurpurWorldConfig {
          }
      }
  
@@ -97,7 +97,7 @@ index 18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45..1b6684f9069180b99ea5f404ec652074
      public boolean dispenserApplyCursedArmor = true;
      public boolean dispenserPlaceAnvils = false;
      private void dispenserSettings() {
-@@ -482,6 +487,16 @@ public class PurpurWorldConfig {
+@@ -480,6 +485,16 @@ public class PurpurWorldConfig {
          stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
      }
  
diff --git a/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 96%
rename from patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
index 897e30b98..359ffc8cb 100644
--- a/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
+++ b/patches/server/0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
@@ -103,10 +103,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
      // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d694ed99a 100644
+index 49addc31c041203942036fd23d519f22f5477a1a..d615859fc8563dff3fdb9d9b12a08a5486692515 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -414,8 +414,10 @@ public class PurpurWorldConfig {
+@@ -412,8 +412,10 @@ public class PurpurWorldConfig {
      }
  
      public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d
      }
  
      public boolean dispenserApplyCursedArmor = true;
-@@ -454,6 +456,11 @@ public class PurpurWorldConfig {
+@@ -452,6 +454,11 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  
@@ -129,7 +129,7 @@ index 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d
      public boolean respawnAnchorExplode = true;
      public double respawnAnchorExplosionPower = 5.0D;
      public boolean respawnAnchorExplosionFire = true;
-@@ -488,13 +495,17 @@ public class PurpurWorldConfig {
+@@ -486,13 +493,17 @@ public class PurpurWorldConfig {
      }
  
      public double twistingVinesGrowthModifier = 0.10D;
diff --git a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 91%
rename from patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
index 5b1f941c7..c64667975 100644
--- a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -21,10 +21,10 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
  
      private static class EndermanFreezeWhenLookedAt extends Goal {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b95ad55bb37bed8acae07e7e6483950d694ed99a..6664c12ebd83b22fd70c2050c1270c68504ad82e 100644
+index d615859fc8563dff3fdb9d9b12a08a5486692515..eaf382e412dbf42075fb9ee45c35bb972b5f40da 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -791,6 +791,7 @@ public class PurpurWorldConfig {
+@@ -789,6 +789,7 @@ public class PurpurWorldConfig {
      public boolean endermanRidableInWater = false;
      public double endermanMaxHealth = 40.0D;
      public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index b95ad55bb37bed8acae07e7e6483950d694ed99a..6664c12ebd83b22fd70c2050c1270c68
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -801,6 +802,7 @@ public class PurpurWorldConfig {
+@@ -799,6 +800,7 @@ public class PurpurWorldConfig {
          }
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
diff --git a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 100%
rename from patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
diff --git a/patches/server/0126-Add-configurable-snowball-damage.patch b/patches/server/0125-Add-configurable-snowball-damage.patch
similarity index 92%
rename from patches/server/0126-Add-configurable-snowball-damage.patch
rename to patches/server/0125-Add-configurable-snowball-damage.patch
index 21c19ed88..5154a436c 100644
--- a/patches/server/0126-Add-configurable-snowball-damage.patch
+++ b/patches/server/0125-Add-configurable-snowball-damage.patch
@@ -18,10 +18,10 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6664c12ebd83b22fd70c2050c1270c68504ad82e..c9f7fb60d02087d291c73f2a761efac4981f72ba 100644
+index eaf382e412dbf42075fb9ee45c35bb972b5f40da..5b05056720f32196de4ff30ffa1288812e30ea81 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -289,6 +289,11 @@ public class PurpurWorldConfig {
+@@ -287,6 +287,11 @@ public class PurpurWorldConfig {
          totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
      }
  
diff --git a/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch
similarity index 94%
rename from patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
rename to patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch
index 4ed652181..45b9e3cd2 100644
--- a/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
+++ b/patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch
@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c9f7fb60d02087d291c73f2a761efac4981f72ba..f4abf71d8c0bf03fa7c413e62b1ea356a3c51a5c 100644
+index 5b05056720f32196de4ff30ffa1288812e30ea81..c99f97d68752d89037a017761abdc3bef2ef3785 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1778,6 +1778,7 @@ public class PurpurWorldConfig {
+@@ -1776,6 +1776,7 @@ public class PurpurWorldConfig {
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index c9f7fb60d02087d291c73f2a761efac4981f72ba..f4abf71d8c0bf03fa7c413e62b1ea356
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1792,6 +1793,11 @@ public class PurpurWorldConfig {
+@@ -1790,6 +1791,11 @@ 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-Left-handed-API.patch b/patches/server/0127-Left-handed-API.patch
similarity index 100%
rename from patches/server/0128-Left-handed-API.patch
rename to patches/server/0127-Left-handed-API.patch
diff --git a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
similarity index 95%
rename from patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
index d3db1fe04..9a2f3b055 100644
--- a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
@@ -18,7 +18,7 @@ index ea53ece9afe9e35323a88647901a83a4bf4225b8..11042a7b13e5029162ad977b5835c82a
          } else {
              this.setLeftHanded(false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f4abf71d8c0bf03fa7c413e62b1ea356a3c51a5c..aa1fafb4f10405bd78e353476f10dfe78be7445c 100644
+index c99f97d68752d89037a017761abdc3bef2ef3785..b97175d637c679dcb29b2781f8e8f7d020738527 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -129,8 +129,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0130-Add-boat-fall-damage-config.patch b/patches/server/0129-Add-boat-fall-damage-config.patch
similarity index 90%
rename from patches/server/0130-Add-boat-fall-damage-config.patch
rename to patches/server/0129-Add-boat-fall-damage-config.patch
index afc1b8f9f..483868ffb 100644
--- a/patches/server/0130-Add-boat-fall-damage-config.patch
+++ b/patches/server/0129-Add-boat-fall-damage-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e57e8e7553d41af9686283b74cc01791a76c5b0e..c04d22495f38a41aa9ca2477edd7a24df09639e8 100644
+index 074abae3d83c3f170b1d4e5134a204c7acdc49bc..b520d4980180462628ede1383ee1826bbd6a6ad2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -988,7 +988,16 @@ public class ServerPlayer extends Player {
@@ -27,10 +27,10 @@ index e57e8e7553d41af9686283b74cc01791a76c5b0e..c04d22495f38a41aa9ca2477edd7a24d
  
              if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aa1fafb4f10405bd78e353476f10dfe78be7445c..986295105cc4ee8a49260840f265bbf0d6cc5654 100644
+index b97175d637c679dcb29b2781f8e8f7d020738527..d2597cd2f6c195003a52b5e8e0d48e43bccd9c82 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -352,6 +352,7 @@ public class PurpurWorldConfig {
+@@ -350,6 +350,7 @@ public class PurpurWorldConfig {
  
      public boolean useBetterMending = false;
      public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index aa1fafb4f10405bd78e353476f10dfe78be7445c..986295105cc4ee8a49260840f265bbf0
      public boolean disableDropsOnCrammingDeath = false;
      public boolean entitiesCanUsePortals = true;
      public boolean milkCuresBadOmen = true;
-@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
+@@ -363,6 +364,7 @@ public class PurpurWorldConfig {
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
diff --git a/patches/server/0131-Snow-Golem-rate-of-fire-config.patch b/patches/server/0130-Snow-Golem-rate-of-fire-config.patch
similarity index 94%
rename from patches/server/0131-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0130-Snow-Golem-rate-of-fire-config.patch
index d7b6210cb..2e8758199 100644
--- a/patches/server/0131-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0130-Snow-Golem-rate-of-fire-config.patch
@@ -23,10 +23,10 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b
          this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 986295105cc4ee8a49260840f265bbf0d6cc5654..4b7dfa4149df5ddc3b5d868e471da613e8eb7c71 100644
+index d2597cd2f6c195003a52b5e8e0d48e43bccd9c82..f2f4e27bb87789d1d91fa433f356ff628989de01 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1474,6 +1474,10 @@ public class PurpurWorldConfig {
+@@ -1472,6 +1472,10 @@ public class PurpurWorldConfig {
      public double snowGolemMaxHealth = 4.0D;
      public boolean snowGolemDropsPumpkin = true;
      public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 986295105cc4ee8a49260840f265bbf0d6cc5654..4b7dfa4149df5ddc3b5d868e471da613
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1486,6 +1490,10 @@ public class PurpurWorldConfig {
+@@ -1484,6 +1488,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);
diff --git a/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch
similarity index 92%
rename from patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch
index 416c298ab..604385261 100644
--- a/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b07368ed5b8fcacd617988d09d5d27904315cf27..11576c89a4d7a6a29b1d17a6126fcba8154a6a4b 100644
+index f65e3b51e876f7a3d30710eed56fdca4daa620c9..7a3b994ab30597d46753ebe2b78e07a3e9bfb47f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -49,6 +49,11 @@ public class PaperWorldConfig {
+@@ -54,6 +54,11 @@ public class PaperWorldConfig {
          zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
      }
  
diff --git a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch b/patches/server/0132-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0133-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0132-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0134-Lobotomize-stuck-villagers.patch b/patches/server/0133-Lobotomize-stuck-villagers.patch
similarity index 95%
rename from patches/server/0134-Lobotomize-stuck-villagers.patch
rename to patches/server/0133-Lobotomize-stuck-villagers.patch
index abbcd78b1..aab3759b3 100644
--- a/patches/server/0134-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0133-Lobotomize-stuck-villagers.patch
@@ -53,10 +53,10 @@ index 4752205ab570ab8f6ae7f0a15ae610b603ade2ea..ddfb060e229df3a11cef4e0cb08f0cd2
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4b7dfa4149df5ddc3b5d868e471da613e8eb7c71..a854ec0ea0bd0709087a1bf340a7c1706d8007d5 100644
+index f2f4e27bb87789d1d91fa433f356ff628989de01..f2b875eb5c1f844f47e913e00a14d9e4028ab3e2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1647,6 +1647,8 @@ public class PurpurWorldConfig {
+@@ -1645,6 +1645,8 @@ public class PurpurWorldConfig {
      public int villagerSpawnIronGolemLimit = 0;
      public boolean villagerCanBreed = true;
      public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index 4b7dfa4149df5ddc3b5d868e471da613e8eb7c71..a854ec0ea0bd0709087a1bf340a7c170
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1664,6 +1666,13 @@ public class PurpurWorldConfig {
+@@ -1662,6 +1664,13 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
          villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
diff --git a/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 98%
rename from patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index efca7e868..aa0f14ce7 100644
--- a/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
      public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
      public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a854ec0ea0bd0709087a1bf340a7c1706d8007d5..279c9ecce2c16018a03d03954832db1d67a5bff9 100644
+index f2b875eb5c1f844f47e913e00a14d9e4028ab3e2..9a568a2dc8ceead516a1bd00149a8bd3fad75da5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1649,6 +1649,8 @@ public class PurpurWorldConfig {
+@@ -1647,6 +1647,8 @@ public class PurpurWorldConfig {
      public int villagerBreedingTicks = 6000;
      public boolean villagerLobotomizeEnabled = false;
      public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index a854ec0ea0bd0709087a1bf340a7c1706d8007d5..279c9ecce2c16018a03d03954832db1d
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1673,6 +1675,8 @@ public class PurpurWorldConfig {
+@@ -1671,6 +1673,8 @@ public class PurpurWorldConfig {
          }
          villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
          villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
diff --git a/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 93%
rename from patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index acdb9c875..dd34b1dc8 100644
--- a/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 279c9ecce2c16018a03d03954832db1d67a5bff9..85812544e5b56f979298cfc270370965dee1a684 100644
+index 9a568a2dc8ceead516a1bd00149a8bd3fad75da5..4cfc906506de7f2fa8ab8fec59b1b05ad88735cf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1881,6 +1881,7 @@ public class PurpurWorldConfig {
+@@ -1879,6 +1879,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 279c9ecce2c16018a03d03954832db1d67a5bff9..85812544e5b56f979298cfc270370965
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1894,5 +1895,6 @@ public class PurpurWorldConfig {
+@@ -1892,5 +1893,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/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
similarity index 96%
rename from patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
rename to patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index ec8df8199..03075fdb3 100644
--- a/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,7 +46,7 @@ index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7bfcab5c4d27a95658441e77308ac5710136f5eb..b49d5e4edfea04cd916ffa23ea18aaf246898c2a 100644
+index 1d074ecc76eaf1ae10a6bd35b2f2a54f6654260e..d38d724cd024bec0554b078b0c7fd479a51dd736 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1564,7 +1564,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 98%
rename from patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
index 20b4cd4f7..86f0b6d0f 100644
--- a/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
              return super.mobInteract(player, hand);
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 85812544e5b56f979298cfc270370965dee1a684..393b5065afdc914cea56db7cb7f84e851f813e01 100644
+index 4cfc906506de7f2fa8ab8fec59b1b05ad88735cf..3cdd0cb69b1299c0a94ee7117c5bf182cf717251 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1768,6 +1768,8 @@ public class PurpurWorldConfig {
+@@ -1766,6 +1766,8 @@ public class PurpurWorldConfig {
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;
      public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 85812544e5b56f979298cfc270370965dee1a684..393b5065afdc914cea56db7cb7f84e85
      public int wolfBreedingTicks = 6000;
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
-@@ -1778,6 +1780,8 @@ public class PurpurWorldConfig {
+@@ -1776,6 +1778,8 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0139-Configurable-default-wolf-collar-color.patch b/patches/server/0138-Configurable-default-wolf-collar-color.patch
similarity index 91%
rename from patches/server/0139-Configurable-default-wolf-collar-color.patch
rename to patches/server/0138-Configurable-default-wolf-collar-color.patch
index 2bdb97d10..e47844495 100644
--- a/patches/server/0139-Configurable-default-wolf-collar-color.patch
+++ b/patches/server/0138-Configurable-default-wolf-collar-color.patch
@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 393b5065afdc914cea56db7cb7f84e851f813e01..90ec6012066305a92b18cd37328afa664699998e 100644
+index 3cdd0cb69b1299c0a94ee7117c5bf182cf717251..53b851ed720637b2556ff9de3131a38b21b9c21a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1768,6 +1768,7 @@ public class PurpurWorldConfig {
+@@ -1766,6 +1766,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;
      public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 393b5065afdc914cea56db7cb7f84e851f813e01..90ec6012066305a92b18cd37328afa66
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
-@@ -1780,6 +1781,11 @@ public class PurpurWorldConfig {
+@@ -1778,6 +1779,11 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0140-Phantom-flames-on-swoop.patch b/patches/server/0139-Phantom-flames-on-swoop.patch
similarity index 91%
rename from patches/server/0140-Phantom-flames-on-swoop.patch
rename to patches/server/0139-Phantom-flames-on-swoop.patch
index c2547c2a7..d89c27ce1 100644
--- a/patches/server/0140-Phantom-flames-on-swoop.patch
+++ b/patches/server/0139-Phantom-flames-on-swoop.patch
@@ -17,10 +17,10 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 90ec6012066305a92b18cd37328afa664699998e..78d2eed6542e6fff46fdd802ea52ebf68cd6129d 100644
+index 53b851ed720637b2556ff9de3131a38b21b9c21a..2b34ae945d8da4d1d912b7556dd768c66dca121c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1178,6 +1178,7 @@ public class PurpurWorldConfig {
+@@ -1176,6 +1176,7 @@ public class PurpurWorldConfig {
      public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
      public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index 90ec6012066305a92b18cd37328afa664699998e..78d2eed6542e6fff46fdd802ea52ebf6
      public double phantomMaxHealth = 20.0D;
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
-@@ -1204,6 +1205,7 @@ public class PurpurWorldConfig {
+@@ -1202,6 +1203,7 @@ public class PurpurWorldConfig {
          phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
          phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
diff --git a/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 92%
rename from patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
index 1722626fd..861ed55c7 100644
--- a/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -17,10 +17,10 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2
  
          return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 78d2eed6542e6fff46fdd802ea52ebf68cd6129d..08c4d8b90e36195bdc15c9264d8064209cb72cf0 100644
+index 2b34ae945d8da4d1d912b7556dd768c66dca121c..00ff386aa01b998f281adad7d3f4e3bd67c26fe8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -429,6 +429,11 @@ public class PurpurWorldConfig {
+@@ -427,6 +427,11 @@ public class PurpurWorldConfig {
          caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge);
      }
  
diff --git a/patches/server/0142-Implement-TPSBar.patch b/patches/server/0141-Implement-TPSBar.patch
similarity index 98%
rename from patches/server/0142-Implement-TPSBar.patch
rename to patches/server/0141-Implement-TPSBar.patch
index a8ad643fd..9ee92471b 100644
--- a/patches/server/0142-Implement-TPSBar.patch
+++ b/patches/server/0141-Implement-TPSBar.patch
@@ -29,7 +29,7 @@ index 214b25f57f15e2127b92ec88117c36d4b2096477..652e596c37bf8d865c954b31ad7d2562
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b582c76469c 100644
+index fc6a6e88486c5c2dca1b10bfeae24124690d7b8d..4a3226b58ee3c11830dabba988b0665dc069559a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -349,6 +349,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -42,7 +42,7 @@ index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b58
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c04d22495f38a41aa9ca2477edd7a24df09639e8..a9f5e97f210d64949fcf3c058e132559009a268f 100644
+index b520d4980180462628ede1383ee1826bbd6a6ad2..21696b7a35cabca1c470304573c01557e21b7262 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0143-Striders-give-saddle-back.patch b/patches/server/0142-Striders-give-saddle-back.patch
similarity index 92%
rename from patches/server/0143-Striders-give-saddle-back.patch
rename to patches/server/0142-Striders-give-saddle-back.patch
index 89a5b4fcc..4e86e0082 100644
--- a/patches/server/0143-Striders-give-saddle-back.patch
+++ b/patches/server/0142-Striders-give-saddle-back.patch
@@ -28,10 +28,10 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 08c4d8b90e36195bdc15c9264d8064209cb72cf0..dfcda4459ae7571c83ea962259171d70ce92094d 100644
+index 00ff386aa01b998f281adad7d3f4e3bd67c26fe8..c950dfc7087d9d66a45724926d21f9bb3a0ee30f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1553,6 +1553,7 @@ public class PurpurWorldConfig {
+@@ -1551,6 +1551,7 @@ public class PurpurWorldConfig {
      public boolean striderRidableInWater = false;
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 08c4d8b90e36195bdc15c9264d8064209cb72cf0..dfcda4459ae7571c83ea962259171d70
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1563,6 +1564,7 @@ public class PurpurWorldConfig {
+@@ -1561,6 +1562,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/0144-PlayerBookTooLargeEvent.patch b/patches/server/0143-PlayerBookTooLargeEvent.patch
similarity index 96%
rename from patches/server/0144-PlayerBookTooLargeEvent.patch
rename to patches/server/0143-PlayerBookTooLargeEvent.patch
index a019ee8fb..7554bc1dc 100644
--- a/patches/server/0144-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0143-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a1687fe41480048a1d98fda8c5b704d874c47708..76c6b0c9b585879d63a232f6633ffd7c72656d0a 100644
+index 547572a579c434055956eab627195dbb5e5d4fa8..f07dfd7abebf904c7bdc6751e849fe32d765afc6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1122,10 +1122,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
similarity index 97%
rename from patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
index 45f24ce59..83201fcff 100644
--- a/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
@@ -26,7 +26,7 @@ index d57a1984328750f5a6db748ef2db21fb3e2dff00..656b62c93dcbe15a79ebe684c18f4dc3
  
      protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dfcda4459ae7571c83ea962259171d70ce92094d..b01f1dd14b47922abcb28599e72ab12085ced23c 100644
+index c950dfc7087d9d66a45724926d21f9bb3a0ee30f..6db99a6c7cb59f4ae23cee76e4ce3d794ff3dfc7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -266,6 +266,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0147-Add-MC-4-fix-back.patch b/patches/server/0146-Add-MC-4-fix-back.patch
similarity index 100%
rename from patches/server/0147-Add-MC-4-fix-back.patch
rename to patches/server/0146-Add-MC-4-fix-back.patch
diff --git a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 96%
rename from patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch
index d1648a2f9..a5625e6f1 100644
--- a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
          return true;
          // Purpur end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e900eaa5a 100644
+index 6db99a6c7cb59f4ae23cee76e4ce3d794ff3dfc7..6241a3bb264de15fabb3de5b296ee0320dd7ca8b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -368,9 +368,12 @@ public class PurpurWorldConfig {
+@@ -366,9 +366,12 @@ public class PurpurWorldConfig {
      public boolean boatsDoFallDamage = true;
      public boolean disableDropsOnCrammingDeath = false;
      public boolean entitiesCanUsePortals = true;
@@ -409,7 +409,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
-@@ -382,9 +385,12 @@ public class PurpurWorldConfig {
+@@ -380,9 +383,12 @@ public class PurpurWorldConfig {
          boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
          entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -422,7 +422,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
          tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
-@@ -454,9 +460,11 @@ public class PurpurWorldConfig {
+@@ -452,9 +458,11 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
@@ -434,7 +434,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
          farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
      }
-@@ -488,6 +496,11 @@ public class PurpurWorldConfig {
+@@ -486,6 +494,11 @@ public class PurpurWorldConfig {
          kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
      }
  
@@ -446,7 +446,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      public boolean respawnAnchorExplode = true;
      public double respawnAnchorExplosionPower = 5.0D;
      public boolean respawnAnchorExplosionFire = true;
-@@ -521,6 +534,11 @@ public class PurpurWorldConfig {
+@@ -519,6 +532,11 @@ public class PurpurWorldConfig {
          stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
      }
  
@@ -458,7 +458,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      public double twistingVinesGrowthModifier = 0.10D;
      public int twistingVinesMaxGrowthAge = 25;
      private void twistingVinesSettings() {
-@@ -699,6 +717,7 @@ public class PurpurWorldConfig {
+@@ -697,6 +715,7 @@ public class PurpurWorldConfig {
      public double creeperMaxHealth = 20.0D;
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -710,6 +729,7 @@ public class PurpurWorldConfig {
+@@ -708,6 +727,7 @@ public class PurpurWorldConfig {
          creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean dolphinRidable = false;
-@@ -797,6 +817,7 @@ public class PurpurWorldConfig {
+@@ -795,6 +815,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxY = 256D;
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -812,6 +833,7 @@ public class PurpurWorldConfig {
+@@ -810,6 +831,7 @@ public class PurpurWorldConfig {
          }
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean endermanRidable = false;
-@@ -819,6 +841,7 @@ public class PurpurWorldConfig {
+@@ -817,6 +839,7 @@ public class PurpurWorldConfig {
      public double endermanMaxHealth = 40.0D;
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -830,6 +853,7 @@ public class PurpurWorldConfig {
+@@ -828,6 +851,7 @@ public class PurpurWorldConfig {
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean endermiteRidable = false;
-@@ -849,6 +873,7 @@ public class PurpurWorldConfig {
+@@ -847,6 +871,7 @@ public class PurpurWorldConfig {
      public boolean evokerRidable = false;
      public boolean evokerRidableInWater = false;
      public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void evokerSettings() {
          evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
          evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
-@@ -858,6 +883,7 @@ public class PurpurWorldConfig {
+@@ -856,6 +881,7 @@ public class PurpurWorldConfig {
              set("mobs.evoker.attributes.max_health", oldValue);
          }
          evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean foxRidable = false;
-@@ -865,6 +891,7 @@ public class PurpurWorldConfig {
+@@ -863,6 +889,7 @@ public class PurpurWorldConfig {
      public double foxMaxHealth = 10.0D;
      public boolean foxTypeChangesWithTulips = false;
      public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -876,6 +903,7 @@ public class PurpurWorldConfig {
+@@ -874,6 +901,7 @@ public class PurpurWorldConfig {
          foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
          foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean ghastRidable = false;
-@@ -1271,6 +1299,7 @@ public class PurpurWorldConfig {
+@@ -1269,6 +1297,7 @@ public class PurpurWorldConfig {
      public boolean piglinRidable = false;
      public boolean piglinRidableInWater = false;
      public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1280,6 +1309,7 @@ public class PurpurWorldConfig {
+@@ -1278,6 +1307,7 @@ public class PurpurWorldConfig {
              set("mobs.piglin.attributes.max_health", oldValue);
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean piglinBruteRidable = false;
-@@ -1299,6 +1329,7 @@ public class PurpurWorldConfig {
+@@ -1297,6 +1327,7 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void pillagerSettings() {
          pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
          pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
-@@ -1308,6 +1339,7 @@ public class PurpurWorldConfig {
+@@ -1306,6 +1337,7 @@ public class PurpurWorldConfig {
              set("mobs.pillager.attributes.max_health", oldValue);
          }
          pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean polarBearRidable = false;
-@@ -1349,6 +1381,7 @@ public class PurpurWorldConfig {
+@@ -1347,6 +1379,7 @@ public class PurpurWorldConfig {
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
      public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1361,11 +1394,13 @@ public class PurpurWorldConfig {
+@@ -1359,11 +1392,13 @@ public class PurpurWorldConfig {
          rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
          rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1375,6 +1410,7 @@ public class PurpurWorldConfig {
+@@ -1373,6 +1408,7 @@ public class PurpurWorldConfig {
              set("mobs.ravager.attributes.max_health", oldValue);
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean salmonRidable = false;
-@@ -1393,6 +1429,7 @@ public class PurpurWorldConfig {
+@@ -1391,6 +1427,7 @@ public class PurpurWorldConfig {
      public boolean sheepRidableInWater = false;
      public double sheepMaxHealth = 8.0D;
      public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1403,6 +1440,7 @@ public class PurpurWorldConfig {
+@@ -1401,6 +1438,7 @@ public class PurpurWorldConfig {
          }
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
          sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean shulkerRidable = false;
-@@ -1422,6 +1460,7 @@ public class PurpurWorldConfig {
+@@ -1420,6 +1458,7 @@ public class PurpurWorldConfig {
      public boolean silverfishRidable = false;
      public boolean silverfishRidableInWater = false;
      public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void silverfishSettings() {
          silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
          silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
-@@ -1431,6 +1470,7 @@ public class PurpurWorldConfig {
+@@ -1429,6 +1468,7 @@ public class PurpurWorldConfig {
              set("mobs.silverfish.attributes.max_health", oldValue);
          }
          silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean skeletonRidable = false;
-@@ -1498,6 +1538,7 @@ public class PurpurWorldConfig {
+@@ -1496,6 +1536,7 @@ public class PurpurWorldConfig {
      public int snowGolemSnowBallMax = 20;
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1514,6 +1555,7 @@ public class PurpurWorldConfig {
+@@ -1512,6 +1553,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);
@@ -648,7 +648,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean squidRidable = false;
-@@ -1673,6 +1715,7 @@ public class PurpurWorldConfig {
+@@ -1671,6 +1713,7 @@ public class PurpurWorldConfig {
      public int villagerLobotomizeCheck = 60;
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1699,6 +1742,7 @@ public class PurpurWorldConfig {
+@@ -1697,6 +1740,7 @@ public class PurpurWorldConfig {
          villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean vindicatorRidable = false;
-@@ -1755,6 +1799,7 @@ public class PurpurWorldConfig {
+@@ -1753,6 +1797,7 @@ public class PurpurWorldConfig {
      public double witherMaxHealth = 300.0D;
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1771,6 +1816,7 @@ public class PurpurWorldConfig {
+@@ -1769,6 +1814,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);
@@ -680,7 +680,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -1836,6 +1882,7 @@ public class PurpurWorldConfig {
+@@ -1834,6 +1880,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index b01f1dd14b47922abcb28599e72ab12085ced23c..9215917b9460796f4a498c51b1c4c50e
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1855,6 +1902,7 @@ public class PurpurWorldConfig {
+@@ -1853,6 +1900,7 @@ public class PurpurWorldConfig {
          } catch (IllegalArgumentException ignore) {
              zombieBreakDoorMinDifficulty = Difficulty.HARD;
          }
diff --git a/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 93%
rename from patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch
index b25c1f566..10008eae2 100644
--- a/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch
+++ b/patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch
@@ -22,10 +22,10 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
              org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9215917b9460796f4a498c51b1c4c50e900eaa5a..c83b43a37df66653811e56f0369b6416d5e8240f 100644
+index 6241a3bb264de15fabb3de5b296ee0320dd7ca8b..e9c7fd87a0f135649e200e782d40f37766ffc34c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -371,6 +371,7 @@ public class PurpurWorldConfig {
+@@ -369,6 +369,7 @@ public class PurpurWorldConfig {
      public boolean entitiesPickUpLootBypassMobGriefing = false;
      public boolean fireballsBypassMobGriefing = false;
      public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 9215917b9460796f4a498c51b1c4c50e900eaa5a..c83b43a37df66653811e56f0369b6416
      public boolean persistentTileEntityDisplayNames = false;
      public boolean persistentDroppableEntityDisplayNames = false;
      public boolean projectilesBypassMobGriefing = false;
-@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
+@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
          entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
          fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
diff --git a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch b/patches/server/0149-Add-EntityTeleportHinderedEvent.patch
similarity index 98%
rename from patches/server/0150-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0149-Add-EntityTeleportHinderedEvent.patch
index 6ae24d3d7..50d145d00 100644
--- a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0149-Add-EntityTeleportHinderedEvent.patch
@@ -78,10 +78,10 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c83b43a37df66653811e56f0369b6416d5e8240f..66bf3fb4a799a172e8662d68549df8fbecb23d34 100644
+index e9c7fd87a0f135649e200e782d40f37766ffc34c..97752cc1fa8234469e2ffdaa1b3606d9c66b4736 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -370,6 +370,7 @@ public class PurpurWorldConfig {
+@@ -368,6 +368,7 @@ public class PurpurWorldConfig {
      public boolean entitiesCanUsePortals = true;
      public boolean entitiesPickUpLootBypassMobGriefing = false;
      public boolean fireballsBypassMobGriefing = false;
@@ -89,7 +89,7 @@ index c83b43a37df66653811e56f0369b6416d5e8240f..66bf3fb4a799a172e8662d68549df8fb
      public boolean milkCuresBadOmen = true;
      public boolean noteBlockIgnoreAbove = false;
      public boolean persistentTileEntityDisplayNames = false;
-@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
+@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
          entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
          entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
          fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
diff --git a/patches/server/0151-Add-StructureGenerateEvent.patch b/patches/server/0150-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0151-Add-StructureGenerateEvent.patch
rename to patches/server/0150-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0152-Farmland-trampling-changes.patch b/patches/server/0151-Farmland-trampling-changes.patch
similarity index 95%
rename from patches/server/0152-Farmland-trampling-changes.patch
rename to patches/server/0151-Farmland-trampling-changes.patch
index 7b2834b97..064d17b00 100644
--- a/patches/server/0152-Farmland-trampling-changes.patch
+++ b/patches/server/0151-Farmland-trampling-changes.patch
@@ -37,10 +37,10 @@ index 2a33fbdc1d047584b0cd4b3da5892ccd7efc6943..6bfaeaeb6f9accf269febbf3e0d71d57
              if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66bf3fb4a799a172e8662d68549df8fbecb23d34..510a30590795c9d60e62529930e1b3e360e890cb 100644
+index 97752cc1fa8234469e2ffdaa1b3606d9c66b4736..72324d44fa003acbe832998b4efb395095e93ef9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -467,10 +467,16 @@ public class PurpurWorldConfig {
+@@ -465,10 +465,16 @@ public class PurpurWorldConfig {
      public boolean farmlandBypassMobGriefing = false;
      public boolean farmlandGetsMoistFromBelow = false;
      public boolean farmlandAlpha = false;
diff --git a/patches/server/0153-Movement-options-for-armor-stands.patch b/patches/server/0152-Movement-options-for-armor-stands.patch
similarity index 98%
rename from patches/server/0153-Movement-options-for-armor-stands.patch
rename to patches/server/0152-Movement-options-for-armor-stands.patch
index dc10730ed..4ea24a0ae 100644
--- a/patches/server/0153-Movement-options-for-armor-stands.patch
+++ b/patches/server/0152-Movement-options-for-armor-stands.patch
@@ -66,7 +66,7 @@ index 796ab61f4513c02b0d55d34044d2f7084c447796..d119f8ab447bc17deabc494463de4961
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 510a30590795c9d60e62529930e1b3e360e890cb..8cadc5cf950b8189c9b0277a8778399769d41c91 100644
+index 72324d44fa003acbe832998b4efb395095e93ef9..64bfc25a823f26e751f6f27a829a8333cdb8e145 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -102,10 +102,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0154-Fix-stuck-in-portals.patch b/patches/server/0153-Fix-stuck-in-portals.patch
similarity index 91%
rename from patches/server/0154-Fix-stuck-in-portals.patch
rename to patches/server/0153-Fix-stuck-in-portals.patch
index 352aff546..688d6a7f7 100644
--- a/patches/server/0154-Fix-stuck-in-portals.patch
+++ b/patches/server/0153-Fix-stuck-in-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a9f5e97f210d64949fcf3c058e132559009a268f..4951eefa3e8fe40751ca2d2c3871da1d17bf53dc 100644
+index 21696b7a35cabca1c470304573c01557e21b7262..96f36bf1443bddcdca2f471e8beb56fd9ef37e16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player {
@@ -37,10 +37,10 @@ index 1ffbcac353fcb604ab41e3b4ed4f6555833c25ff..7d7d5db8c8206a68ae3c241e2106af45
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8cadc5cf950b8189c9b0277a8778399769d41c91..68363c8bfe8e61e3c59d3af019af8c103df9a67f 100644
+index 64bfc25a823f26e751f6f27a829a8333cdb8e145..d9116e08fe128991a729694549143be0ebb4bade 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -296,6 +296,7 @@ public class PurpurWorldConfig {
+@@ -295,6 +295,7 @@ public class PurpurWorldConfig {
      public int playerDeathExpDropMax = 100;
      public boolean teleportIfOutsideBorder = false;
      public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index 8cadc5cf950b8189c9b0277a8778399769d41c91..68363c8bfe8e61e3c59d3af019af8c10
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -308,6 +309,7 @@ public class PurpurWorldConfig {
+@@ -306,6 +307,7 @@ public class PurpurWorldConfig {
          playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
          teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
          totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
diff --git a/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
similarity index 93%
rename from patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
index 2917cb63d..2ccad436b 100644
--- a/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
@@ -70,10 +70,10 @@ index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bb
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe342b233ae8 100644
+index d9116e08fe128991a729694549143be0ebb4bade..c1adca881c703462fefbf1985950ac9d3a009804 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -634,6 +634,7 @@ public class PurpurWorldConfig {
+@@ -632,6 +632,7 @@ public class PurpurWorldConfig {
      public boolean blazeRidableInWater = false;
      public double blazeMaxY = 256D;
      public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      private void blazeSettings() {
          blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
          blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
-@@ -644,6 +645,7 @@ public class PurpurWorldConfig {
+@@ -642,6 +643,7 @@ public class PurpurWorldConfig {
              set("mobs.blaze.attributes.max_health", oldValue);
          }
          blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      }
  
      public boolean catRidable = false;
-@@ -860,6 +862,7 @@ public class PurpurWorldConfig {
+@@ -858,6 +860,7 @@ public class PurpurWorldConfig {
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -872,6 +875,7 @@ public class PurpurWorldConfig {
+@@ -870,6 +873,7 @@ public class PurpurWorldConfig {
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
          endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      }
  
      public boolean endermiteRidable = false;
-@@ -1557,6 +1561,7 @@ public class PurpurWorldConfig {
+@@ -1555,6 +1559,7 @@ public class PurpurWorldConfig {
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1574,6 +1579,7 @@ public class PurpurWorldConfig {
+@@ -1572,6 +1577,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);
@@ -121,7 +121,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      }
  
      public boolean squidRidable = false;
-@@ -1627,6 +1633,7 @@ public class PurpurWorldConfig {
+@@ -1625,6 +1631,7 @@ public class PurpurWorldConfig {
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 68363c8bfe8e61e3c59d3af019af8c103df9a67f..7801f5a1fdc6d24e809a80cfc785fe34
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1638,6 +1645,7 @@ public class PurpurWorldConfig {
+@@ -1636,6 +1643,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);
diff --git a/patches/server/0156-Config-to-always-tame-in-Creative.patch b/patches/server/0155-Config-to-always-tame-in-Creative.patch
similarity index 96%
rename from patches/server/0156-Config-to-always-tame-in-Creative.patch
rename to patches/server/0155-Config-to-always-tame-in-Creative.patch
index d43456b58..1f1118f19 100644
--- a/patches/server/0156-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0155-Config-to-always-tame-in-Creative.patch
@@ -59,10 +59,10 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd
                      this.navigation.stop();
                      this.setTarget((LivingEntity) null);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7801f5a1fdc6d24e809a80cfc785fe342b233ae8..90cb8803093e65109bad6818a88b293077d17928 100644
+index c1adca881c703462fefbf1985950ac9d3a009804..d088f0fd6a1ef56126c87b9e2ff2255dfe204d31 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -372,6 +372,7 @@ public class PurpurWorldConfig {
+@@ -370,6 +370,7 @@ public class PurpurWorldConfig {
      }
  
      public boolean useBetterMending = false;
@@ -70,7 +70,7 @@ index 7801f5a1fdc6d24e809a80cfc785fe342b233ae8..90cb8803093e65109bad6818a88b2930
      public boolean boatEjectPlayersOnLand = false;
      public boolean boatsDoFallDamage = true;
      public boolean disableDropsOnCrammingDeath = false;
-@@ -391,6 +392,7 @@ public class PurpurWorldConfig {
+@@ -389,6 +390,7 @@ public class PurpurWorldConfig {
      public int animalBreedingCooldownSeconds = 0;
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
diff --git a/patches/server/0157-End-crystal-explosion-options.patch b/patches/server/0156-End-crystal-explosion-options.patch
similarity index 97%
rename from patches/server/0157-End-crystal-explosion-options.patch
rename to patches/server/0156-End-crystal-explosion-options.patch
index 4ee6f9d44..7adf247f1 100644
--- a/patches/server/0157-End-crystal-explosion-options.patch
+++ b/patches/server/0156-End-crystal-explosion-options.patch
@@ -52,10 +52,10 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03
  
                  this.onDestroyedBy(source);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 90cb8803093e65109bad6818a88b293077d17928..4702127d6bc88a9edf02ec4c0b4ca24b9ba7d762 100644
+index d088f0fd6a1ef56126c87b9e2ff2255dfe204d31..62207ac2b2c53b3641a68911fd07fcbe41ec67ce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -474,6 +474,35 @@ public class PurpurWorldConfig {
+@@ -472,6 +472,35 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
diff --git a/patches/server/0158-Add-unsafe-Entity-serialization-API.patch b/patches/server/0157-Add-unsafe-Entity-serialization-API.patch
similarity index 98%
rename from patches/server/0158-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0157-Add-unsafe-Entity-serialization-API.patch
index e34e52fbf..00c5d208d 100644
--- a/patches/server/0158-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server/0157-Add-unsafe-Entity-serialization-API.patch
@@ -34,7 +34,7 @@ index 53fc3c278624d8c1d2f8bee6df27315d08875300..d79de006a0e636a23419b5be86911d16
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 82d56d8c4616f1012e70697dae8d1d31d7d53f2f..a84d3f474711a87897fdc29a2ec1569306562941 100644
+index 7a8db8d481e9487ea83a640af208242f4987ad28..f12eec135f8134409f1abe5c97ffee59913a4d9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -408,9 +408,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 92%
rename from patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index a31be76ba..960ba7e9e 100644
--- a/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -29,10 +29,10 @@ index bdcbe92cbe431727f5879a04bf734811ffd03c3d..257a1b91c65d9f66173cfe8a31f598a0
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4702127d6bc88a9edf02ec4c0b4ca24b9ba7d762..4c4e9996fee6667f40982a7d00efd21a60ab8ec6 100644
+index 62207ac2b2c53b3641a68911fd07fcbe41ec67ce..e7c5bd69c447b3082f541cd4f0e2879ffe471b50 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -869,6 +869,7 @@ public class PurpurWorldConfig {
+@@ -867,6 +867,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
      public boolean enderDragonBypassMobGriefing = false;
@@ -40,7 +40,7 @@ index 4702127d6bc88a9edf02ec4c0b4ca24b9ba7d762..4c4e9996fee6667f40982a7d00efd21a
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -885,6 +886,7 @@ public class PurpurWorldConfig {
+@@ -883,6 +884,7 @@ public class PurpurWorldConfig {
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
          enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -48,7 +48,7 @@ index 4702127d6bc88a9edf02ec4c0b4ca24b9ba7d762..4c4e9996fee6667f40982a7d00efd21a
      }
  
      public boolean endermanRidable = false;
-@@ -1857,6 +1859,7 @@ public class PurpurWorldConfig {
+@@ -1855,6 +1857,7 @@ public class PurpurWorldConfig {
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index 4702127d6bc88a9edf02ec4c0b4ca24b9ba7d762..4c4e9996fee6667f40982a7d00efd21a
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1874,6 +1877,7 @@ public class PurpurWorldConfig {
+@@ -1872,6 +1875,7 @@ 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);
diff --git a/patches/server/0160-Dont-run-with-scissors.patch b/patches/server/0159-Dont-run-with-scissors.patch
similarity index 95%
rename from patches/server/0160-Dont-run-with-scissors.patch
rename to patches/server/0159-Dont-run-with-scissors.patch
index d3be652e0..1c67e58e7 100644
--- a/patches/server/0160-Dont-run-with-scissors.patch
+++ b/patches/server/0159-Dont-run-with-scissors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 637737d28d3a8951a5def99fe27fdb4db5057acb..daee19f2d949ecb10931444a4e1a3f27bd3edd3d 100644
+index f07dfd7abebf904c7bdc6751e849fe32d765afc6..69834b75a81491dcd3133d95cf81cc3cc91bb782 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1555,6 +1555,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,7 +43,7 @@ index 7ed1d5b2aab3442f80532c62a398353e89c18b0c..45d536954b8007de69c6f74942c22935
  
      public static int seedFeatureBamboo = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4c4e9996fee6667f40982a7d00efd21a60ab8ec6..e26f95fcc3fd1300af9a9101bf127d2418a4cb31 100644
+index e7c5bd69c447b3082f541cd4f0e2879ffe471b50..5c88e603a5a2db48ae19a360e0f44f86bec11a5d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -156,6 +156,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0161-One-Punch-Man.patch b/patches/server/0160-One-Punch-Man.patch
similarity index 93%
rename from patches/server/0161-One-Punch-Man.patch
rename to patches/server/0160-One-Punch-Man.patch
index f4962b52f..643b6f73b 100644
--- a/patches/server/0161-One-Punch-Man.patch
+++ b/patches/server/0160-One-Punch-Man.patch
@@ -30,10 +30,10 @@ index 11abf0df677a9d609d82cbcb8e3967fc4b613362..59e4e240420a11b19b6da199092590eb
                  if (human) {
                      // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e26f95fcc3fd1300af9a9101bf127d2418a4cb31..0c86785e1cb7b323f3ca9542662acc43fd85c994 100644
+index 5c88e603a5a2db48ae19a360e0f44f86bec11a5d..26636dea0ce6ed0d58c44bdfbf18a4305d777874 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -301,6 +301,7 @@ public class PurpurWorldConfig {
+@@ -300,6 +300,7 @@ public class PurpurWorldConfig {
      public boolean teleportIfOutsideBorder = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
@@ -41,7 +41,7 @@ index e26f95fcc3fd1300af9a9101bf127d2418a4cb31..0c86785e1cb7b323f3ca9542662acc43
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -314,6 +315,7 @@ public class PurpurWorldConfig {
+@@ -312,6 +313,7 @@ public class PurpurWorldConfig {
          teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
          totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
          playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
diff --git a/patches/server/0162-Add-config-for-snow-on-blue-ice.patch b/patches/server/0161-Add-config-for-snow-on-blue-ice.patch
similarity index 94%
rename from patches/server/0162-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0161-Add-config-for-snow-on-blue-ice.patch
index 6c965c324..c1d480e1d 100644
--- a/patches/server/0162-Add-config-for-snow-on-blue-ice.patch
+++ b/patches/server/0161-Add-config-for-snow-on-blue-ice.patch
@@ -29,10 +29,10 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c86785e1cb7b323f3ca9542662acc43fd85c994..7f1441f6ff759fc5caf7cd21649fc12a6b54de78 100644
+index 26636dea0ce6ed0d58c44bdfbf18a4305d777874..4223cdaa1b0f89e18a54375a69e78bdfd05df0ba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -535,6 +535,11 @@ public class PurpurWorldConfig {
+@@ -533,6 +533,11 @@ public class PurpurWorldConfig {
          furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
      }
  
diff --git a/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 98%
rename from patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
index d238d3751..41a3f3dbd 100644
--- a/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
+++ b/patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
@@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
                  // Paper end
                  if (user instanceof net.minecraft.server.level.ServerPlayer) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7f1441f6ff759fc5caf7cd21649fc12a6b54de78..c76285978d8d485652541985b190444d4e6e08c2 100644
+index 4223cdaa1b0f89e18a54375a69e78bdfd05df0ba..2595fc1fc1fd89238d9217339fefc6a4fd1ac6a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -158,6 +158,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 88%
rename from patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch
index 82aa688ee..3b0abe5e6 100644
--- a/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4951eefa3e8fe40751ca2d2c3871da1d17bf53dc..3774d2f5bf18cb448e81a1776207edf9064465f6 100644
+index 96f36bf1443bddcdca2f471e8beb56fd9ef37e16..acbc7f61fe3669679f559f2942675c0fde61a8ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1304,7 +1304,7 @@ public class ServerPlayer extends Player {
@@ -18,10 +18,10 @@ index 4951eefa3e8fe40751ca2d2c3871da1d17bf53dc..3774d2f5bf18cb448e81a1776207edf9
                          }
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c76285978d8d485652541985b190444d4e6e08c2..281bd07cfc1c78e5831cab4147a941b65313ed26 100644
+index 2595fc1fc1fd89238d9217339fefc6a4fd1ac6a9..66f49b451cee6f8e42df5172e55a22d225fd0759 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -310,6 +310,7 @@ public class PurpurWorldConfig {
+@@ -309,6 +309,7 @@ public class PurpurWorldConfig {
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
      public boolean creativeOnePunch = false;
@@ -29,7 +29,7 @@ index c76285978d8d485652541985b190444d4e6e08c2..281bd07cfc1c78e5831cab4147a941b6
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -324,6 +325,7 @@ public class PurpurWorldConfig {
+@@ -322,6 +323,7 @@ public class PurpurWorldConfig {
          totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
          playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
          creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
diff --git a/patches/server/0165-Add-back-player-spawned-endermite-API.patch b/patches/server/0164-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0165-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0164-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 94%
rename from patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
index 663754a6f..c975622ac 100644
--- a/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch
+++ b/patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
@@ -18,10 +18,10 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 281bd07cfc1c78e5831cab4147a941b65313ed26..f948a7793ecb3382ef687b544051217bff0e2301 100644
+index 66f49b451cee6f8e42df5172e55a22d225fd0759..e747fc2e3db032b5ded70b5ac93a513db618a515 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -917,6 +917,8 @@ public class PurpurWorldConfig {
+@@ -915,6 +915,8 @@ public class PurpurWorldConfig {
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
      public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 281bd07cfc1c78e5831cab4147a941b65313ed26..f948a7793ecb3382ef687b544051217b
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -925,11 +927,17 @@ public class PurpurWorldConfig {
+@@ -923,11 +925,17 @@ public class PurpurWorldConfig {
              set("mobs.enderman.attributes.max-health", null);
              set("mobs.enderman.attributes.max_health", oldValue);
          }
diff --git a/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 93%
rename from patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
index c6228e870..1e969c042 100644
--- a/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
+++ b/patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
@@ -20,10 +20,10 @@ index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162
          } else {
              Vec3 vec3d = player.getViewVector(1.0F).normalize();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f948a7793ecb3382ef687b544051217bff0e2301..ae24579b4ea9a292894f88561eb50aa377904df1 100644
+index e747fc2e3db032b5ded70b5ac93a513db618a515..b5332678b6185410ac86d1e8765c13d8ab449c5f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -919,6 +919,8 @@ public class PurpurWorldConfig {
+@@ -917,6 +917,8 @@ public class PurpurWorldConfig {
      public boolean endermanTakeDamageFromWater = true;
      public boolean endermanAggroEndermites = true;
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index f948a7793ecb3382ef687b544051217bff0e2301..ae24579b4ea9a292894f88561eb50aa3
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -938,6 +940,8 @@ public class PurpurWorldConfig {
+@@ -936,6 +938,8 @@ public class PurpurWorldConfig {
          endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
          endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
diff --git a/patches/server/0168-Tick-fluids-config.patch b/patches/server/0167-Tick-fluids-config.patch
similarity index 94%
rename from patches/server/0168-Tick-fluids-config.patch
rename to patches/server/0167-Tick-fluids-config.patch
index 9562d7238..7174590e6 100644
--- a/patches/server/0168-Tick-fluids-config.patch
+++ b/patches/server/0167-Tick-fluids-config.patch
@@ -36,10 +36,10 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ae24579b4ea9a292894f88561eb50aa377904df1..59f8d6e21fb328c9d728376d6920ebcbfc017956 100644
+index b5332678b6185410ac86d1e8765c13d8ab449c5f..c2a359358d2ba674762998a26034f24a394fbcd6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -401,6 +401,7 @@ public class PurpurWorldConfig {
+@@ -399,6 +399,7 @@ public class PurpurWorldConfig {
      public boolean persistentTileEntityDisplayNames = false;
      public boolean persistentDroppableEntityDisplayNames = false;
      public boolean projectilesBypassMobGriefing = false;
@@ -47,7 +47,7 @@ index ae24579b4ea9a292894f88561eb50aa377904df1..59f8d6e21fb328c9d728376d6920ebcb
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
-@@ -421,6 +422,7 @@ public class PurpurWorldConfig {
+@@ -419,6 +420,7 @@ public class PurpurWorldConfig {
          persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
          persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
          projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);
diff --git a/patches/server/0169-Config-to-disable-Llama-caravans.patch b/patches/server/0168-Config-to-disable-Llama-caravans.patch
similarity index 94%
rename from patches/server/0169-Config-to-disable-Llama-caravans.patch
rename to patches/server/0168-Config-to-disable-Llama-caravans.patch
index c8f4cb405..285219056 100644
--- a/patches/server/0169-Config-to-disable-Llama-caravans.patch
+++ b/patches/server/0168-Config-to-disable-Llama-caravans.patch
@@ -32,10 +32,10 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 59f8d6e21fb328c9d728376d6920ebcbfc017956..8b2cd66441b9b88a11d295b787fdbbddf8291c64 100644
+index c2a359358d2ba674762998a26034f24a394fbcd6..d5b79940ac74ecff4bfa3baa46edc9bcc604ebbb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1185,6 +1185,7 @@ public class PurpurWorldConfig {
+@@ -1183,6 +1183,7 @@ public class PurpurWorldConfig {
      public double llamaMovementSpeedMin = 0.175D;
      public double llamaMovementSpeedMax = 0.175D;
      public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 59f8d6e21fb328c9d728376d6920ebcbfc017956..8b2cd66441b9b88a11d295b787fdbbdd
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1202,6 +1203,7 @@ public class PurpurWorldConfig {
+@@ -1200,6 +1201,7 @@ public class PurpurWorldConfig {
          llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
diff --git a/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0169-Config-to-make-Creepers-explode-on-death.patch
similarity index 94%
rename from patches/server/0170-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0169-Config-to-make-Creepers-explode-on-death.patch
index cce9a06cd..ebba20c02 100644
--- a/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0169-Config-to-make-Creepers-explode-on-death.patch
@@ -50,10 +50,10 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
  
      private void spawnLingeringCloud() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8b2cd66441b9b88a11d295b787fdbbddf8291c64..0d79dd9d7293120ae0a5e6e032a0e41a65c55c4a 100644
+index d5b79940ac74ecff4bfa3baa46edc9bcc604ebbb..93868f9f6c3ab28d9e37d26e13f708b2ff6ab7f1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -792,6 +792,7 @@ public class PurpurWorldConfig {
+@@ -790,6 +790,7 @@ public class PurpurWorldConfig {
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
@@ -61,7 +61,7 @@ index 8b2cd66441b9b88a11d295b787fdbbddf8291c64..0d79dd9d7293120ae0a5e6e032a0e41a
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -804,6 +805,7 @@ public class PurpurWorldConfig {
+@@ -802,6 +803,7 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
diff --git a/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
similarity index 95%
rename from patches/server/0171-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
index c94c4c5ab..3a1974ed8 100644
--- a/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch
+++ b/patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0d79dd9d7293120ae0a5e6e032a0e41a65c55c4a..8e97819337e41dcfeb58d7c1ad7c0de7f94cbd1d 100644
+index 93868f9f6c3ab28d9e37d26e13f708b2ff6ab7f1..8f00587f3097b76455404bc11b9632cc467e04c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1495,6 +1495,7 @@ public class PurpurWorldConfig {
+@@ -1493,6 +1493,7 @@ public class PurpurWorldConfig {
      public boolean ravagerRidableInWater = false;
      public double ravagerMaxHealth = 100.0D;
      public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 0d79dd9d7293120ae0a5e6e032a0e41a65c55c4a..8e97819337e41dcfeb58d7c1ad7c0de7
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1505,6 +1506,23 @@ public class PurpurWorldConfig {
+@@ -1503,6 +1504,23 @@ public class PurpurWorldConfig {
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
          ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
diff --git a/patches/server/0172-Sneak-to-bulk-process-composter.patch b/patches/server/0171-Sneak-to-bulk-process-composter.patch
similarity index 97%
rename from patches/server/0172-Sneak-to-bulk-process-composter.patch
rename to patches/server/0171-Sneak-to-bulk-process-composter.patch
index 391b1e8f1..118fb8346 100644
--- a/patches/server/0172-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0171-Sneak-to-bulk-process-composter.patch
@@ -75,10 +75,10 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
          int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8e97819337e41dcfeb58d7c1ad7c0de7f94cbd1d..0dbaabbd8e8aa40b94b55e0747f04a87b66621c2 100644
+index 8f00587f3097b76455404bc11b9632cc467e04c1..b4fa4646e240ffe93365f47cd7c3ec46b59cf826 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -485,6 +485,11 @@ public class PurpurWorldConfig {
+@@ -483,6 +483,11 @@ public class PurpurWorldConfig {
          chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
      }
  
diff --git a/patches/server/0173-Config-for-skipping-night.patch b/patches/server/0172-Config-for-skipping-night.patch
similarity index 92%
rename from patches/server/0173-Config-for-skipping-night.patch
rename to patches/server/0172-Config-for-skipping-night.patch
index 34932b308..f91972237 100644
--- a/patches/server/0173-Config-for-skipping-night.patch
+++ b/patches/server/0172-Config-for-skipping-night.patch
@@ -18,10 +18,10 @@ index 3bc63f24bf8c07b89562887bdc8cf7569d7b33b4..27d41f7e03404d349a465848235c63b1
              long l = this.levelData.getDayTime() + 24000L;
              TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0dbaabbd8e8aa40b94b55e0747f04a87b66621c2..faed98c18ea0014ffb3c84ef4b6983683ee9b92c 100644
+index b4fa4646e240ffe93365f47cd7c3ec46b59cf826..c994f82b392e26a55f1e0d8f1d95a9b68d6b3ad3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -311,6 +311,7 @@ public class PurpurWorldConfig {
+@@ -310,6 +310,7 @@ public class PurpurWorldConfig {
      public boolean playerFixStuckPortal = false;
      public boolean creativeOnePunch = false;
      public boolean playerSleepNearMonsters = false;
@@ -29,7 +29,7 @@ index 0dbaabbd8e8aa40b94b55e0747f04a87b66621c2..faed98c18ea0014ffb3c84ef4b698368
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -326,6 +327,7 @@ public class PurpurWorldConfig {
+@@ -324,6 +325,7 @@ public class PurpurWorldConfig {
          playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
          creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
          playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
diff --git a/patches/server/0174-Add-config-for-villager-trading.patch b/patches/server/0173-Add-config-for-villager-trading.patch
similarity index 93%
rename from patches/server/0174-Add-config-for-villager-trading.patch
rename to patches/server/0173-Add-config-for-villager-trading.patch
index d175d7bfa..010a9fb08 100644
--- a/patches/server/0174-Add-config-for-villager-trading.patch
+++ b/patches/server/0173-Add-config-for-villager-trading.patch
@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index faed98c18ea0014ffb3c84ef4b6983683ee9b92c..a6bc8130656d34d4a5134ef9bb7cb72f470573a8 100644
+index c994f82b392e26a55f1e0d8f1d95a9b68d6b3ad3..7740e9981d89d7f36ae51ba0e06895772cd01f71 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1839,6 +1839,7 @@ public class PurpurWorldConfig {
+@@ -1837,6 +1837,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index faed98c18ea0014ffb3c84ef4b6983683ee9b92c..a6bc8130656d34d4a5134ef9bb7cb72f
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
+@@ -1864,6 +1865,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);
@@ -50,7 +50,7 @@ index faed98c18ea0014ffb3c84ef4b6983683ee9b92c..a6bc8130656d34d4a5134ef9bb7cb72f
      }
  
      public boolean vindicatorRidable = false;
-@@ -1889,6 +1891,7 @@ public class PurpurWorldConfig {
+@@ -1887,6 +1889,7 @@ public class PurpurWorldConfig {
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index faed98c18ea0014ffb3c84ef4b6983683ee9b92c..a6bc8130656d34d4a5134ef9bb7cb72f
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1900,6 +1903,7 @@ public class PurpurWorldConfig {
+@@ -1898,6 +1901,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);
diff --git a/patches/server/0175-Allow-infinity-on-crossbows.patch b/patches/server/0174-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0175-Allow-infinity-on-crossbows.patch
rename to patches/server/0174-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0176-Drowning-Settings.patch b/patches/server/0175-Drowning-Settings.patch
similarity index 97%
rename from patches/server/0176-Drowning-Settings.patch
rename to patches/server/0175-Drowning-Settings.patch
index 7665dc3e2..800baad84 100644
--- a/patches/server/0176-Drowning-Settings.patch
+++ b/patches/server/0175-Drowning-Settings.patch
@@ -40,7 +40,7 @@ index 59e4e240420a11b19b6da199092590ebe9096383..f6fa7ff3f896dca5e3b5cc5f7836f420
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a6bc8130656d34d4a5134ef9bb7cb72f470573a8..f0d9ae3699d18f1efaf4f0c0ba9e00b258e8c3a8 100644
+index 7740e9981d89d7f36ae51ba0e06895772cd01f71..eb03155d5bf4edbd6169598eedf0ff5819fa717e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -121,6 +121,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0177-Break-individual-slabs-when-sneaking.patch b/patches/server/0176-Break-individual-slabs-when-sneaking.patch
similarity index 95%
rename from patches/server/0177-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0176-Break-individual-slabs-when-sneaking.patch
index 063f4ac25..d40987924 100644
--- a/patches/server/0177-Break-individual-slabs-when-sneaking.patch
+++ b/patches/server/0176-Break-individual-slabs-when-sneaking.patch
@@ -47,10 +47,10 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f0d9ae3699d18f1efaf4f0c0ba9e00b258e8c3a8..0c73bb66f67e4d5b950e38521073ae2f67525602 100644
+index eb03155d5bf4edbd6169598eedf0ff5819fa717e..2e6c79fc845e273e5817ded62cb85cdd8c5fdf9e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -612,6 +612,11 @@ public class PurpurWorldConfig {
+@@ -610,6 +610,11 @@ public class PurpurWorldConfig {
          signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  
diff --git a/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 93%
rename from patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch
index b27cafb92..b80960f1d 100644
--- a/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch
+++ b/patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch
@@ -22,10 +22,10 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c73bb66f67e4d5b950e38521073ae2f67525602..c0bb5fb548537ceebd9800b3aad12ea01b2668a6 100644
+index 2e6c79fc845e273e5817ded62cb85cdd8c5fdf9e..74c4888e2522c414f31d4c73f601cd33e9c6fdc0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -564,8 +564,12 @@ public class PurpurWorldConfig {
+@@ -562,8 +562,12 @@ public class PurpurWorldConfig {
      }
  
      public boolean snowOnBlueIce = true;
diff --git a/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 96%
rename from patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
index 21d757db7..89e46896f 100644
--- a/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch
+++ b/patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
@@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134
  
      public ArmorStand(Level world, double x, double y, double z) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c0bb5fb548537ceebd9800b3aad12ea01b2668a6..6cd38e97a388227ea5ce721503d6d922b7687f25 100644
+index 74c4888e2522c414f31d4c73f601cd33e9c6fdc0..44cf702e0ac60c90e7ee7601ade3c28b95401edb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -105,6 +105,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0180-Option-to-make-doors-require-redstone.patch b/patches/server/0179-Option-to-make-doors-require-redstone.patch
similarity index 97%
rename from patches/server/0180-Option-to-make-doors-require-redstone.patch
rename to patches/server/0179-Option-to-make-doors-require-redstone.patch
index 54ea056ed..769677dd2 100644
--- a/patches/server/0180-Option-to-make-doors-require-redstone.patch
+++ b/patches/server/0179-Option-to-make-doors-require-redstone.patch
@@ -67,10 +67,10 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6cd38e97a388227ea5ce721503d6d922b7687f25..af79e9581b64954b83c8b2bba12106fe910a38f2 100644
+index 44cf702e0ac60c90e7ee7601ade3c28b95401edb..a0a2b065c4d5ec512ae20979e5620f56cb0a466a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -510,6 +510,16 @@ public class PurpurWorldConfig {
+@@ -508,6 +508,16 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
diff --git a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
similarity index 98%
rename from patches/server/0181-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
index b6f723b4d..16d4842a0 100644
--- a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
@@ -58,7 +58,7 @@ index 410ac71efff92dfa1f1e11895d0f5bf3fca1be17..f380659b261253e327f018ce9b54b151
                  ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 18da9a82fb2ca4b9b8d80e37df29c76c8214c37f..e61be8f9a9b26a9daa3f70ec028ed689dfd43c93 100644
+index 1ecc0b740758c878a5a196524fbaa238b6689ac5..b3b5b75e3df805027c5daa98d7fc1d4d5f0d9675 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -1137,6 +1137,12 @@ public final class ItemStack {
diff --git a/patches/server/0182-Configurable-sponge-absorption.patch b/patches/server/0181-Configurable-sponge-absorption.patch
similarity index 95%
rename from patches/server/0182-Configurable-sponge-absorption.patch
rename to patches/server/0181-Configurable-sponge-absorption.patch
index cab0d2db8..24cc39c73 100644
--- a/patches/server/0182-Configurable-sponge-absorption.patch
+++ b/patches/server/0181-Configurable-sponge-absorption.patch
@@ -43,10 +43,10 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index af79e9581b64954b83c8b2bba12106fe910a38f2..095c8ec876dae7a1d6d8c498ae33068533cb47b9 100644
+index a0a2b065c4d5ec512ae20979e5620f56cb0a466a..b97aff4c10b0bc216265e933ddc6f11aad20f679 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -638,6 +638,13 @@ public class PurpurWorldConfig {
+@@ -636,6 +636,13 @@ public class PurpurWorldConfig {
          spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
      }
  
diff --git a/patches/server/0183-Projectile-offset-config.patch b/patches/server/0182-Projectile-offset-config.patch
similarity index 98%
rename from patches/server/0183-Projectile-offset-config.patch
rename to patches/server/0182-Projectile-offset-config.patch
index e4a6059ed..4743a0a47 100644
--- a/patches/server/0183-Projectile-offset-config.patch
+++ b/patches/server/0182-Projectile-offset-config.patch
@@ -96,10 +96,10 @@ index 3f53dc8f250ad3f7616ce7ef0a2353caa0ab1879..29130aa9673a3956030f3e43b784ac46
                                  entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
                              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 095c8ec876dae7a1d6d8c498ae33068533cb47b9..7151f7ce6aa965b2470129213882ae82a2faaf4e 100644
+index b97aff4c10b0bc216265e933ddc6f11aad20f679..1ffa56e97d7ef8af69edeca39652760516806448 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -375,6 +375,23 @@ public class PurpurWorldConfig {
+@@ -373,6 +373,23 @@ public class PurpurWorldConfig {
          witherSkullDespawnRate = getInt("gameplay-mechanics.projectile-despawn-rates.wither_skull", witherSkullDespawnRate);
      }
  
diff --git a/patches/server/0184-Config-for-powered-rail-activation-distance.patch b/patches/server/0183-Config-for-powered-rail-activation-distance.patch
similarity index 92%
rename from patches/server/0184-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0183-Config-for-powered-rail-activation-distance.patch
index d712e3dbf..583edfb74 100644
--- a/patches/server/0184-Config-for-powered-rail-activation-distance.patch
+++ b/patches/server/0183-Config-for-powered-rail-activation-distance.patch
@@ -18,10 +18,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
          } else {
              int j = pos.getX();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7151f7ce6aa965b2470129213882ae82a2faaf4e..4a58b734851a2b692087bb12beb8cd52f260aa89 100644
+index 1ffa56e97d7ef8af69edeca39652760516806448..3ed9c17d51a01bf1e000096b2b7d519b5762042c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -650,6 +650,11 @@ public class PurpurWorldConfig {
+@@ -648,6 +648,11 @@ public class PurpurWorldConfig {
          slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);
      }
  
diff --git a/patches/server/0185-Piglin-portal-spawn-modifier.patch b/patches/server/0184-Piglin-portal-spawn-modifier.patch
similarity index 93%
rename from patches/server/0185-Piglin-portal-spawn-modifier.patch
rename to patches/server/0184-Piglin-portal-spawn-modifier.patch
index d5419b1f5..b2ffd25f7 100644
--- a/patches/server/0185-Piglin-portal-spawn-modifier.patch
+++ b/patches/server/0184-Piglin-portal-spawn-modifier.patch
@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
                  pos = pos.below();
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4a58b734851a2b692087bb12beb8cd52f260aa89..ac74663f213b272266874041f2f2940a0880bb92 100644
+index 3ed9c17d51a01bf1e000096b2b7d519b5762042c..0dd52d8a59360d235a664867abbeea7c56de61da 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1460,6 +1460,7 @@ public class PurpurWorldConfig {
+@@ -1458,6 +1458,7 @@ public class PurpurWorldConfig {
      public boolean piglinRidableInWater = false;
      public double piglinMaxHealth = 16.0D;
      public boolean piglinBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 4a58b734851a2b692087bb12beb8cd52f260aa89..ac74663f213b272266874041f2f2940a
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1470,6 +1471,7 @@ public class PurpurWorldConfig {
+@@ -1468,6 +1469,7 @@ public class PurpurWorldConfig {
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
          piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
diff --git a/patches/server/0186-Config-to-change-max-number-of-bees.patch b/patches/server/0185-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0186-Config-to-change-max-number-of-bees.patch
rename to patches/server/0185-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
similarity index 95%
rename from patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
index f58ed4cfa..6d66db958 100644
--- a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
@@ -31,10 +31,10 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd
              entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
              org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ac74663f213b272266874041f2f2940a0880bb92..fbe8d154c13c70424dddc71b656d536a5e7180fc 100644
+index 0dd52d8a59360d235a664867abbeea7c56de61da..fed64ffd7303d1273cb1f2b5343429844da37cc7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -617,6 +617,13 @@ public class PurpurWorldConfig {
+@@ -615,6 +615,13 @@ public class PurpurWorldConfig {
          kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
      }
  
diff --git a/patches/server/0188-Config-for-wither-explosion-radius.patch b/patches/server/0187-Config-for-wither-explosion-radius.patch
similarity index 91%
rename from patches/server/0188-Config-for-wither-explosion-radius.patch
rename to patches/server/0187-Config-for-wither-explosion-radius.patch
index df4166718..2e5e6b77c 100644
--- a/patches/server/0188-Config-for-wither-explosion-radius.patch
+++ b/patches/server/0187-Config-for-wither-explosion-radius.patch
@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fbe8d154c13c70424dddc71b656d536a5e7180fc..a758cf4401ad4bfda4a2f115c601e2669985aeb8 100644
+index fed64ffd7303d1273cb1f2b5343429844da37cc7..882814eeb2eb8e455fa32e255fa7318571dfd20d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1996,6 +1996,7 @@ public class PurpurWorldConfig {
+@@ -1994,6 +1994,7 @@ public class PurpurWorldConfig {
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
      public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index fbe8d154c13c70424dddc71b656d536a5e7180fc..a758cf4401ad4bfda4a2f115c601e266
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2014,6 +2015,7 @@ public class PurpurWorldConfig {
+@@ -2012,6 +2013,7 @@ public class PurpurWorldConfig {
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
diff --git a/patches/server/0189-Gamemode-extra-permissions.patch b/patches/server/0188-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0189-Gamemode-extra-permissions.patch
rename to patches/server/0188-Gamemode-extra-permissions.patch
diff --git a/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 94%
rename from patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
index d90bae3b2..d6ac56825 100644
--- a/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
+++ b/patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
@@ -18,10 +18,10 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2
              if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
                  level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a758cf4401ad4bfda4a2f115c601e2669985aeb8..0ee006d73d8b496b24ee217b36d1c08fd175449b 100644
+index 882814eeb2eb8e455fa32e255fa7318571dfd20d..ef67a38a10126ccc78574d0fb66498d91c53255e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -392,6 +392,21 @@ public class PurpurWorldConfig {
+@@ -390,6 +390,21 @@ public class PurpurWorldConfig {
          snowballProjectileOffset = getDouble("gameplay-mechanics.projectile-offset.snowball", snowballProjectileOffset);
      }
  
diff --git a/patches/server/0191-Configurable-piston-push-limit.patch b/patches/server/0190-Configurable-piston-push-limit.patch
similarity index 94%
rename from patches/server/0191-Configurable-piston-push-limit.patch
rename to patches/server/0190-Configurable-piston-push-limit.patch
index 4268c3ecd..314d69361 100644
--- a/patches/server/0191-Configurable-piston-push-limit.patch
+++ b/patches/server/0190-Configurable-piston-push-limit.patch
@@ -36,10 +36,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
                      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ee006d73d8b496b24ee217b36d1c08fd175449b..86e0d352537115d86e53b81f6899356aa1e683ca 100644
+index ef67a38a10126ccc78574d0fb66498d91c53255e..844b2387407ed275aad4d295ea8fe26976fb2a2a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -639,6 +639,11 @@ public class PurpurWorldConfig {
+@@ -637,6 +637,11 @@ public class PurpurWorldConfig {
          magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker);
      }
  
diff --git a/patches/server/0192-Configurable-broadcast-settings.patch b/patches/server/0191-Configurable-broadcast-settings.patch
similarity index 97%
rename from patches/server/0192-Configurable-broadcast-settings.patch
rename to patches/server/0191-Configurable-broadcast-settings.patch
index 8ab85d7e3..504c02098 100644
--- a/patches/server/0192-Configurable-broadcast-settings.patch
+++ b/patches/server/0191-Configurable-broadcast-settings.patch
@@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3774d2f5bf18cb448e81a1776207edf9064465f6..ae0269f40c6dd84961aaa6e4c5ba4230a7a6d173 100644
+index acbc7f61fe3669679f559f2942675c0fde61a8ec..cd26d6c8ba2d5d6b3b56e484e6e642ab646341e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -879,6 +879,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0193-Fix-SPIGOT-6278.patch b/patches/server/0192-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0193-Fix-SPIGOT-6278.patch
rename to patches/server/0192-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0194-Configurable-mob-blindness.patch b/patches/server/0193-Configurable-mob-blindness.patch
similarity index 93%
rename from patches/server/0194-Configurable-mob-blindness.patch
rename to patches/server/0193-Configurable-mob-blindness.patch
index b22461756..ce7a8d550 100644
--- a/patches/server/0194-Configurable-mob-blindness.patch
+++ b/patches/server/0193-Configurable-mob-blindness.patch
@@ -28,10 +28,10 @@ index f6fa7ff3f896dca5e3b5cc5f7836f4208b0ec8b6..dd88755ac380e5c85d5327d02bc3ec7e
  
          return d0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 86e0d352537115d86e53b81f6899356aa1e683ca..47ed713b7ec76c75b7b7ce98ef408c57f965a7b1 100644
+index 844b2387407ed275aad4d295ea8fe26976fb2a2a..f7d7e223388c07ce95a1fe2d05247b438f5078c9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -447,6 +447,7 @@ public class PurpurWorldConfig {
+@@ -445,6 +445,7 @@ public class PurpurWorldConfig {
      public boolean persistentDroppableEntityDisplayNames = false;
      public boolean projectilesBypassMobGriefing = false;
      public boolean tickFluids = true;
@@ -39,7 +39,7 @@ index 86e0d352537115d86e53b81f6899356aa1e683ca..47ed713b7ec76c75b7b7ce98ef408c57
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
-@@ -468,6 +469,7 @@ public class PurpurWorldConfig {
+@@ -466,6 +467,7 @@ public class PurpurWorldConfig {
          persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
          projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);
          tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);
diff --git a/patches/server/0195-Hide-hidden-players-from-entity-selector.patch b/patches/server/0194-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0195-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0194-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 93%
rename from patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
index 3c569b7ed..b9deac2fd 100644
--- a/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch
+++ b/patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
@@ -21,10 +21,10 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29
              if (!event.isCancelled()) {
                  this.dead = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 47ed713b7ec76c75b7b7ce98ef408c57f965a7b1..30d92aa0f2454f82c9662825338a64e8838ea2a2 100644
+index f7d7e223388c07ce95a1fe2d05247b438f5078c9..a394834ac68ad2316934e070e29567c6ad7d79c3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -888,6 +888,7 @@ public class PurpurWorldConfig {
+@@ -886,6 +886,7 @@ public class PurpurWorldConfig {
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
      public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 47ed713b7ec76c75b7b7ce98ef408c57f965a7b1..30d92aa0f2454f82c9662825338a64e8
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -901,6 +902,7 @@ public class PurpurWorldConfig {
+@@ -899,6 +900,7 @@ public class PurpurWorldConfig {
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
          creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
diff --git a/patches/server/0197-Iron-golem-poppy-calms-anger.patch b/patches/server/0196-Iron-golem-poppy-calms-anger.patch
similarity index 96%
rename from patches/server/0197-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0196-Iron-golem-poppy-calms-anger.patch
index 7eab0172b..21cf11265 100644
--- a/patches/server/0197-Iron-golem-poppy-calms-anger.patch
+++ b/patches/server/0196-Iron-golem-poppy-calms-anger.patch
@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
          this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
          this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 30d92aa0f2454f82c9662825338a64e8838ea2a2..f641718e12d9cc9d90065fc1ceb0b64a5b330fe8 100644
+index a394834ac68ad2316934e070e29567c6ad7d79c3..bf53110c2d18b65a8e1b9d376c3fdb4082544bd9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1263,6 +1263,7 @@ public class PurpurWorldConfig {
+@@ -1261,6 +1261,7 @@ public class PurpurWorldConfig {
      public boolean ironGolemRidableInWater = false;
      public boolean ironGolemCanSwim = false;
      public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index 30d92aa0f2454f82c9662825338a64e8838ea2a2..f641718e12d9cc9d90065fc1ceb0b64a
      private void ironGolemSettings() {
          ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
          ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
-@@ -1273,6 +1274,7 @@ public class PurpurWorldConfig {
+@@ -1271,6 +1272,7 @@ public class PurpurWorldConfig {
              set("mobs.iron_golem.attributes.max_health", oldValue);
          }
          ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
diff --git a/patches/server/0198-Breedable-parrots.patch b/patches/server/0197-Breedable-parrots.patch
similarity index 94%
rename from patches/server/0198-Breedable-parrots.patch
rename to patches/server/0197-Breedable-parrots.patch
index 205873c45..034071af2 100644
--- a/patches/server/0198-Breedable-parrots.patch
+++ b/patches/server/0197-Breedable-parrots.patch
@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f641718e12d9cc9d90065fc1ceb0b64a5b330fe8..0e15f98f4c29db6d4d94b895d483c2529ab07eae 100644
+index bf53110c2d18b65a8e1b9d376c3fdb4082544bd9..283736fd4015855db885ee1cb4bd82726c361285 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1399,6 +1399,7 @@ public class PurpurWorldConfig {
+@@ -1397,6 +1397,7 @@ public class PurpurWorldConfig {
      public boolean parrotRidableInWater = false;
      public double parrotMaxY = 256D;
      public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index f641718e12d9cc9d90065fc1ceb0b64a5b330fe8..0e15f98f4c29db6d4d94b895d483c252
      private void parrotSettings() {
          parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
          parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
-@@ -1409,6 +1410,7 @@ public class PurpurWorldConfig {
+@@ -1407,6 +1408,7 @@ public class PurpurWorldConfig {
              set("mobs.parrot.attributes.max_health", oldValue);
          }
          parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
diff --git a/patches/server/0199-Configurable-powered-rail-boost-modifier.patch b/patches/server/0198-Configurable-powered-rail-boost-modifier.patch
similarity index 96%
rename from patches/server/0199-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0198-Configurable-powered-rail-boost-modifier.patch
index 1f5402e30..8c2a6c904 100644
--- a/patches/server/0199-Configurable-powered-rail-boost-modifier.patch
+++ b/patches/server/0198-Configurable-powered-rail-boost-modifier.patch
@@ -18,7 +18,7 @@ index 1e3077a22d9d3d26356b865001dcce81c9c1d7e5..cc57ff699d159a0cc748e91b61d53965
                  Vec3 vec3d5 = this.getDeltaMovement();
                  double d21 = vec3d5.x;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0e15f98f4c29db6d4d94b895d483c2529ab07eae..e90bef6b4e65df466e648d7235f4a39352ceb1db 100644
+index 283736fd4015855db885ee1cb4bd82726c361285..a441932a1a0cc80d6cd0c6435ec6e4aa63730f79 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -226,6 +226,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
similarity index 91%
rename from patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
index 056be8afa..8ce299961 100644
--- a/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
@@ -18,10 +18,10 @@ index 656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe..5963b407d936e930a370677113ba947d
  
                      f += f1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e90bef6b4e65df466e648d7235f4a39352ceb1db..929953a172abbf4bfc307d8eddcf5c705d4d3fcb 100644
+index a441932a1a0cc80d6cd0c6435ec6e4aa63730f79..08099925e3f43df722e6c3d8ef84a0dac2e41a34 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -325,6 +325,7 @@ public class PurpurWorldConfig {
+@@ -324,6 +324,7 @@ public class PurpurWorldConfig {
      public boolean creativeOnePunch = false;
      public boolean playerSleepNearMonsters = false;
      public boolean playersSkipNight = true;
@@ -29,7 +29,7 @@ index e90bef6b4e65df466e648d7235f4a39352ceb1db..929953a172abbf4bfc307d8eddcf5c70
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -341,6 +342,7 @@ public class PurpurWorldConfig {
+@@ -339,6 +340,7 @@ public class PurpurWorldConfig {
          creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
          playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
          playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
diff --git a/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
similarity index 91%
rename from patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
index d09f6347b..79f6d0bba 100644
--- a/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch
+++ b/patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
@@ -17,10 +17,10 @@ index 78f51f3dd0e7249af69228479da932e9aea982d6..d9d4421f7f316281487828739168cfd6
              BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16));
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 929953a172abbf4bfc307d8eddcf5c705d4d3fcb..d5e71ffc637f2c1446a17af560e34e0effc886aa 100644
+index 08099925e3f43df722e6c3d8ef84a0dac2e41a34..a8629cbf4f6f15d265d72625b3bf2c84289d3728 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -558,6 +558,11 @@ public class PurpurWorldConfig {
+@@ -556,6 +556,11 @@ public class PurpurWorldConfig {
          });
      }
  
diff --git a/patches/server/0202-Config-for-unverified-username-message.patch b/patches/server/0201-Config-for-unverified-username-message.patch
similarity index 97%
rename from patches/server/0202-Config-for-unverified-username-message.patch
rename to patches/server/0201-Config-for-unverified-username-message.patch
index 135fb9412..daf9e68e8 100644
--- a/patches/server/0202-Config-for-unverified-username-message.patch
+++ b/patches/server/0201-Config-for-unverified-username-message.patch
@@ -18,7 +18,7 @@ index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..811b48e0b91e2af30a122b72803591e4
                      }
                  } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b2e3e6fee5268cd25d6ac70c03c1bb60a8c840de..13b07388f0e24c419a45ec98087572fb358f9d36 100644
+index 45626d15e91ac2c0fa745f2670d3877a7387e0d2..aa9bed62b71894b74f86ee1016d192293a702fd1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -166,6 +166,7 @@ public class PurpurConfig {
diff --git a/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0203-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
similarity index 95%
rename from patches/server/0204-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
index e3992ac1f..b163aa426 100644
--- a/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch
+++ b/patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
@@ -35,10 +35,10 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f
                  CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag());
                  if (!compoundTag.isEmpty()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d5e71ffc637f2c1446a17af560e34e0effc886aa..8e2bf617025c00ea8a7e4d7b4ba1e9a06012bc6e 100644
+index a8629cbf4f6f15d265d72625b3bf2c84289d3728..c88b71c8348d2faa68692a3579324f210f1c0b19 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -676,6 +676,11 @@ public class PurpurWorldConfig {
+@@ -674,6 +674,11 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
similarity index 94%
rename from patches/server/0205-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
index b2b5ebb81..424c3da09 100644
--- a/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch
+++ b/patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
@@ -31,10 +31,10 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8e2bf617025c00ea8a7e4d7b4ba1e9a06012bc6e..dbd705c3b91070e959991ecdb957941a359cf8e7 100644
+index c88b71c8348d2faa68692a3579324f210f1c0b19..a514f29544898631b2470d4955928e5674242129 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -780,6 +780,8 @@ public class PurpurWorldConfig {
+@@ -778,6 +778,8 @@ public class PurpurWorldConfig {
      public double beeMaxY = 256D;
      public double beeMaxHealth = 10.0D;
      public int beeBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 8e2bf617025c00ea8a7e4d7b4ba1e9a06012bc6e..dbd705c3b91070e959991ecdb957941a
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -791,6 +793,8 @@ public class PurpurWorldConfig {
+@@ -789,6 +791,8 @@ public class PurpurWorldConfig {
          }
          beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
          beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
diff --git a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0206-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0205-API-for-any-mob-to-burn-daylight.patch
index 4907f3f6c..e779b2c5c 100644
--- a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
@@ -89,7 +89,7 @@ index dd88755ac380e5c85d5327d02bc3ec7e06355e49..3df4ca11fc44facd02f358948473d84d
  
      public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2b8f2b72b3f1f3766436c41487ec8ecab350349a..ab55aa6f5717d191d0afb2da357178b294bad40e 100644
+index eeb8f5413e3dfb88744891255514c65c9fda8fa8..5a2f2743a72d7305c10e5651cfba655551df4ee6 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1635,17 +1635,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
similarity index 98%
rename from patches/server/0207-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
index eb03044b6..8c84d8b35 100644
--- a/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch
+++ b/patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
@@ -47,7 +47,7 @@ index 3df4ca11fc44facd02f358948473d84d1de48e2b..1354cd7e9805f16700d122b281be8038
          CompoundTag nbttagcompound = stack.getTag();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ab55aa6f5717d191d0afb2da357178b294bad40e..ad5197e5f814c02e81c52b2acb2e8554f746a28c 100644
+index 5a2f2743a72d7305c10e5651cfba655551df4ee6..a8c6d7da95fece2d909f55f3fc6fe7f1f632a01b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1020,6 +1020,41 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0208-Config-MobEffect-by-world.patch b/patches/server/0207-Config-MobEffect-by-world.patch
similarity index 98%
rename from patches/server/0208-Config-MobEffect-by-world.patch
rename to patches/server/0207-Config-MobEffect-by-world.patch
index a0a8cfb86..6805cb9c4 100644
--- a/patches/server/0208-Config-MobEffect-by-world.patch
+++ b/patches/server/0207-Config-MobEffect-by-world.patch
@@ -40,7 +40,7 @@ index 79e036d79dec2ec4404baf02c23ba5ccad20cdce..6706d8e6d43cc5f3058f08fdfde77bed
  
                  ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dbd705c3b91070e959991ecdb957941a359cf8e7..aacf74c26b8fcf2caa53a07e9aff27b8c187eb8e 100644
+index a514f29544898631b2470d4955928e5674242129..c6497e04af21ba471ab60e68cff32a28fec09768 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -282,6 +282,21 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0209-Beacon-Activation-Range-Configurable.patch b/patches/server/0208-Beacon-Activation-Range-Configurable.patch
similarity index 94%
rename from patches/server/0209-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0208-Beacon-Activation-Range-Configurable.patch
index 6bd987117..e6405880d 100644
--- a/patches/server/0209-Beacon-Activation-Range-Configurable.patch
+++ b/patches/server/0208-Beacon-Activation-Range-Configurable.patch
@@ -26,10 +26,10 @@ index 3281448bf37da8a1b4b7b44f10f4b2438b4a4f29..418c2ddf8ff50a5071b2a31585b77e9f
          } else {
              return effectRange;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aacf74c26b8fcf2caa53a07e9aff27b8c187eb8e..9915b25478b9240f53e17262a62697be291fcaf1 100644
+index c6497e04af21ba471ab60e68cff32a28fec09768..c5b90e021c08c8ae0bac45e7c3e241e2991ecf29 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -523,6 +523,17 @@ public class PurpurWorldConfig {
+@@ -521,6 +521,17 @@ public class PurpurWorldConfig {
          anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
      }
  
diff --git a/patches/server/0210-Add-toggle-for-sand-duping-fix.patch b/patches/server/0209-Add-toggle-for-sand-duping-fix.patch
similarity index 93%
rename from patches/server/0210-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0209-Add-toggle-for-sand-duping-fix.patch
index ab00c698f..a1a920811 100644
--- a/patches/server/0210-Add-toggle-for-sand-duping-fix.patch
+++ b/patches/server/0209-Add-toggle-for-sand-duping-fix.patch
@@ -27,10 +27,10 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..c765c182081fe83eb0f30dcbf97d8126
              }
              // Paper end - fix sand duping
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9915b25478b9240f53e17262a62697be291fcaf1..2e62961f8e2719b24b25222d2a411644ec7b1290 100644
+index c5b90e021c08c8ae0bac45e7c3e241e2991ecf29..0a267f30625462badeec3a4da290f2dbc1260805 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -702,6 +702,11 @@ public class PurpurWorldConfig {
+@@ -700,6 +700,11 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 95%
rename from patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
index 1b01d732f..1451f2c6f 100644
--- a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -45,10 +45,10 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182
              entity.portalWorld = ((ServerLevel)world);
              entity.portalBlock = pos.immutable();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2e62961f8e2719b24b25222d2a411644ec7b1290..a0e416c781735cbef670a28e3d9c67111f0201fc 100644
+index 0a267f30625462badeec3a4da290f2dbc1260805..762ede20fe7076da8b7c69707fbe779b7c5f7956 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -644,6 +644,11 @@ public class PurpurWorldConfig {
+@@ -642,6 +642,11 @@ public class PurpurWorldConfig {
          furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
      }
  
diff --git a/patches/server/0212-Flying-Fall-Damage-API.patch b/patches/server/0211-Flying-Fall-Damage-API.patch
similarity index 95%
rename from patches/server/0212-Flying-Fall-Damage-API.patch
rename to patches/server/0211-Flying-Fall-Damage-API.patch
index 5c79df62e..e7b590234 100644
--- a/patches/server/0212-Flying-Fall-Damage-API.patch
+++ b/patches/server/0211-Flying-Fall-Damage-API.patch
@@ -26,7 +26,7 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6926c5b521fdfc2913d0f130752aca8ccd5fa63..f423b72b11012325f3dd2702eda44bed8aef795f 100644
+index 5b3bfb4c6fb717f172a62899f8e8ff81ba062c8c..6b5ea129db39a9460dfc2ce02711f9014c45497d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2590,5 +2590,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0213-Make-lightning-rod-range-configurable.patch b/patches/server/0212-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0213-Make-lightning-rod-range-configurable.patch
rename to patches/server/0212-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 95%
rename from patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
index 6532e2c4f..aeb50e516 100644
--- a/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch
+++ b/patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
@@ -55,10 +55,10 @@ index 97133bd4af30d0ba92cbf884b83140f3399f92e2..c1130952e3fa22abaa27fcc1c4761c83
  
      public void eat(Item item, ItemStack stack) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a0e416c781735cbef670a28e3d9c67111f0201fc..24d91f12b882495b28c612a585bea184a83d6a5a 100644
+index 762ede20fe7076da8b7c69707fbe779b7c5f7956..faca09270c21c6312064f2176ceb740457da9628 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -341,6 +341,7 @@ public class PurpurWorldConfig {
+@@ -340,6 +340,7 @@ public class PurpurWorldConfig {
      public boolean playerSleepNearMonsters = false;
      public boolean playersSkipNight = true;
      public double playerCriticalDamageMultiplier = 1.5D;
@@ -66,7 +66,7 @@ index a0e416c781735cbef670a28e3d9c67111f0201fc..24d91f12b882495b28c612a585bea184
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -358,6 +359,7 @@ public class PurpurWorldConfig {
+@@ -356,6 +357,7 @@ public class PurpurWorldConfig {
          playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
          playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
          playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
diff --git a/patches/server/0215-Allow-player-join-full-server-by-permission.patch b/patches/server/0214-Allow-player-join-full-server-by-permission.patch
similarity index 100%
rename from patches/server/0215-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0214-Allow-player-join-full-server-by-permission.patch
diff --git a/patches/server/0216-Populator-seed-controls.patch b/patches/server/0215-Populator-seed-controls.patch
similarity index 95%
rename from patches/server/0216-Populator-seed-controls.patch
rename to patches/server/0215-Populator-seed-controls.patch
index c6992f316..83f2af342 100644
--- a/patches/server/0216-Populator-seed-controls.patch
+++ b/patches/server/0215-Populator-seed-controls.patch
@@ -39,10 +39,10 @@ index a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7..9fb19162c0e436122087d03d37b502a1
                      try {
                          region.setCurrentlyGenerating(supplier3);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24d91f12b882495b28c612a585bea184a83d6a5a..eec7c7a8c48186ad8d6ee5e8347be590b0cc9058 100644
+index faca09270c21c6312064f2176ceb740457da9628..3c5c9d66ff9bda8d6abfdabd86929fd5a12b701c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2260,4 +2260,9 @@ public class PurpurWorldConfig {
+@@ -2258,4 +2258,9 @@ 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);
      }
diff --git a/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0216-Add-permission-bypass-for-portal-waiting.patch
similarity index 100%
rename from patches/server/0217-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0216-Add-permission-bypass-for-portal-waiting.patch
diff --git a/patches/server/0218-Shulker-spawn-from-bullet-options.patch b/patches/server/0217-Shulker-spawn-from-bullet-options.patch
similarity index 96%
rename from patches/server/0218-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0217-Shulker-spawn-from-bullet-options.patch
index c5e7f8187..4d66fee0d 100644
--- a/patches/server/0218-Shulker-spawn-from-bullet-options.patch
+++ b/patches/server/0217-Shulker-spawn-from-bullet-options.patch
@@ -61,10 +61,10 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index eec7c7a8c48186ad8d6ee5e8347be590b0cc9058..3ebf5ba5d2900d09b8d95d9762acb7c2ac0db079 100644
+index 3c5c9d66ff9bda8d6abfdabd86929fd5a12b701c..ff6d4741e060674ef1c45f5a526d83affddec575 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1717,6 +1717,11 @@ public class PurpurWorldConfig {
+@@ -1715,6 +1715,11 @@ public class PurpurWorldConfig {
      public boolean shulkerRidable = false;
      public boolean shulkerRidableInWater = false;
      public double shulkerMaxHealth = 30.0D;
@@ -76,7 +76,7 @@ index eec7c7a8c48186ad8d6ee5e8347be590b0cc9058..3ebf5ba5d2900d09b8d95d9762acb7c2
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -1726,6 +1731,11 @@ public class PurpurWorldConfig {
+@@ -1724,6 +1729,11 @@ public class PurpurWorldConfig {
              set("mobs.shulker.attributes.max_health", oldValue);
          }
          shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
diff --git a/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0218-Eating-glow-berries-adds-glow-effect.patch
similarity index 97%
rename from patches/server/0219-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0218-Eating-glow-berries-adds-glow-effect.patch
index 857198630..60a47425c 100644
--- a/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch
+++ b/patches/server/0218-Eating-glow-berries-adds-glow-effect.patch
@@ -18,7 +18,7 @@ index 89d4b7e4cd4222b61b49833fceda56ffa39710fa..1eb50f0bc41db79f091f900861ba71d7
      public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS);
      public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ebf5ba5d2900d09b8d95d9762acb7c2ac0db079..cc9a68966a833172a9cffa997c23d30424c08d71 100644
+index ff6d4741e060674ef1c45f5a526d83affddec575..cc73654ef40f9a0d2ea03bd5f424747f1fb85044 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -173,6 +173,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0220-Option-to-make-drowned-break-doors.patch b/patches/server/0219-Option-to-make-drowned-break-doors.patch
similarity index 94%
rename from patches/server/0220-Option-to-make-drowned-break-doors.patch
rename to patches/server/0219-Option-to-make-drowned-break-doors.patch
index 45fb391da..44ef133e2 100644
--- a/patches/server/0220-Option-to-make-drowned-break-doors.patch
+++ b/patches/server/0219-Option-to-make-drowned-break-doors.patch
@@ -34,10 +34,10 @@ index 8d3ce6c97a8734c0d13844cafca251a3f4dce8a4..a004d59483dc3ffb404ae28daf76c807
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc9a68966a833172a9cffa997c23d30424c08d71..4292a2957f09ffe59e9465b26148fb2222fab85e 100644
+index cc73654ef40f9a0d2ea03bd5f424747f1fb85044..dd8681aa02b27f766b7e4d4e79afa26fb2b21d3f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1016,6 +1016,7 @@ public class PurpurWorldConfig {
+@@ -1014,6 +1014,7 @@ public class PurpurWorldConfig {
      public boolean drownedJockeyOnlyBaby = true;
      public double drownedJockeyChance = 0.05D;
      public boolean drownedJockeyTryExistingChickens = true;
@@ -45,7 +45,7 @@ index cc9a68966a833172a9cffa997c23d30424c08d71..4292a2957f09ffe59e9465b26148fb22
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -1029,6 +1030,7 @@ public class PurpurWorldConfig {
+@@ -1027,6 +1028,7 @@ public class PurpurWorldConfig {
          drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
          drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
          drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
diff --git a/patches/server/0221-Configurable-hunger-starvation-damage.patch b/patches/server/0220-Configurable-hunger-starvation-damage.patch
similarity index 91%
rename from patches/server/0221-Configurable-hunger-starvation-damage.patch
rename to patches/server/0220-Configurable-hunger-starvation-damage.patch
index fea23e744..d0825fcbb 100644
--- a/patches/server/0221-Configurable-hunger-starvation-damage.patch
+++ b/patches/server/0220-Configurable-hunger-starvation-damage.patch
@@ -18,10 +18,10 @@ index c1130952e3fa22abaa27fcc1c4761c831dc56cc3..1ac08eca469739cb52abd38483c431b6
  
                  this.tickTimer = 0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4292a2957f09ffe59e9465b26148fb2222fab85e..a472b1ff8fc0a0a23c72283e943b0bf7f5447b1b 100644
+index dd8681aa02b27f766b7e4d4e79afa26fb2b21d3f..2d06b3e59c0e2b1576779771186ad6706d0f1dce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2279,4 +2279,9 @@ public class PurpurWorldConfig {
+@@ -2277,4 +2277,9 @@ public class PurpurWorldConfig {
      private void seedSettings() {
          randomPopulatorSeed = getBoolean("seed.random-populator-seed", randomPopulatorSeed);
      }
diff --git a/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 97%
rename from patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch
index 9ed669723..d83b7908a 100644
--- a/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Redirect System.out calls to plugin loggers
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 606d5577f121b0103e272bbe4ffa4b582c76469c..a75d1872d63aeba5376d787336e4793e813ba21f 100644
+index 4a3226b58ee3c11830dabba988b0665dc069559a..cb41bf68e8b24352d8bab6bfe43df4a75ef02c9a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -178,8 +178,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0223-Armor-click-equip-options.patch b/patches/server/0222-Armor-click-equip-options.patch
similarity index 96%
rename from patches/server/0223-Armor-click-equip-options.patch
rename to patches/server/0222-Armor-click-equip-options.patch
index d97a6723c..4527e228d 100644
--- a/patches/server/0223-Armor-click-equip-options.patch
+++ b/patches/server/0222-Armor-click-equip-options.patch
@@ -58,10 +58,10 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2
              return InteractionResultHolder.fail(itemStack);
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a472b1ff8fc0a0a23c72283e943b0bf7f5447b1b..6f09051ff1e7968d17c661bbc56369d84948a70f 100644
+index 2d06b3e59c0e2b1576779771186ad6706d0f1dce..fae8c1c3fed375c4fc901486f7e7fd85a083b7c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -344,6 +344,8 @@ public class PurpurWorldConfig {
+@@ -343,6 +343,8 @@ public class PurpurWorldConfig {
      public boolean playersSkipNight = true;
      public double playerCriticalDamageMultiplier = 1.5D;
      public boolean playerBurpWhenFull = false;
@@ -70,7 +70,7 @@ index a472b1ff8fc0a0a23c72283e943b0bf7f5447b1b..6f09051ff1e7968d17c661bbc56369d8
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -362,6 +364,8 @@ public class PurpurWorldConfig {
+@@ -360,6 +362,8 @@ public class PurpurWorldConfig {
          playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
          playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
          playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
diff --git a/patches/server/0224-Add-uptime-command.patch b/patches/server/0223-Add-uptime-command.patch
similarity index 100%
rename from patches/server/0224-Add-uptime-command.patch
rename to patches/server/0223-Add-uptime-command.patch
diff --git a/patches/server/0225-Structure-seed-options.patch b/patches/server/0224-Structure-seed-options.patch
similarity index 97%
rename from patches/server/0225-Structure-seed-options.patch
rename to patches/server/0224-Structure-seed-options.patch
index d5c290524..2f0645e57 100644
--- a/patches/server/0225-Structure-seed-options.patch
+++ b/patches/server/0224-Structure-seed-options.patch
@@ -27,7 +27,7 @@ index f71cc1f5e5d594e82a4e6132d438bae74b9370a7..77948e19dd99b6f30bf294c9d5308228
  
                  updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ae27ecf02b799634bf5d756d2b02ea102d25b249..bbdb4e20f01effd77cf6de5626bb5d5b0c7d3f4d 100644
+index 07e5bb1b148376b3962a983b3d192bd838e04e02..808d763e767fd4f727c5f0a735c3e5d4ac17a47e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -247,6 +247,9 @@ public class PurpurConfig {
diff --git a/patches/server/0226-Tool-actionable-options.patch b/patches/server/0225-Tool-actionable-options.patch
similarity index 99%
rename from patches/server/0226-Tool-actionable-options.patch
rename to patches/server/0225-Tool-actionable-options.patch
index 74143857b..46183d99d 100644
--- a/patches/server/0226-Tool-actionable-options.patch
+++ b/patches/server/0225-Tool-actionable-options.patch
@@ -109,10 +109,10 @@ index 009dd6b59e27a9413b3ef115468a6d1dd0746d56..fdbc1378bc148f5a16b414a3e5867cdc
                  return InteractionResult.PASS;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6f09051ff1e7968d17c661bbc56369d84948a70f..721be13f1953a7ee616b9962a55f4362069a3c79 100644
+index fae8c1c3fed375c4fc901486f7e7fd85a083b7c1..87f78e18c8328e7596a9c90da6ec8f6d849f3cc1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -459,6 +459,153 @@ public class PurpurWorldConfig {
+@@ -457,6 +457,153 @@ public class PurpurWorldConfig {
          });
      }
  
diff --git a/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
similarity index 100%
rename from patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
rename to patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
diff --git a/patches/server/0228-Store-placer-on-Block-when-placed.patch b/patches/server/0227-Store-placer-on-Block-when-placed.patch
similarity index 96%
rename from patches/server/0228-Store-placer-on-Block-when-placed.patch
rename to patches/server/0227-Store-placer-on-Block-when-placed.patch
index 6bf0e2ea3..5db4e3a52 100644
--- a/patches/server/0228-Store-placer-on-Block-when-placed.patch
+++ b/patches/server/0227-Store-placer-on-Block-when-placed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Store placer on Block when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e61be8f9a9b26a9daa3f70ec028ed689dfd43c93..52ed8a1629ab95e52c8c391902069e2fd6f0738f 100644
+index b3b5b75e3df805027c5daa98d7fc1d4d5f0d9675..af0a195fb82eb7872bc6206d39c2963bd468ccd6 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -381,6 +381,7 @@ public final class ItemStack {
diff --git a/patches/server/0229-Summoner-API.patch b/patches/server/0228-Summoner-API.patch
similarity index 100%
rename from patches/server/0229-Summoner-API.patch
rename to patches/server/0228-Summoner-API.patch
diff --git a/patches/server/0230-Customizable-sleeping-actionbar-messages.patch b/patches/server/0229-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0230-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0229-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 96%
rename from patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch
index b1524cbef..31e39fa22 100644
--- a/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -19,7 +19,7 @@ index 6c261b9ddee80139140bd1f091fcdacc3a70c8ef..65917d1438b0f480385e9117ba2a386e
  
              if (nbttagcompound != null) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 721be13f1953a7ee616b9962a55f4362069a3c79..2e034573f41a4b356c670d42afc07a919ee1d014 100644
+index 87f78e18c8328e7596a9c90da6ec8f6d849f3cc1..a9cb05554f20a5b3ac3b4368c3772ebfc77f561f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -174,6 +174,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0232-Silk-touchable-budding-amethyst.patch b/patches/server/0231-Silk-touchable-budding-amethyst.patch
similarity index 93%
rename from patches/server/0232-Silk-touchable-budding-amethyst.patch
rename to patches/server/0231-Silk-touchable-budding-amethyst.patch
index 013a426c9..8f18f4e3e 100644
--- a/patches/server/0232-Silk-touchable-budding-amethyst.patch
+++ b/patches/server/0231-Silk-touchable-budding-amethyst.patch
@@ -24,10 +24,10 @@ index 02fc3ede12eadbf72e26e31b1c475c7f5b2ad73a..2288e727929ffb3a3bca138fb0289408
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2e034573f41a4b356c670d42afc07a919ee1d014..66af04a37b42e4bba604d27f5e841933d6219a15 100644
+index a9cb05554f20a5b3ac3b4368c3772ebfc77f561f..b0cf22a170d4c62bf0ffc95fc169e623ce236a24 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -707,6 +707,11 @@ public class PurpurWorldConfig {
+@@ -705,6 +705,11 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0233-Big-dripleaf-tilt-delay.patch b/patches/server/0232-Big-dripleaf-tilt-delay.patch
similarity index 94%
rename from patches/server/0233-Big-dripleaf-tilt-delay.patch
rename to patches/server/0232-Big-dripleaf-tilt-delay.patch
index 09ace3735..e7c767e56 100644
--- a/patches/server/0233-Big-dripleaf-tilt-delay.patch
+++ b/patches/server/0232-Big-dripleaf-tilt-delay.patch
@@ -24,10 +24,10 @@ index 5bfb60258018c8beda1fc2ac29e8ffc5c9377064..24e80e4d3ebbfd5f72e00ad7610efa12
          if (i != -1) {
              world.getBlockTicks().scheduleTick(blockposition, this, i);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66af04a37b42e4bba604d27f5e841933d6219a15..8a85ffdf4aa73923077004e0a228db6833f52815 100644
+index b0cf22a170d4c62bf0ffc95fc169e623ce236a24..28228d1e32ec9c63d251cc0f375a6bc9bac57a6b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -707,6 +707,22 @@ public class PurpurWorldConfig {
+@@ -705,6 +705,22 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0234-Player-ridable-in-water-option.patch b/patches/server/0233-Player-ridable-in-water-option.patch
similarity index 92%
rename from patches/server/0234-Player-ridable-in-water-option.patch
rename to patches/server/0233-Player-ridable-in-water-option.patch
index 035ae6461..d7b8e97b7 100644
--- a/patches/server/0234-Player-ridable-in-water-option.patch
+++ b/patches/server/0233-Player-ridable-in-water-option.patch
@@ -21,10 +21,10 @@ index 2064f93074a58c116352ee768ef9ad9663004641..e90193b303ecafc1073d22ff0e145a6f
          if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) {
              if (this.getShoulderEntityLeft().isEmpty()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8a85ffdf4aa73923077004e0a228db6833f52815..c097f5525e36084805c1aa1b4eb33aab9fe1405b 100644
+index 28228d1e32ec9c63d251cc0f375a6bc9bac57a6b..d5ea371909d629dae91f8b4928cfbac78ff424d8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -348,6 +348,7 @@ public class PurpurWorldConfig {
+@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
      public boolean playerBurpWhenFull = false;
      public boolean playerArmorSwapping = false;
      public boolean playerArmorSwappingCreativeMakesCopy = true;
@@ -32,7 +32,7 @@ index 8a85ffdf4aa73923077004e0a228db6833f52815..c097f5525e36084805c1aa1b4eb33aab
      private void playerSettings() {
          idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
          idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-@@ -368,6 +369,7 @@ public class PurpurWorldConfig {
+@@ -366,6 +367,7 @@ public class PurpurWorldConfig {
          playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
          playerArmorSwapping = getBoolean("gameplay-mechanics.player.armor-click-equip.allow-hot-swapping", playerArmorSwapping);
          playerArmorSwappingCreativeMakesCopy = getBoolean("gameplay-mechanics.player.armor-click-equip.creative-makes-copy", playerArmorSwappingCreativeMakesCopy);
diff --git a/patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 93%
rename from patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
index c787e8776..92dd2f319 100644
--- a/patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
+++ b/patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
@@ -18,10 +18,10 @@ index ba61f78874d8578b862f317fe00a3162c45253e0..42370072dac9144be5c07f88d24d8ba4
              for (int i = 0; i < 64; ++i) {
                  if (this.teleport()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c097f5525e36084805c1aa1b4eb33aab9fe1405b..96f9f478b03ba358019239d0b759ede0760008a0 100644
+index d5ea371909d629dae91f8b4928cfbac78ff424d8..35472374f55c5fa7e76626ea423a3a1a93f09dcd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
+@@ -1256,6 +1256,7 @@ public class PurpurWorldConfig {
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
      public boolean endermanIgnorePlayerDragonHead = false;
      public boolean endermanDisableStareAggro = false;
@@ -29,7 +29,7 @@ index c097f5525e36084805c1aa1b4eb33aab9fe1405b..96f9f478b03ba358019239d0b759ede0
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1279,6 +1280,7 @@ public class PurpurWorldConfig {
+@@ -1277,6 +1278,7 @@ public class PurpurWorldConfig {
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
          endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
          endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);