From 7a4646c75d8e16a72eab004aad53ef516d81efdb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 14 Oct 2021 12:20:25 -0500
Subject: [PATCH] Remove redundant patches that duplicate recent Paper changes

---
 ...ch => 0018-Player-invulnerabilities.patch} |  0
 patches/api/0018-Villager-resetOffers.patch   | 24 -------
 ...0-Anvil-API.patch => 0019-Anvil-API.patch} |  0
 ... 0020-ItemStack-convenience-methods.patch} |  0
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  0
 ...atch => 0022-ChatColor-conveniences.patch} |  0
 ...023-LivingEntity-broadcastItemBreak.patch} |  0
 ...atch => 0024-Item-entity-immunities.patch} |  0
 ...t-Improve-output-of-plugins-command.patch} |  0
 ...able-zombie-aggressiveness-towards-.patch} |  0
 ...-to-recipe-s-ExactChoice-ingredient.patch} |  0
 ...check-to-EntityDamagedByEntityEvent.patch} |  0
 ...d-API.patch => 0029-Left-handed-API.patch} |  0
 ...30-Alphabetize-in-game-plugins-list.patch} |  0
 ...lf-API.patch => 0031-Rabid-Wolf-API.patch} |  0
 ...c-warnings-missing-param-and-return.patch} |  0
 ...tch => 0033-PlayerBookTooLargeEvent.patch} |  0
 ...herite-armor-grants-fire-resistance.patch} |  0
 ...035-Add-EntityTeleportHinderedEvent.patch} |  0
 ... => 0036-Add-StructureGenerateEvent.patch} |  0
 ...Add-unsafe-Entity-serialization-API.patch} |  0
 ...n-change-for-adventure-deprecations.patch} |  0
 ...tment-target-for-bows-and-crossbows.patch} |  0
 ...> 0040-Iron-golem-poppy-calms-anger.patch} |  0
 ...41-API-for-any-mob-to-burn-daylight.patch} |  0
 ...atch => 0042-Flying-Fall-Damage-API.patch} |  0
 ...d-back-player-spawned-endermite-API.patch} |  0
 ... 0044-Fix-default-permission-system.patch} |  0
 ...oner-API.patch => 0045-Summoner-API.patch} |  0
 ...-version-command-output-for-console.patch} |  0
 ...mpt-parameters-to-resource-pack-api.patch} |  2 +-
 ... => 0048-Extended-OfflinePlayer-API.patch} |  0
 ...he-ability-to-add-combustible-items.patch} |  0
 ...d-API.patch => 0127-Left-handed-API.patch} |  0
 ...break-door-minimum-difficulty-option.patch | 69 -------------------
 ...8-Changeable-Mob-Left-Handed-Chance.patch} |  4 +-
 ...=> 0129-Add-boat-fall-damage-config.patch} |  4 +-
 ...0130-Snow-Golem-rate-of-fire-config.patch} |  4 +-
 ...-Configurable-disable-give-dropping.patch} |  2 +-
 ... => 0132-Lobotomize-stuck-villagers.patch} |  4 +-
 ...illager-Clerics-to-farm-Nether-Wart.patch} |  4 +-
 ...ied-Piglin-death-always-counting-as.patch} |  8 +--
 ...timise-player-list-ticksSpread-out-.patch} |  4 +-
 ...le-chance-for-wolves-to-spawn-rabid.patch} |  4 +-
 ...7-Configurable-default-collar-color.patch} |  6 +-
 ...tch => 0138-Phantom-flames-on-swoop.patch} |  4 +-
 ...-to-open-even-with-a-solid-block-on.patch} |  2 +-
 ...SBar.patch => 0140-Implement-TPSBar.patch} |  0
 ...h => 0141-Striders-give-saddle-back.patch} |  4 +-
 ...tch => 0142-PlayerBookTooLargeEvent.patch} |  2 +-
 ...herite-armor-grants-fire-resistance.patch} |  4 +-
 ...144-Fix-rotating-UP-DOWN-CW-and-CCW.patch} |  0
 ...efing-bypass-to-everything-affected.patch} | 42 +++++------
 ...llow-Note-Block-sounds-when-blocked.patch} |  2 +-
 ...147-Add-EntityTeleportHinderedEvent.patch} |  6 +-
 ... => 0148-Add-StructureGenerateEvent.patch} |  0
 ... => 0149-Farmland-trampling-changes.patch} |  2 +-
 ...0-Movement-options-for-armor-stands.patch} |  2 +-
 ....patch => 0151-Fix-stuck-in-portals.patch} |  2 +-
 ...ggle-for-water-sensitive-mob-damage.patch} | 24 +++----
 ...3-Config-to-always-tame-in-Creative.patch} |  2 +-
 ... 0154-End-crystal-explosion-options.patch} |  2 +-
 ...Add-unsafe-Entity-serialization-API.patch} |  2 +-
 ...ther-Ender-Dragon-can-ride-vehicles.patch} |  2 +-
 ...atch => 0157-Dont-run-with-scissors.patch} |  4 +-
 ...nch-Man.patch => 0158-One-Punch-Man.patch} |  2 +-
 ...159-Add-config-for-snow-on-blue-ice.patch} |  2 +-
 ...r-Pearl-cooldown-damage-and-Endermi.patch} |  4 +-
 ...to-ignore-nearby-mobs-when-sleeping.patch} |  4 +-
 ...d-back-player-spawned-endermite-API.patch} |  0
 ...n-aggressiveness-towards-Endermites.patch} |  2 +-
 ...Dragon-Head-wearers-and-stare-aggro.patch} |  2 +-
 ...ig.patch => 0165-Tick-fluids-config.patch} |  2 +-
 ...66-Config-to-disable-Llama-caravans.patch} |  2 +-
 ...g-to-make-Creepers-explode-on-death.patch} |  2 +-
 ...rable-ravager-griefable-blocks-list.patch} |  2 +-
 ...169-Sneak-to-bulk-process-composter.patch} |  4 +-
 ...h => 0170-Config-for-skipping-night.patch} |  4 +-
 ...171-Add-config-for-villager-trading.patch} |  2 +-
 ...=> 0172-Allow-infinity-on-crossbows.patch} |  2 +-
 ...ngs.patch => 0173-Drowning-Settings.patch} |  2 +-
 ...reak-individual-slabs-when-sneaking.patch} |  2 +-
 ...to-disable-hostile-mob-spawn-on-ice.patch} |  4 +-
 ...g-to-show-Armor-Stand-arms-on-spawn.patch} |  4 +-
 ...tion-to-make-doors-require-redstone.patch} |  2 +-
 ...Config-to-allow-for-unsafe-enchants.patch} |  2 +-
 ...0179-Configurable-sponge-absorption.patch} |  2 +-
 ...ch => 0180-Projectile-offset-config.patch} |  2 +-
 ...or-powered-rail-activation-distance.patch} |  2 +-
 ...> 0182-Piglin-portal-spawn-modifier.patch} |  2 +-
 ...Config-to-change-max-number-of-bees.patch} |  2 +-
 ...le-damage-settings-for-magma-blocks.patch} |  4 +-
 ...-Config-for-wither-explosion-radius.patch} |  2 +-
 ... => 0186-Gamemode-extra-permissions.patch} |  2 +-
 ...ng-the-blocks-that-turn-into-dirt-p.patch} |  2 +-
 ...0188-Configurable-piston-push-limit.patch} |  2 +-
 ...189-Configurable-broadcast-settings.patch} |  4 +-
 ...-6278.patch => 0190-Fix-SPIGOT-6278.patch} |  0
 ... => 0191-Configurable-mob-blindness.patch} |  4 +-
 ...hidden-players-from-entity-selector.patch} |  2 +-
 ...-to-impact-Creeper-explosion-radius.patch} |  2 +-
 ...> 0194-Iron-golem-poppy-calms-anger.patch} |  2 +-
 ...ots.patch => 0195-Breedable-parrots.patch} |  2 +-
 ...gurable-powered-rail-boost-modifier.patch} |  2 +-
 ...ge-multiplier-critical-damage-value.patch} |  4 +-
 ...n-to-disable-dragon-egg-teleporting.patch} |  2 +-
 ...fig-for-unverified-username-message.patch} |  0
 ...-anvil-cumulative-cost-configurable.patch} |  2 +-
 ...1-ShulkerBox-allow-oversized-stacks.patch} |  2 +-
 ...e-can-work-when-raining-or-at-night.patch} |  2 +-
 ...03-API-for-any-mob-to-burn-daylight.patch} |  2 +-
 ...dvancement-triggers-on-entity-death.patch} |  2 +-
 ...h => 0205-Config-MobEffect-by-world.patch} |  2 +-
 ...eacon-Activation-Range-Configurable.patch} |  2 +-
 ...0207-Add-toggle-for-sand-duping-fix.patch} |  2 +-
 ...gle-for-end-portal-safe-teleporting.patch} |  4 +-
 ...atch => 0209-Flying-Fall-Damage-API.patch} |  4 +-
 ...ke-lightning-rod-range-configurable.patch} |  4 +-
 ...ng-food-fills-hunger-bar-completely.patch} |  4 +-
 ...ayer-join-full-server-by-permission.patch} |  2 +-
 ...ermission-bypass-for-portal-waiting.patch} |  2 +-
 ...4-Shulker-spawn-from-bullet-options.patch} |  2 +-
 ...ating-glow-berries-adds-glow-effect.patch} |  2 +-
 ...-Option-to-make-drowned-break-doors.patch} |  2 +-
 ...nfigurable-hunger-starvation-damage.patch} |  4 +-
 ...-System.out-calls-to-plugin-loggers.patch} |  2 +-
 ...h => 0219-Armor-click-equip-options.patch} |  6 +-
 ...nd.patch => 0220-Add-uptime-command.patch} |  6 +-
 ...atch => 0221-Structure-seed-options.patch} |  2 +-
 ...tch => 0222-Tool-actionable-options.patch} |  2 +-
 ...-bed-respawn-location-not-resetting.patch} |  4 +-
 ...4-Store-placer-on-Block-when-placed.patch} |  0
 ...oner-API.patch => 0225-Summoner-API.patch} |  0
 ...mizable-sleeping-actionbar-messages.patch} |  0
 ...-shulker-box-items-from-dropping-co.patch} |  4 +-
 ...228-Silk-touchable-budding-amethyst.patch} |  2 +-
 ...tch => 0229-Big-dripleaf-tilt-delay.patch} |  2 +-
 ...0230-Player-ridable-in-water-option.patch} |  4 +-
 ...-Enderman-teleport-on-projectile-hi.patch} |  2 +-
 ...ue-Crash-with-Plugin-or-Datapack-Ge.patch} |  0
 ...d.patch => 0233-Add-compass-command.patch} |  6 +-
 ...nt-horses-from-standing-with-riders.patch} |  2 +-
 ...h => 0235-Toggle-for-kinetic-damage.patch} |  2 +-
 ...-Option-for-disable-observer-clocks.patch} |  2 +-
 ...zeable-Zombie-Villager-curing-times.patch} |  6 +-
 ...-Option-for-sponges-to-work-on-lava.patch} |  2 +-
 ...239-Toggle-for-Wither-s-spawn-sound.patch} |  2 +-
 ...-breaks-from-solid-neighbors-config.patch} |  2 +-
 ...move-curse-of-binding-with-weakness.patch} |  2 +-
 ...0242-Conduit-behavior-configuration.patch} |  4 +-
 ...patch => 0243-Cauldron-fill-chances.patch} |  4 +-
 ...o-allow-mobs-to-pathfind-over-rails.patch} |  2 +-
 ...mpt-parameters-to-resource-pack-api.patch} |  2 +-
 ... 0246-Shulker-change-color-with-dye.patch} |  2 +-
 ... => 0247-Extended-OfflinePlayer-API.patch} |  2 +-
 ...he-ability-to-add-combustible-items.patch} |  0
 ...in-and-thunder-should-stop-on-sleep.patch} |  2 +-
 ...-blocks-to-grow-into-trees-naturall.patch} |  2 +-
 ...-right-click-to-use-exp-for-mending.patch} |  4 +-
 ...urally-aggressive-to-players-chance.patch} |  2 +-
 ...urally-aggressive-to-players-chance.patch} |  2 +-
 ...r-beds-to-explode-on-villager-sleep.patch} |  2 +-
 ... 0255-horses-tempted-by-gold-config.patch} |  2 +-
 ...=> 0256-llama-tempted-by-hay-config.patch} |  2 +-
 ...Halloween-options-and-optimizations.patch} |  2 +-
 ...fig-for-Grindstones-ignoring-curses.patch} |  0
 ....patch => 0259-UPnP-Port-Forwarding.patch} |  0
 167 files changed, 198 insertions(+), 291 deletions(-)
 rename patches/api/{0019-Player-invulnerabilities.patch => 0018-Player-invulnerabilities.patch} (100%)
 delete mode 100644 patches/api/0018-Villager-resetOffers.patch
 rename patches/api/{0020-Anvil-API.patch => 0019-Anvil-API.patch} (100%)
 rename patches/api/{0021-ItemStack-convenience-methods.patch => 0020-ItemStack-convenience-methods.patch} (100%)
 rename patches/api/{0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%)
 rename patches/api/{0023-ChatColor-conveniences.patch => 0022-ChatColor-conveniences.patch} (100%)
 rename patches/api/{0024-LivingEntity-broadcastItemBreak.patch => 0023-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/api/{0025-Item-entity-immunities.patch => 0024-Item-entity-immunities.patch} (100%)
 rename patches/api/{0026-Spigot-Improve-output-of-plugins-command.patch => 0025-Spigot-Improve-output-of-plugins-command.patch} (100%)
 rename patches/api/{0027-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%)
 rename patches/api/{0028-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/api/{0029-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch => 0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch} (100%)
 rename patches/api/{0030-Left-handed-API.patch => 0029-Left-handed-API.patch} (100%)
 rename patches/api/{0031-Alphabetize-in-game-plugins-list.patch => 0030-Alphabetize-in-game-plugins-list.patch} (100%)
 rename patches/api/{0032-Rabid-Wolf-API.patch => 0031-Rabid-Wolf-API.patch} (100%)
 rename patches/api/{0033-Fix-javadoc-warnings-missing-param-and-return.patch => 0032-Fix-javadoc-warnings-missing-param-and-return.patch} (100%)
 rename patches/api/{0034-PlayerBookTooLargeEvent.patch => 0033-PlayerBookTooLargeEvent.patch} (100%)
 rename patches/api/{0035-Full-netherite-armor-grants-fire-resistance.patch => 0034-Full-netherite-armor-grants-fire-resistance.patch} (100%)
 rename patches/api/{0036-Add-EntityTeleportHinderedEvent.patch => 0035-Add-EntityTeleportHinderedEvent.patch} (100%)
 rename patches/api/{0037-Add-StructureGenerateEvent.patch => 0036-Add-StructureGenerateEvent.patch} (100%)
 rename patches/api/{0038-Add-unsafe-Entity-serialization-API.patch => 0037-Add-unsafe-Entity-serialization-API.patch} (100%)
 rename patches/api/{0039-Conflict-on-change-for-adventure-deprecations.patch => 0038-Conflict-on-change-for-adventure-deprecations.patch} (100%)
 rename patches/api/{0040-Add-enchantment-target-for-bows-and-crossbows.patch => 0039-Add-enchantment-target-for-bows-and-crossbows.patch} (100%)
 rename patches/api/{0041-Iron-golem-poppy-calms-anger.patch => 0040-Iron-golem-poppy-calms-anger.patch} (100%)
 rename patches/api/{0042-API-for-any-mob-to-burn-daylight.patch => 0041-API-for-any-mob-to-burn-daylight.patch} (100%)
 rename patches/api/{0043-Flying-Fall-Damage-API.patch => 0042-Flying-Fall-Damage-API.patch} (100%)
 rename patches/api/{0044-Add-back-player-spawned-endermite-API.patch => 0043-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/api/{0045-Fix-default-permission-system.patch => 0044-Fix-default-permission-system.patch} (100%)
 rename patches/api/{0046-Summoner-API.patch => 0045-Summoner-API.patch} (100%)
 rename patches/api/{0047-Clean-up-version-command-output-for-console.patch => 0046-Clean-up-version-command-output-for-console.patch} (100%)
 rename patches/api/{0048-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (98%)
 rename patches/api/{0049-Extended-OfflinePlayer-API.patch => 0048-Extended-OfflinePlayer-API.patch} (100%)
 rename patches/api/{0050-Added-the-ability-to-add-combustible-items.patch => 0049-Added-the-ability-to-add-combustible-items.patch} (100%)
 rename patches/server/{0128-Left-handed-API.patch => 0127-Left-handed-API.patch} (100%)
 delete mode 100644 patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
 rename patches/server/{0129-Changeable-Mob-Left-Handed-Chance.patch => 0128-Changeable-Mob-Left-Handed-Chance.patch} (90%)
 rename patches/server/{0130-Add-boat-fall-damage-config.patch => 0129-Add-boat-fall-damage-config.patch} (94%)
 rename patches/server/{0131-Snow-Golem-rate-of-fire-config.patch => 0130-Snow-Golem-rate-of-fire-config.patch} (94%)
 rename patches/server/{0132-EMC-Configurable-disable-give-dropping.patch => 0131-EMC-Configurable-disable-give-dropping.patch} (95%)
 rename patches/server/{0133-Lobotomize-stuck-villagers.patch => 0132-Lobotomize-stuck-villagers.patch} (95%)
 rename patches/server/{0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (98%)
 rename patches/server/{0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (91%)
 rename patches/server/{0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch => 0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch} (93%)
 rename patches/server/{0137-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0136-Configurable-chance-for-wolves-to-spawn-rabid.patch} (98%)
 rename patches/server/{0138-Configurable-default-collar-color.patch => 0137-Configurable-default-collar-color.patch} (93%)
 rename patches/server/{0139-Phantom-flames-on-swoop.patch => 0138-Phantom-flames-on-swoop.patch} (91%)
 rename patches/server/{0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (95%)
 rename patches/server/{0141-Implement-TPSBar.patch => 0140-Implement-TPSBar.patch} (100%)
 rename patches/server/{0142-Striders-give-saddle-back.patch => 0141-Striders-give-saddle-back.patch} (92%)
 rename patches/server/{0143-PlayerBookTooLargeEvent.patch => 0142-PlayerBookTooLargeEvent.patch} (96%)
 rename patches/server/{0144-Full-netherite-armor-grants-fire-resistance.patch => 0143-Full-netherite-armor-grants-fire-resistance.patch} (94%)
 rename patches/server/{0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%)
 rename patches/server/{0146-Add-mobGriefing-bypass-to-everything-affected.patch => 0145-Add-mobGriefing-bypass-to-everything-affected.patch} (96%)
 rename patches/server/{0147-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0146-Config-to-allow-Note-Block-sounds-when-blocked.patch} (97%)
 rename patches/server/{0148-Add-EntityTeleportHinderedEvent.patch => 0147-Add-EntityTeleportHinderedEvent.patch} (97%)
 rename patches/server/{0149-Add-StructureGenerateEvent.patch => 0148-Add-StructureGenerateEvent.patch} (100%)
 rename patches/server/{0150-Farmland-trampling-changes.patch => 0149-Farmland-trampling-changes.patch} (97%)
 rename patches/server/{0151-Movement-options-for-armor-stands.patch => 0150-Movement-options-for-armor-stands.patch} (98%)
 rename patches/server/{0152-Fix-stuck-in-portals.patch => 0151-Fix-stuck-in-portals.patch} (97%)
 rename patches/server/{0153-Toggle-for-water-sensitive-mob-damage.patch => 0152-Toggle-for-water-sensitive-mob-damage.patch} (99%)
 rename patches/server/{0154-Config-to-always-tame-in-Creative.patch => 0153-Config-to-always-tame-in-Creative.patch} (98%)
 rename patches/server/{0155-End-crystal-explosion-options.patch => 0154-End-crystal-explosion-options.patch} (98%)
 rename patches/server/{0156-Add-unsafe-Entity-serialization-API.patch => 0155-Add-unsafe-Entity-serialization-API.patch} (98%)
 rename patches/server/{0157-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (97%)
 rename patches/server/{0158-Dont-run-with-scissors.patch => 0157-Dont-run-with-scissors.patch} (96%)
 rename patches/server/{0159-One-Punch-Man.patch => 0158-One-Punch-Man.patch} (96%)
 rename patches/server/{0160-Add-config-for-snow-on-blue-ice.patch => 0159-Add-config-for-snow-on-blue-ice.patch} (96%)
 rename patches/server/{0161-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (96%)
 rename patches/server/{0162-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0161-Config-to-ignore-nearby-mobs-when-sleeping.patch} (92%)
 rename patches/server/{0163-Add-back-player-spawned-endermite-API.patch => 0162-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/server/{0164-Config-Enderman-aggressiveness-towards-Endermites.patch => 0163-Config-Enderman-aggressiveness-towards-Endermites.patch} (97%)
 rename patches/server/{0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (96%)
 rename patches/server/{0166-Tick-fluids-config.patch => 0165-Tick-fluids-config.patch} (97%)
 rename patches/server/{0167-Config-to-disable-Llama-caravans.patch => 0166-Config-to-disable-Llama-caravans.patch} (97%)
 rename patches/server/{0168-Config-to-make-Creepers-explode-on-death.patch => 0167-Config-to-make-Creepers-explode-on-death.patch} (97%)
 rename patches/server/{0169-Configurable-ravager-griefable-blocks-list.patch => 0168-Configurable-ravager-griefable-blocks-list.patch} (98%)
 rename patches/server/{0170-Sneak-to-bulk-process-composter.patch => 0169-Sneak-to-bulk-process-composter.patch} (96%)
 rename patches/server/{0171-Config-for-skipping-night.patch => 0170-Config-for-skipping-night.patch} (92%)
 rename patches/server/{0172-Add-config-for-villager-trading.patch => 0171-Add-config-for-villager-trading.patch} (97%)
 rename patches/server/{0173-Allow-infinity-on-crossbows.patch => 0172-Allow-infinity-on-crossbows.patch} (98%)
 rename patches/server/{0174-Drowning-Settings.patch => 0173-Drowning-Settings.patch} (97%)
 rename patches/server/{0175-Break-individual-slabs-when-sneaking.patch => 0174-Break-individual-slabs-when-sneaking.patch} (97%)
 rename patches/server/{0176-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0175-Config-to-disable-hostile-mob-spawn-on-ice.patch} (91%)
 rename patches/server/{0177-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0176-Config-to-show-Armor-Stand-arms-on-spawn.patch} (92%)
 rename patches/server/{0178-Option-to-make-doors-require-redstone.patch => 0177-Option-to-make-doors-require-redstone.patch} (98%)
 rename patches/server/{0179-Config-to-allow-for-unsafe-enchants.patch => 0178-Config-to-allow-for-unsafe-enchants.patch} (98%)
 rename patches/server/{0180-Configurable-sponge-absorption.patch => 0179-Configurable-sponge-absorption.patch} (97%)
 rename patches/server/{0181-Projectile-offset-config.patch => 0180-Projectile-offset-config.patch} (99%)
 rename patches/server/{0182-Config-for-powered-rail-activation-distance.patch => 0181-Config-for-powered-rail-activation-distance.patch} (94%)
 rename patches/server/{0183-Piglin-portal-spawn-modifier.patch => 0182-Piglin-portal-spawn-modifier.patch} (96%)
 rename patches/server/{0184-Config-to-change-max-number-of-bees.patch => 0183-Config-to-change-max-number-of-bees.patch} (96%)
 rename patches/server/{0185-Configurable-damage-settings-for-magma-blocks.patch => 0184-Configurable-damage-settings-for-magma-blocks.patch} (94%)
 rename patches/server/{0186-Config-for-wither-explosion-radius.patch => 0185-Config-for-wither-explosion-radius.patch} (96%)
 rename patches/server/{0187-Gamemode-extra-permissions.patch => 0186-Gamemode-extra-permissions.patch} (98%)
 rename patches/server/{0188-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (96%)
 rename patches/server/{0189-Configurable-piston-push-limit.patch => 0188-Configurable-piston-push-limit.patch} (96%)
 rename patches/server/{0190-Configurable-broadcast-settings.patch => 0189-Configurable-broadcast-settings.patch} (94%)
 rename patches/server/{0191-Fix-SPIGOT-6278.patch => 0190-Fix-SPIGOT-6278.patch} (100%)
 rename patches/server/{0192-Configurable-mob-blindness.patch => 0191-Configurable-mob-blindness.patch} (93%)
 rename patches/server/{0193-Hide-hidden-players-from-entity-selector.patch => 0192-Hide-hidden-players-from-entity-selector.patch} (98%)
 rename patches/server/{0194-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0193-Config-for-health-to-impact-Creeper-explosion-radius.patch} (96%)
 rename patches/server/{0195-Iron-golem-poppy-calms-anger.patch => 0194-Iron-golem-poppy-calms-anger.patch} (98%)
 rename patches/server/{0196-Breedable-parrots.patch => 0195-Breedable-parrots.patch} (97%)
 rename patches/server/{0197-Configurable-powered-rail-boost-modifier.patch => 0196-Configurable-powered-rail-boost-modifier.patch} (96%)
 rename patches/server/{0198-Add-config-change-multiplier-critical-damage-value.patch => 0197-Add-config-change-multiplier-critical-damage-value.patch} (91%)
 rename patches/server/{0199-Option-to-disable-dragon-egg-teleporting.patch => 0198-Option-to-disable-dragon-egg-teleporting.patch} (94%)
 rename patches/server/{0200-Config-for-unverified-username-message.patch => 0199-Config-for-unverified-username-message.patch} (100%)
 rename patches/server/{0201-Make-anvil-cumulative-cost-configurable.patch => 0200-Make-anvil-cumulative-cost-configurable.patch} (95%)
 rename patches/server/{0202-ShulkerBox-allow-oversized-stacks.patch => 0201-ShulkerBox-allow-oversized-stacks.patch} (97%)
 rename patches/server/{0203-Bee-can-work-when-raining-or-at-night.patch => 0202-Bee-can-work-when-raining-or-at-night.patch} (97%)
 rename patches/server/{0204-API-for-any-mob-to-burn-daylight.patch => 0203-API-for-any-mob-to-burn-daylight.patch} (99%)
 rename patches/server/{0205-Fix-advancement-triggers-on-entity-death.patch => 0204-Fix-advancement-triggers-on-entity-death.patch} (98%)
 rename patches/server/{0206-Config-MobEffect-by-world.patch => 0205-Config-MobEffect-by-world.patch} (98%)
 rename patches/server/{0207-Beacon-Activation-Range-Configurable.patch => 0206-Beacon-Activation-Range-Configurable.patch} (96%)
 rename patches/server/{0208-Add-toggle-for-sand-duping-fix.patch => 0207-Add-toggle-for-sand-duping-fix.patch} (95%)
 rename patches/server/{0209-Add-toggle-for-end-portal-safe-teleporting.patch => 0208-Add-toggle-for-end-portal-safe-teleporting.patch} (94%)
 rename patches/server/{0210-Flying-Fall-Damage-API.patch => 0209-Flying-Fall-Damage-API.patch} (91%)
 rename patches/server/{0211-Make-lightning-rod-range-configurable.patch => 0210-Make-lightning-rod-range-configurable.patch} (92%)
 rename patches/server/{0212-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0211-Burp-after-eating-food-fills-hunger-bar-completely.patch} (95%)
 rename patches/server/{0213-Allow-player-join-full-server-by-permission.patch => 0212-Allow-player-join-full-server-by-permission.patch} (93%)
 rename patches/server/{0214-Add-permission-bypass-for-portal-waiting.patch => 0213-Add-permission-bypass-for-portal-waiting.patch} (94%)
 rename patches/server/{0215-Shulker-spawn-from-bullet-options.patch => 0214-Shulker-spawn-from-bullet-options.patch} (98%)
 rename patches/server/{0216-Eating-glow-berries-adds-glow-effect.patch => 0215-Eating-glow-berries-adds-glow-effect.patch} (97%)
 rename patches/server/{0217-Option-to-make-drowned-break-doors.patch => 0216-Option-to-make-drowned-break-doors.patch} (97%)
 rename patches/server/{0218-Configurable-hunger-starvation-damage.patch => 0217-Configurable-hunger-starvation-damage.patch} (92%)
 rename patches/server/{0219-Redirect-System.out-calls-to-plugin-loggers.patch => 0218-Redirect-System.out-calls-to-plugin-loggers.patch} (98%)
 rename patches/server/{0220-Armor-click-equip-options.patch => 0219-Armor-click-equip-options.patch} (94%)
 rename patches/server/{0221-Add-uptime-command.patch => 0220-Add-uptime-command.patch} (96%)
 rename patches/server/{0222-Structure-seed-options.patch => 0221-Structure-seed-options.patch} (96%)
 rename patches/server/{0223-Tool-actionable-options.patch => 0222-Tool-actionable-options.patch} (99%)
 rename patches/server/{0224-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch => 0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch} (91%)
 rename patches/server/{0225-Store-placer-on-Block-when-placed.patch => 0224-Store-placer-on-Block-when-placed.patch} (100%)
 rename patches/server/{0226-Summoner-API.patch => 0225-Summoner-API.patch} (100%)
 rename patches/server/{0227-Customizable-sleeping-actionbar-messages.patch => 0226-Customizable-sleeping-actionbar-messages.patch} (100%)
 rename patches/server/{0228-option-to-disable-shulker-box-items-from-dropping-co.patch => 0227-option-to-disable-shulker-box-items-from-dropping-co.patch} (92%)
 rename patches/server/{0229-Silk-touchable-budding-amethyst.patch => 0228-Silk-touchable-budding-amethyst.patch} (95%)
 rename patches/server/{0230-Big-dripleaf-tilt-delay.patch => 0229-Big-dripleaf-tilt-delay.patch} (96%)
 rename patches/server/{0231-Player-ridable-in-water-option.patch => 0230-Player-ridable-in-water-option.patch} (92%)
 rename patches/server/{0232-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (96%)
 rename patches/server/{0233-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch => 0232-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch} (100%)
 rename patches/server/{0234-Add-compass-command.patch => 0233-Add-compass-command.patch} (97%)
 rename patches/server/{0235-Config-to-prevent-horses-from-standing-with-riders.patch => 0234-Config-to-prevent-horses-from-standing-with-riders.patch} (96%)
 rename patches/server/{0236-Toggle-for-kinetic-damage.patch => 0235-Toggle-for-kinetic-damage.patch} (96%)
 rename patches/server/{0237-Add-Option-for-disable-observer-clocks.patch => 0236-Add-Option-for-disable-observer-clocks.patch} (95%)
 rename patches/server/{0238-Customizeable-Zombie-Villager-curing-times.patch => 0237-Customizeable-Zombie-Villager-curing-times.patch} (92%)
 rename patches/server/{0239-Option-for-sponges-to-work-on-lava.patch => 0238-Option-for-sponges-to-work-on-lava.patch} (95%)
 rename patches/server/{0240-Toggle-for-Wither-s-spawn-sound.patch => 0239-Toggle-for-Wither-s-spawn-sound.patch} (96%)
 rename patches/server/{0241-Cactus-breaks-from-solid-neighbors-config.patch => 0240-Cactus-breaks-from-solid-neighbors-config.patch} (95%)
 rename patches/server/{0242-Config-to-remove-curse-of-binding-with-weakness.patch => 0241-Config-to-remove-curse-of-binding-with-weakness.patch} (96%)
 rename patches/server/{0243-Conduit-behavior-configuration.patch => 0242-Conduit-behavior-configuration.patch} (96%)
 rename patches/server/{0244-Cauldron-fill-chances.patch => 0243-Cauldron-fill-chances.patch} (92%)
 rename patches/server/{0245-Config-to-allow-mobs-to-pathfind-over-rails.patch => 0244-Config-to-allow-mobs-to-pathfind-over-rails.patch} (96%)
 rename patches/server/{0246-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (95%)
 rename patches/server/{0247-Shulker-change-color-with-dye.patch => 0246-Shulker-change-color-with-dye.patch} (97%)
 rename patches/server/{0248-Extended-OfflinePlayer-API.patch => 0247-Extended-OfflinePlayer-API.patch} (99%)
 rename patches/server/{0249-Added-the-ability-to-add-combustible-items.patch => 0248-Added-the-ability-to-add-combustible-items.patch} (100%)
 rename patches/server/{0250-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch => 0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch} (97%)
 rename patches/server/{0251-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch => 0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch} (98%)
 rename patches/server/{0252-Shift-right-click-to-use-exp-for-mending.patch => 0251-Shift-right-click-to-use-exp-for-mending.patch} (96%)
 rename patches/server/{0253-Dolphins-naturally-aggressive-to-players-chance.patch => 0252-Dolphins-naturally-aggressive-to-players-chance.patch} (98%)
 rename patches/server/{0254-Cows-naturally-aggressive-to-players-chance.patch => 0253-Cows-naturally-aggressive-to-players-chance.patch} (98%)
 rename patches/server/{0255-Option-for-beds-to-explode-on-villager-sleep.patch => 0254-Option-for-beds-to-explode-on-villager-sleep.patch} (96%)
 rename patches/server/{0256-horses-tempted-by-gold-config.patch => 0255-horses-tempted-by-gold-config.patch} (95%)
 rename patches/server/{0257-llama-tempted-by-hay-config.patch => 0256-llama-tempted-by-hay-config.patch} (96%)
 rename patches/server/{0258-Halloween-options-and-optimizations.patch => 0257-Halloween-options-and-optimizations.patch} (98%)
 rename patches/server/{0259-Config-for-Grindstones-ignoring-curses.patch => 0258-Config-for-Grindstones-ignoring-curses.patch} (100%)
 rename patches/server/{0260-UPnP-Port-Forwarding.patch => 0259-UPnP-Port-Forwarding.patch} (100%)

diff --git a/patches/api/0019-Player-invulnerabilities.patch b/patches/api/0018-Player-invulnerabilities.patch
similarity index 100%
rename from patches/api/0019-Player-invulnerabilities.patch
rename to patches/api/0018-Player-invulnerabilities.patch
diff --git a/patches/api/0018-Villager-resetOffers.patch b/patches/api/0018-Villager-resetOffers.patch
deleted file mode 100644
index e65eabd68..000000000
--- a/patches/api/0018-Villager-resetOffers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 7 Oct 2019 00:15:28 -0500
-Subject: [PATCH] Villager#resetOffers
-
-
-diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 511b96841f7342d0a6b38d7cff56252ea8ef9bfe..0e2615b6e2be21abfb0116e6f1e02416bac97f74 100644
---- a/src/main/java/org/bukkit/entity/Villager.java
-+++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {
-      */
-     public void wakeup();
- 
-+    // Purpur start
-+    /**
-+     * Reset this villager's trade offers
-+     */
-+    public void resetOffers();
-+    // Purpur end
-+
-     /**
-      * Causes this villager to shake his head.
-      */
diff --git a/patches/api/0020-Anvil-API.patch b/patches/api/0019-Anvil-API.patch
similarity index 100%
rename from patches/api/0020-Anvil-API.patch
rename to patches/api/0019-Anvil-API.patch
diff --git a/patches/api/0021-ItemStack-convenience-methods.patch b/patches/api/0020-ItemStack-convenience-methods.patch
similarity index 100%
rename from patches/api/0021-ItemStack-convenience-methods.patch
rename to patches/api/0020-ItemStack-convenience-methods.patch
diff --git a/patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/api/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/api/0023-ChatColor-conveniences.patch b/patches/api/0022-ChatColor-conveniences.patch
similarity index 100%
rename from patches/api/0023-ChatColor-conveniences.patch
rename to patches/api/0022-ChatColor-conveniences.patch
diff --git a/patches/api/0024-LivingEntity-broadcastItemBreak.patch b/patches/api/0023-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/api/0024-LivingEntity-broadcastItemBreak.patch
rename to patches/api/0023-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/api/0025-Item-entity-immunities.patch b/patches/api/0024-Item-entity-immunities.patch
similarity index 100%
rename from patches/api/0025-Item-entity-immunities.patch
rename to patches/api/0024-Item-entity-immunities.patch
diff --git a/patches/api/0026-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0025-Spigot-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/api/0026-Spigot-Improve-output-of-plugins-command.patch
rename to patches/api/0025-Spigot-Improve-output-of-plugins-command.patch
diff --git a/patches/api/0027-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/api/0027-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/api/0028-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/api/0028-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/api/0029-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 100%
rename from patches/api/0029-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
diff --git a/patches/api/0030-Left-handed-API.patch b/patches/api/0029-Left-handed-API.patch
similarity index 100%
rename from patches/api/0030-Left-handed-API.patch
rename to patches/api/0029-Left-handed-API.patch
diff --git a/patches/api/0031-Alphabetize-in-game-plugins-list.patch b/patches/api/0030-Alphabetize-in-game-plugins-list.patch
similarity index 100%
rename from patches/api/0031-Alphabetize-in-game-plugins-list.patch
rename to patches/api/0030-Alphabetize-in-game-plugins-list.patch
diff --git a/patches/api/0032-Rabid-Wolf-API.patch b/patches/api/0031-Rabid-Wolf-API.patch
similarity index 100%
rename from patches/api/0032-Rabid-Wolf-API.patch
rename to patches/api/0031-Rabid-Wolf-API.patch
diff --git a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
similarity index 100%
rename from patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch
rename to patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
diff --git a/patches/api/0034-PlayerBookTooLargeEvent.patch b/patches/api/0033-PlayerBookTooLargeEvent.patch
similarity index 100%
rename from patches/api/0034-PlayerBookTooLargeEvent.patch
rename to patches/api/0033-PlayerBookTooLargeEvent.patch
diff --git a/patches/api/0035-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/api/0035-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/api/0036-Add-EntityTeleportHinderedEvent.patch b/patches/api/0035-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/api/0036-Add-EntityTeleportHinderedEvent.patch
rename to patches/api/0035-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/api/0037-Add-StructureGenerateEvent.patch b/patches/api/0036-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/api/0037-Add-StructureGenerateEvent.patch
rename to patches/api/0036-Add-StructureGenerateEvent.patch
diff --git a/patches/api/0038-Add-unsafe-Entity-serialization-API.patch b/patches/api/0037-Add-unsafe-Entity-serialization-API.patch
similarity index 100%
rename from patches/api/0038-Add-unsafe-Entity-serialization-API.patch
rename to patches/api/0037-Add-unsafe-Entity-serialization-API.patch
diff --git a/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
similarity index 100%
rename from patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch
rename to patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
diff --git a/patches/api/0040-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch
similarity index 100%
rename from patches/api/0040-Add-enchantment-target-for-bows-and-crossbows.patch
rename to patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch
diff --git a/patches/api/0041-Iron-golem-poppy-calms-anger.patch b/patches/api/0040-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/api/0041-Iron-golem-poppy-calms-anger.patch
rename to patches/api/0040-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/api/0042-API-for-any-mob-to-burn-daylight.patch b/patches/api/0041-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from patches/api/0042-API-for-any-mob-to-burn-daylight.patch
rename to patches/api/0041-API-for-any-mob-to-burn-daylight.patch
diff --git a/patches/api/0043-Flying-Fall-Damage-API.patch b/patches/api/0042-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/api/0043-Flying-Fall-Damage-API.patch
rename to patches/api/0042-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0044-Add-back-player-spawned-endermite-API.patch b/patches/api/0043-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/api/0044-Add-back-player-spawned-endermite-API.patch
rename to patches/api/0043-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/api/0045-Fix-default-permission-system.patch b/patches/api/0044-Fix-default-permission-system.patch
similarity index 100%
rename from patches/api/0045-Fix-default-permission-system.patch
rename to patches/api/0044-Fix-default-permission-system.patch
diff --git a/patches/api/0046-Summoner-API.patch b/patches/api/0045-Summoner-API.patch
similarity index 100%
rename from patches/api/0046-Summoner-API.patch
rename to patches/api/0045-Summoner-API.patch
diff --git a/patches/api/0047-Clean-up-version-command-output-for-console.patch b/patches/api/0046-Clean-up-version-command-output-for-console.patch
similarity index 100%
rename from patches/api/0047-Clean-up-version-command-output-for-console.patch
rename to patches/api/0046-Clean-up-version-command-output-for-console.patch
diff --git a/patches/api/0048-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 98%
rename from patches/api/0048-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch
index 8a7d8f85a..bc6b7b414 100644
--- a/patches/api/0048-Add-force-and-prompt-parameters-to-resource-pack-api.patch
+++ b/patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fcc4c6851ef932ab2e84d8758e7618856b98fdcf..91a2817c8a0874d3092de19837969e3867e88cbc 100644
+index 566c8f8b505c3bfc23044a836083a00b92cacedd..033cf450dcfb02e57d0875d0117086e6fe615c32 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1490,6 +1490,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0049-Extended-OfflinePlayer-API.patch b/patches/api/0048-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/api/0049-Extended-OfflinePlayer-API.patch
rename to patches/api/0048-Extended-OfflinePlayer-API.patch
diff --git a/patches/api/0050-Added-the-ability-to-add-combustible-items.patch b/patches/api/0049-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/api/0050-Added-the-ability-to-add-combustible-items.patch
rename to patches/api/0049-Added-the-ability-to-add-combustible-items.patch
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/0127-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
deleted file mode 100644
index e51f35c9f..000000000
--- a/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 27 Nov 2020 10:33:33 -0600
-Subject: [PATCH] Zombie break door minimum difficulty option
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d60980311 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -7,6 +7,8 @@ import net.minecraft.world.entity.Mob;
- import net.minecraft.world.level.GameRules;
- import net.minecraft.world.level.block.Block;
- 
-+import static net.minecraft.world.Difficulty.*; // Purpur
-+
- public class BreakDoorGoal extends DoorInteractGoal {
- 
-     private static final int DEFAULT_DOOR_BREAK_TIME = 240;
-@@ -19,7 +21,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
-         super(mob);
-         this.lastBreakProgress = -1;
-         this.doorBreakTime = -1;
--        this.validDifficulties = difficultySufficientPredicate;
-+        this.validDifficulties = mob instanceof net.minecraft.world.entity.monster.Zombie ? difficulty -> testDifficulty(mob) : difficultySufficientPredicate; // Purpur
-     }
- 
-     public BreakDoorGoal(Mob mob, int maxProgress, Predicate<Difficulty> difficultySufficientPredicate) {
-@@ -88,4 +90,16 @@ public class BreakDoorGoal extends DoorInteractGoal {
-     private boolean isValidDifficulty(Difficulty difficulty) {
-         return this.validDifficulties.test(difficulty);
-     }
-+
-+    // Purpur start
-+    private boolean testDifficulty(Mob entity) {
-+        Difficulty d = entity.level.getDifficulty();
-+        return switch (entity.level.purpurConfig.zombieBreakDoorMinDifficulty) {
-+            case PEACEFUL -> d == HARD || d == NORMAL || d == EASY || d == PEACEFUL;
-+            case EASY     -> d == HARD || d == NORMAL || d == EASY;
-+            case NORMAL   -> d == HARD || d == NORMAL;
-+            default       -> d == HARD;
-+        };
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e94f79558ea0c380957f7984b03cb9f90190dee2..51ac0f32f7ad56926523916b669086bb895d1f19 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1798,6 +1798,7 @@ public class PurpurWorldConfig {
-     public double zombieJockeyChance = 0.05D;
-     public boolean zombieJockeyTryExistingChickens = true;
-     public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-+    public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
-     private void zombieSettings() {
-         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
-         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1812,6 +1813,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);
-+        try {
-+            zombieBreakDoorMinDifficulty = Difficulty.valueOf(getString("mobs.zombie.break-door-minimum-difficulty", zombieBreakDoorMinDifficulty.name()));
-+        } catch (IllegalArgumentException ignore) {
-+            zombieBreakDoorMinDifficulty = Difficulty.HARD;
-+        }
-     }
- 
-     public boolean zombieHorseRidableInWater = false;
diff --git a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
similarity index 90%
rename from patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
index d5cdef799..5a9e3fe94 100644
--- a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 437015eef7404362cb564dec72e3e87c79b4ff0b..e6aa1a5040bbd483a752f9c646fdb062a8e88871 100644
+index acc72884197076beee290c0a8091305b11fe51dc..2aeaa9d73dc7117bcdea7717906e4b4dc662c819 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1210,7 +1210,7 @@ public abstract class Mob extends LivingEntity {
@@ -18,7 +18,7 @@ index 437015eef7404362cb564dec72e3e87c79b4ff0b..e6aa1a5040bbd483a752f9c646fdb062
          } 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 a22bc71ef48ce8c258753ee8bd083ddc450f91d6..78f558029ac9bb36133b45f357ac85425d474b0e 100644
+index e94f79558ea0c380957f7984b03cb9f90190dee2..2b246ec320e6e1874329786887e72fd1b9884119 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -130,8 +130,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 94%
rename from patches/server/0130-Add-boat-fall-damage-config.patch
rename to patches/server/0129-Add-boat-fall-damage-config.patch
index a39fc98ab..bb9190b2a 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 f5a532d4c9773b46e436fb1341bf404b3919f6ee..126d06f0cd59e8e1298caf6cb8f8da15a691f34c 100644
+index 856f5e85d0367834d90e473fd9add868f91f2360..8df2dcc97091d1b3025f9a7296d3c7badb54a630 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -989,7 +989,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index f5a532d4c9773b46e436fb1341bf404b3919f6ee..126d06f0cd59e8e1298caf6cb8f8da15
  
              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 78f558029ac9bb36133b45f357ac85425d474b0e..41dacbe19c2c42b755da0ce91e531c2c84f82016 100644
+index 2b246ec320e6e1874329786887e72fd1b9884119..e351e19ab26a3143c7b05c66a2e69fd2f3b443ab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -365,6 +365,7 @@ public class PurpurWorldConfig {
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 0faf79de4..004e45513 100644
--- a/patches/server/0131-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0130-Snow-Golem-rate-of-fire-config.patch
@@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e254f4a0ac4 100644
+index 9ea7682c7cb4c4be1c44d3dd12dc6954d44d659e..3ea3085d9b4256c1a37c99e79550f9773e8c0f71 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -73,7 +73,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -23,7 +23,7 @@ index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e25
          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 1958dbc63426e865fd607ea7795d6ed0d82ba518..fccb9ac4ec3f4d955a83bb0a1e15a00753c3cfea 100644
+index e351e19ab26a3143c7b05c66a2e69fd2f3b443ab..bab3327d5d04c9533e1992478d4f7798685a8e33 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1494,6 +1494,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0132-EMC-Configurable-disable-give-dropping.patch b/patches/server/0131-EMC-Configurable-disable-give-dropping.patch
similarity index 95%
rename from patches/server/0132-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0131-EMC-Configurable-disable-give-dropping.patch
index c2891221f..e6f6bd637 100644
--- a/patches/server/0132-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0131-EMC-Configurable-disable-give-dropping.patch
@@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
                          itemStack.setCount(1);
                          ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index af299caa01193a6fa76656814164b0c5fbeec350..8323b10a6ab17f56c6e5d1ad2cee9ebc7ad403de 100644
+index adcb7b6df1027fefc90f1affc9e6ab93b713e98e..defd23f85fb0e67511ee93f7f9c00cfceb71c484 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -204,6 +204,11 @@ public class PurpurConfig {
diff --git a/patches/server/0133-Lobotomize-stuck-villagers.patch b/patches/server/0132-Lobotomize-stuck-villagers.patch
similarity index 95%
rename from patches/server/0133-Lobotomize-stuck-villagers.patch
rename to patches/server/0132-Lobotomize-stuck-villagers.patch
index 4587a968b..49cabc46f 100644
--- a/patches/server/0133-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0132-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index a1725ccc7b194c26c4f94561a228da9f56e24cfc..14c616f3159e4227da90c1fcc097bb46b11cc6f7 100644
+index 9f6c50391b85863f38a9dfc48aec894f74428373..c16f2f61592725a7e8dd17871620e9aef516386c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -142,6 +142,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -56,7 +56,7 @@ index a1725ccc7b194c26c4f94561a228da9f56e24cfc..14c616f3159e4227da90c1fcc097bb46
          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 fccb9ac4ec3f4d955a83bb0a1e15a00753c3cfea..757f88b3780eea63a386003f11d3c6c00b92f90c 100644
+index bab3327d5d04c9533e1992478d4f7798685a8e33..b523f87b5ffdf4df5d806b1b512b241e60921c10 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1667,6 +1667,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 98%
rename from patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index fef270b3f..c1af5d612 100644
--- a/patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -145,7 +145,7 @@ index b615dc2a2127f0874775d1707e96edfb4d95b987..72ae6b3282aac806ae11b87024ee940e
              brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 14c616f3159e4227da90c1fcc097bb46b11cc6f7..7a3c19b07c87394bc73ea16f9f0be22d7ea4f470 100644
+index c16f2f61592725a7e8dd17871620e9aef516386c..1397d9e49194f09ad6ba3fd0cbd6c368c99e133e 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -238,7 +238,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -185,7 +185,7 @@ 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 757f88b3780eea63a386003f11d3c6c00b92f90c..227ca3ef5c85b524d929e3f3076520d9abbc8f35 100644
+index b523f87b5ffdf4df5d806b1b512b241e60921c10..4cdeae00f24a81e5b49333cd611c2152411cfaef 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1669,6 +1669,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 91%
rename from patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index baf4e862f..a77fbd746 100644
--- a/patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -13,7 +13,7 @@ to the Piglin being angry, even though the player never hit them.
 This patch adds a toggle to disable this behavior.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0fb0199d4 100644
+index 96e727cd703a1da5f60ab07e47b6bc5265b309e4..50553ab4ea1e7c8ae58988ce959188408cb03913 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -137,7 +137,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -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 227ca3ef5c85b524d929e3f3076520d9abbc8f35..4b701fa6d5dc1807276dcb29305da1d7c10686d0 100644
+index 4cdeae00f24a81e5b49333cd611c2152411cfaef..3539cdb60b893693687219b689f30d1aa6c1d837 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1901,6 +1901,7 @@ public class PurpurWorldConfig {
+@@ -1895,6 +1895,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 227ca3ef5c85b524d929e3f3076520d9abbc8f35..4b701fa6d5dc1807276dcb29305da1d7
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1914,5 +1915,6 @@ public class PurpurWorldConfig {
+@@ -1908,5 +1909,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/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
similarity index 93%
rename from patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
rename to patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 49f01019e..3d8f7a522 100644
--- a/patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bd5ab259d37f13542c2510530fdf5fc5d6496975..e17c61e3b807dbc1a7bca4952349145617204154 100644
+index a6846a4553bf00379c54d1b77d30d25389a389ca..c53acfd01eac8c64f068a3c2a2a458b0c1b033a1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1011,22 +1011,22 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index bd5ab259d37f13542c2510530fdf5fc5d6496975..e17c61e3b807dbc1a7bca49523491456
  
      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 04d178af71fcf353b967c891e4a46835cb731599..f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac 100644
+index f2ba626bb16d3b94b28e6d5cffc257caf8875195..4c6c2f1fbbdbb950ab5ef363d0106105991afcf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1570,7 +1570,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0136-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 98%
rename from patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0136-Configurable-chance-for-wolves-to-spawn-rabid.patch
index 3a35928cd..88bebe437 100644
--- a/patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0136-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f 100644
+index 9ad96fec6110e26c0074c07fd8e2453e1d4271bb..055cc874ec5fb9c3268b566620bf62adda6aa85a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -10,22 +10,28 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -201,7 +201,7 @@ 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 4b701fa6d5dc1807276dcb29305da1d7c10686d0..31070a902c8ca37a4fe211b264e747fb476849d6 100644
+index 3539cdb60b893693687219b689f30d1aa6c1d837..b6967a953b8e3bf96653ce6f32af2c5a4a9d0509 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1788,6 +1788,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0138-Configurable-default-collar-color.patch b/patches/server/0137-Configurable-default-collar-color.patch
similarity index 93%
rename from patches/server/0138-Configurable-default-collar-color.patch
rename to patches/server/0137-Configurable-default-collar-color.patch
index e6afa2a64..d8f1bd4fc 100644
--- a/patches/server/0138-Configurable-default-collar-color.patch
+++ b/patches/server/0137-Configurable-default-collar-color.patch
@@ -9,7 +9,7 @@ Resets to RED when the value is invalid.
 test
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..cea244bae0449a52b04989d1db1e4fbbd178241c 100644
+index bad5b47f3df186c77e578d5953cf1798179639d3..8355aa65b6f8be5027370fada8758510b774b4b2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -366,6 +366,14 @@ public class Cat extends TamableAnimal {
@@ -28,7 +28,7 @@ index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..cea244bae0449a52b04989d1db1e4fbb
      public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
          Cat entitycat = (Cat) EntityType.CAT.create((Level) world);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a5eac3e7d 100644
+index 055cc874ec5fb9c3268b566620bf62adda6aa85a..bad3b1e32a8c8035542243a69028b3a8622019b8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -188,6 +188,12 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -45,7 +45,7 @@ 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 31070a902c8ca37a4fe211b264e747fb476849d6..2ebd9fa697a5835d67289da72ad62be638996947 100644
+index b6967a953b8e3bf96653ce6f32af2c5a4a9d0509..0bf9306bb31e975101dccc3df4c776f16af84391 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -614,6 +614,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0139-Phantom-flames-on-swoop.patch b/patches/server/0138-Phantom-flames-on-swoop.patch
similarity index 91%
rename from patches/server/0139-Phantom-flames-on-swoop.patch
rename to patches/server/0138-Phantom-flames-on-swoop.patch
index b2e3d9f28..59a089f59 100644
--- a/patches/server/0139-Phantom-flames-on-swoop.patch
+++ b/patches/server/0138-Phantom-flames-on-swoop.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantom flames on swoop
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece084cacaaa1 100644
+index 789224c6285cde2009e000d98e190c36459f04e8..26ef372ddeb707ad0962297ce736c245f713d9f2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -227,6 +227,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -17,7 +17,7 @@ index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece08
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2ebd9fa697a5835d67289da72ad62be638996947..58ba582c9675b20096d9aeda26c3c3013af5c0dc 100644
+index 0bf9306bb31e975101dccc3df4c776f16af84391..c9218a478d5955b5add90cf21e2d8df77a0c6e08 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1204,6 +1204,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 95%
rename from patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
index d32f4a815..66d03e134 100644
--- a/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -17,7 +17,7 @@ index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd2613
  
          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 10c6c8a053acf761e2645c86823d1e2eb7c13e13..dcaca117ed5bf3b9c2459cbe72c7752e96b84850 100644
+index c9218a478d5955b5add90cf21e2d8df77a0c6e08..27f37620f3eda28bc3a8834fd335aeeac38ccbf5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -442,6 +442,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0141-Implement-TPSBar.patch b/patches/server/0140-Implement-TPSBar.patch
similarity index 100%
rename from patches/server/0141-Implement-TPSBar.patch
rename to patches/server/0140-Implement-TPSBar.patch
diff --git a/patches/server/0142-Striders-give-saddle-back.patch b/patches/server/0141-Striders-give-saddle-back.patch
similarity index 92%
rename from patches/server/0142-Striders-give-saddle-back.patch
rename to patches/server/0141-Striders-give-saddle-back.patch
index 75e50f660..0857c97e9 100644
--- a/patches/server/0142-Striders-give-saddle-back.patch
+++ b/patches/server/0141-Striders-give-saddle-back.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Striders give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855d8847bdc 100644
+index 22ce93fd265d3fa9967e6467301e8128635f2391..762542252e59da20f284dde2545889da3340454e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -451,6 +451,18 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -28,7 +28,7 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index db26fd687afc83fb914ac274ae719ab6a402e05e..46b4b9ac778424e7e8a0a51932ec99e2717c5c56 100644
+index 27f37620f3eda28bc3a8834fd335aeeac38ccbf5..af48e54639b412feb8dee36705d0aa8980b7ea53 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1579,6 +1579,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0143-PlayerBookTooLargeEvent.patch b/patches/server/0142-PlayerBookTooLargeEvent.patch
similarity index 96%
rename from patches/server/0143-PlayerBookTooLargeEvent.patch
rename to patches/server/0142-PlayerBookTooLargeEvent.patch
index 5659c02c1..3339fb8a1 100644
--- a/patches/server/0143-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0142-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 5835d6f1603bbe1ba2490c9393e90908e31812f9..94fc95f79e74f6b3e7d9cd666788cc105b4e24cb 100644
+index 5c9064ddcb74f789da713462ccf358bf8a881eb5..087abd2f3d8cd3f57e272551f8c576e330dda54f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1136,10 +1136,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch
similarity index 94%
rename from patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch
index ccbefd7d6..3193d5a7a 100644
--- a/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5b0647a8b8d2dd8a44b38c378312ad917d5314d9..d7a3d2928a63517a1513f5572b121f77979f1b17 100644
+index 1356a027255671cc2d05db22c350506a928695ce..2ac738bfa2fc61150e2cd8ca0c3988aeffeb6427 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index 5b0647a8b8d2dd8a44b38c378312ad917d5314d9..d7a3d2928a63517a1513f5572b121f77
  
      protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 666dcdc11178ea576c84f50e37da57f3844b7bf4..a8390aad9b3991ae83102de0057a2ed45914c612 100644
+index af48e54639b412feb8dee36705d0aa8980b7ea53..ae252c66d4319fa4a581f1da9ec926de646a5aa0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -267,6 +267,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 96%
rename from patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch
index ed1bbd925..447235530 100644
--- a/patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdda0e11a36 100644
+index ccaa225eb0e2f88b4cb91cf72cd2082a81d36de6..733a9827554f129809e77fe41174b5b2b89b8e5c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
@@ -18,7 +18,7 @@ index ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdd
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e6aa1a5040bbd483a752f9c646fdb062a8e88871..a53173ec096c059e1913f4af124c834b5411e5bc 100644
+index 2aeaa9d73dc7117bcdea7717906e4b4dc662c819..5ddf29a8d6d3d8d48641c41ef6913c9e20811485 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -661,7 +661,7 @@ public abstract class Mob extends LivingEntity {
@@ -44,10 +44,10 @@ index 8d6d47456ce6f9870f1a682665780a301b92fec5..b67b877e3fa9c00a0b88dbe3e8b0f0e9
          } else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER && !(world.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC)) { // Purpur
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index 03bc86c776596ca5964c22adb757115d60980311..2eda2dc7f234c068f48af5b35803bc92321ee58a 100644
+index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..56d2849276b322436544512521e3b4ea0c679bcc 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -35,7 +35,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
+@@ -33,7 +33,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
  
      @Override
      public boolean canUse() {
@@ -92,7 +92,7 @@ index ac5779319081a6894373877067edf958da8a9cf5..24227a18ea1d0c06e2049542c8ca9c82
          } else if (this.nextStartTick > 0) {
              --this.nextStartTick;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index ba1bfad397d62dd6feccdbbe3288997cfe16ce84..5750b42a3f522402e9cea573204cf31f6ab0c287 100644
+index 03e75add762b19170e95d1b280f92e79f2f8f9bf..091177ac2a5995b9f6f0b5245e8eabefd4ed86d6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -1346,7 +1346,7 @@ public class Fox extends Animal {
@@ -105,7 +105,7 @@ index ba1bfad397d62dd6feccdbbe3288997cfe16ce84..5750b42a3f522402e9cea573204cf31f
  
                  if (iblockdata.is(Blocks.SWEET_BERRY_BUSH)) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 8d15e7ec0ae4bcdfd5628f41c0fc236eaa85d548..f2d5c9e5c93d2b93d5188491d0f6239bbdf84e78 100644
+index e7adecb2324efaedd6aad3aa1213d53765b09b7e..74ee531befc67495e18d4b97a4e4b14e51830de5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -611,7 +611,7 @@ public class Rabbit extends Animal {
@@ -118,7 +118,7 @@ index 8d15e7ec0ae4bcdfd5628f41c0fc236eaa85d548..f2d5c9e5c93d2b93d5188491d0f6239b
                  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 5e370d5137564ddcfb76a81b92d43e254f4a0ac4..0549e3d3cd3a9fddcb0d8edc56fb1fddc1c19802 100644
+index 3ea3085d9b4256c1a37c99e79550f9773e8c0f71..c931bf7ec3c58eae012bbadb9d3e9fef69b3fc79 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -125,7 +125,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -144,7 +144,7 @@ index f637cd740ec3801ce1c387473b5c4ff6080e76ec..3247f3f3c9d53953f8268c8f95752751
                              // flag1 = this.level.a(blockposition, false) || flag1;
                              flag1 = true;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811ffd03c3d 100644
+index ff71f78497681805246d7b3e4ac59288db9af997..4407c9f25e88a3685c6e9f8c7775d3011b38fff2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -375,7 +375,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -166,7 +166,7 @@ index ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811
                      j = Mth.floor(this.getX());
                      int i1 = Mth.floor(this.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index cda677a5cb5b9993764be24140bc9b27cc3298af..0192c5502037b8f93e6507e7dcb9229201d29d36 100644
+index 96858c10ad219a47187d3008387355f1bcfdc789..aea8de335294320e3734bea4fbc4bab91d1de59a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -344,7 +344,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -179,7 +179,7 @@ index cda677a5cb5b9993764be24140bc9b27cc3298af..0192c5502037b8f93e6507e7dcb92292
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index f701807f2593189632a2a556e82bc0f1ba692dbf..17e33ac7125d7474fe5f1ea2ca3d1916e016a1c8 100644
+index c5795f7b8cb66e633ea22af3f5b44f9995628f9e..98bba53dd8b910a644b318cbf47480ec3706489e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -482,7 +482,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -201,7 +201,7 @@ index f701807f2593189632a2a556e82bc0f1ba692dbf..17e33ac7125d7474fe5f1ea2ca3d1916
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 0ae0a49da681c6603d6f1504ee58f99b8f345e44..01b5a4e75af2aa4f9c59ca77fd91fe62d10fe39b 100644
+index 9e50cf5d5b48718b1f8ff74c4de891172970ac12..78b2350a09eef0537742af429cfa5f022fc92ad3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -316,7 +316,7 @@ public class Evoker extends SpellcasterIllager {
@@ -214,7 +214,7 @@ index 0ae0a49da681c6603d6f1504ee58f99b8f345e44..01b5a4e75af2aa4f9c59ca77fd91fe62
              } else {
                  List<Sheep> list = Evoker.this.level.getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index b8c753a574487cdc045ea334229aafd257d6e223..4e72c6876dff1a03bb6736c8e90463cd51dadcb5 100644
+index 13f4b6d17312dd7379875eb56049c87c10deae88..1148cd343f9931848b5119d8bddc9b5218d67490 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -184,7 +184,7 @@ public class Ravager extends Raider {
@@ -227,7 +227,7 @@ index b8c753a574487cdc045ea334229aafd257d6e223..4e72c6876dff1a03bb6736c8e90463cd
                  AABB axisalignedbb = this.getBoundingBox().inflate(0.2D);
                  Iterator iterator = BlockPos.betweenClosed(Mth.floor(axisalignedbb.minX), Mth.floor(axisalignedbb.minY), Mth.floor(axisalignedbb.minZ), Mth.floor(axisalignedbb.maxX), Mth.floor(axisalignedbb.maxY), Mth.floor(axisalignedbb.maxZ)).iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 0d60d6352294fadc1a26579a712b01cf0da681af..b9d5a03000b3b0759d786ac69e30d6a9d25146b3 100644
+index 1c523c384668b483ba0211c413ade7b87c7ca16a..9caf164f1b68034dd36671e94c9b60e225bde691 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -195,7 +195,7 @@ public class Silverfish extends Monster {
@@ -249,7 +249,7 @@ index 0d60d6352294fadc1a26579a712b01cf0da681af..b9d5a03000b3b0759d786ac69e30d6a9
                      BlockPos blockposition = (new BlockPos(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ())).relative(this.selectedDirection);
                      BlockState iblockdata = this.mob.level.getBlockState(blockposition);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 79f075e7d7e5d8312f5a9ed47bea2a558b9491d5..ff8791b9202d6487afbf7b9dafc5dda375f73a5a 100644
+index e395f540590b9a820fb445e31ab48b79493bd2ff..d95b69ddd52fd444c2f314eb8776e58b487fdbd4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -409,7 +409,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -393,7 +393,7 @@ 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 43c4545b130e2a0178d3bfecc681dd82469eff99..3cd4988e9259697d95cddbe5d7c25b3ac0266b4d 100644
+index ae252c66d4319fa4a581f1da9ec926de646a5aa0..c73c77a22317631da7f8f52037103744bf9b8024 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -381,9 +381,12 @@ public class PurpurWorldConfig {
@@ -680,18 +680,18 @@ index 43c4545b130e2a0178d3bfecc681dd82469eff99..3cd4988e9259697d95cddbe5d7c25b3a
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -1862,6 +1908,7 @@ public class PurpurWorldConfig {
+@@ -1861,6 +1907,7 @@ public class PurpurWorldConfig {
+     public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-     public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
 +    public boolean zombieBypassMobGriefing = false;
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1881,6 +1928,7 @@ public class PurpurWorldConfig {
-         } catch (IllegalArgumentException ignore) {
-             zombieBreakDoorMinDifficulty = Difficulty.HARD;
-         }
+@@ -1875,6 +1922,7 @@ public class PurpurWorldConfig {
+         zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
+         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
+         zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
 +        zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
      }
  
diff --git a/patches/server/0147-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 97%
rename from patches/server/0147-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch
index 623a78a3a..e1a353d84 100644
--- a/patches/server/0147-Config-to-allow-Note-Block-sounds-when-blocked.patch
+++ b/patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch
@@ -22,7 +22,7 @@ index 59ae3bb34678cdb5241f691915c96d6568363d3b..f6c0c9fca005f72c3764a4a4f8df0582
              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 8df99d5ccee0ff4280a720b2373407e51f4d4ec2..fd9ba48619b103071f9de669dea7d59bd2db2fee 100644
+index c73c77a22317631da7f8f52037103744bf9b8024..c70a804b8b7a30411f6cfa72bb2f36d411e0af30 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -384,6 +384,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0148-Add-EntityTeleportHinderedEvent.patch b/patches/server/0147-Add-EntityTeleportHinderedEvent.patch
similarity index 97%
rename from patches/server/0148-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0147-Add-EntityTeleportHinderedEvent.patch
index e7b355df8..ce4531a8a 100644
--- a/patches/server/0148-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0147-Add-EntityTeleportHinderedEvent.patch
@@ -59,7 +59,7 @@ index bc2f2c69d437e99cb965cede7dfd42228151b26c..fef1027829c44957e23c0a121033bfb7
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
              world.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07e25aab49 100644
+index b2c098a02008b860b2fb17323831ab8af27751ae..1405083cb3e9e01d9dd99a9e42b2b56f3a104a60 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -179,6 +179,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
@@ -78,7 +78,7 @@ 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 c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e243e73dffd 100644
+index c70a804b8b7a30411f6cfa72bb2f36d411e0af30..4432330c936e060b1bb5005ebe70cf575249e5d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -383,6 +383,7 @@ public class PurpurWorldConfig {
@@ -113,7 +113,7 @@ index f8811514c155f743f6e93c9a88721903fdb1bddd..501f9310bdc13b6d38dcdda4ad7fdfd1
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index acca95dbf81a5c8fcffc496431dd65579d323701..2aab21f43e3c5564d1970be7a98a08e2a68d10a8 100644
+index 4c6c2f1fbbdbb950ab5ef363d0106105991afcf9..3368b953b364faf2cde8e242d59fa8c6febc105f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0149-Add-StructureGenerateEvent.patch b/patches/server/0148-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0149-Add-StructureGenerateEvent.patch
rename to patches/server/0148-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0150-Farmland-trampling-changes.patch b/patches/server/0149-Farmland-trampling-changes.patch
similarity index 97%
rename from patches/server/0150-Farmland-trampling-changes.patch
rename to patches/server/0149-Farmland-trampling-changes.patch
index 3ec83c71f..62557b68a 100644
--- a/patches/server/0150-Farmland-trampling-changes.patch
+++ b/patches/server/0149-Farmland-trampling-changes.patch
@@ -37,7 +37,7 @@ index e06a8a68ccb9c9a77df061264e58fd850cf1f794..010da2b44fa3a4f033e4f86e9a0917b5
              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 6b02ac8a7ed8e4787abf017af23936718cee8d9c..8eda95b6b8c71fdc2c1938304b51c626f66235bd 100644
+index 4432330c936e060b1bb5005ebe70cf575249e5d9..7a3b246cd6254b7806b54f4f4d23fd22a2cba8a8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -480,10 +480,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0151-Movement-options-for-armor-stands.patch b/patches/server/0150-Movement-options-for-armor-stands.patch
similarity index 98%
rename from patches/server/0151-Movement-options-for-armor-stands.patch
rename to patches/server/0150-Movement-options-for-armor-stands.patch
index 87cc619ef..c25802f74 100644
--- a/patches/server/0151-Movement-options-for-armor-stands.patch
+++ b/patches/server/0150-Movement-options-for-armor-stands.patch
@@ -66,7 +66,7 @@ index bb710e62477df3048d5219f1edfa9ffdefacb41d..aee5db3cdbc49de995780d0b0e219d08
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 31c1e612a40c13e97b3784db9ef211265bb6f3f6..d330d23e63e3da106e8a44545792adfffc8d7918 100644
+index 7a3b246cd6254b7806b54f4f4d23fd22a2cba8a8..7b0ec253d7ed4e6207d4f82e84b7c6383fae2821 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,10 +103,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0152-Fix-stuck-in-portals.patch b/patches/server/0151-Fix-stuck-in-portals.patch
similarity index 97%
rename from patches/server/0152-Fix-stuck-in-portals.patch
rename to patches/server/0151-Fix-stuck-in-portals.patch
index 23e9099a3..b3ed18049 100644
--- a/patches/server/0152-Fix-stuck-in-portals.patch
+++ b/patches/server/0151-Fix-stuck-in-portals.patch
@@ -37,7 +37,7 @@ index e096e5268330b47be2e629abdc34ed4ff54009d9..3c5347c0d4b65ced4b942504b1cdb8aa
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d330d23e63e3da106e8a44545792adfffc8d7918..31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96 100644
+index 7b0ec253d7ed4e6207d4f82e84b7c6383fae2821..087bf58786d6a1e1f812319be615a53c02f6bfda 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -297,6 +297,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0153-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0152-Toggle-for-water-sensitive-mob-damage.patch
similarity index 99%
rename from patches/server/0153-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0152-Toggle-for-water-sensitive-mob-damage.patch
index 1befab998..96c5eb981 100644
--- a/patches/server/0153-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0152-Toggle-for-water-sensitive-mob-damage.patch
@@ -1174,7 +1174,7 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07cde3c187 100644
+index 087bf58786d6a1e1f812319be615a53c02f6bfda..08709de2f81fb637cf951cb2d76dfd759fb429b5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -600,6 +600,7 @@ public class PurpurWorldConfig {
@@ -2217,23 +2217,23 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombieRidable = false;
-@@ -1927,6 +2065,7 @@ public class PurpurWorldConfig {
+@@ -1926,6 +2064,7 @@ public class PurpurWorldConfig {
+     public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-     public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
      public boolean zombieBypassMobGriefing = false;
 +    public boolean zombieTakeDamageFromWater = false;
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1947,6 +2086,7 @@ public class PurpurWorldConfig {
-             zombieBreakDoorMinDifficulty = Difficulty.HARD;
-         }
+@@ -1941,6 +2080,7 @@ public class PurpurWorldConfig {
+         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
+         zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
 +        zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
      }
  
      public boolean zombieHorseRidableInWater = false;
-@@ -1958,6 +2098,7 @@ public class PurpurWorldConfig {
+@@ -1952,6 +2092,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMin = 0.2D;
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
@@ -2241,7 +2241,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombieHorseSettings() {
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
          zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
-@@ -1974,6 +2115,7 @@ public class PurpurWorldConfig {
+@@ -1968,6 +2109,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2249,7 +2249,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -1983,6 +2125,7 @@ public class PurpurWorldConfig {
+@@ -1977,6 +2119,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2257,7 +2257,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1996,6 +2139,7 @@ public class PurpurWorldConfig {
+@@ -1990,6 +2133,7 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2265,7 +2265,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2006,6 +2150,7 @@ public class PurpurWorldConfig {
+@@ -2000,6 +2144,7 @@ public class PurpurWorldConfig {
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2273,7 +2273,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2020,5 +2165,6 @@ public class PurpurWorldConfig {
+@@ -2014,5 +2159,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
diff --git a/patches/server/0154-Config-to-always-tame-in-Creative.patch b/patches/server/0153-Config-to-always-tame-in-Creative.patch
similarity index 98%
rename from patches/server/0154-Config-to-always-tame-in-Creative.patch
rename to patches/server/0153-Config-to-always-tame-in-Creative.patch
index 8d42db908..c15632058 100644
--- a/patches/server/0154-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0153-Config-to-always-tame-in-Creative.patch
@@ -59,7 +59,7 @@ index 1193f711442fc8d0d3631cbb7fe4a31bf7639f1b..c681cbcd4549d6bf2d88408b94fbb31c
                      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 ea2a1c56ced20cad17634c7871f40f07cde3c187..4863ce93475ec25c0cece1fbcb9b1c5ca90ac5b3 100644
+index 08709de2f81fb637cf951cb2d76dfd759fb429b5..4e3bf53c088ec64882cf87c5e3facdaeb034e02e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -385,6 +385,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0155-End-crystal-explosion-options.patch b/patches/server/0154-End-crystal-explosion-options.patch
similarity index 98%
rename from patches/server/0155-End-crystal-explosion-options.patch
rename to patches/server/0154-End-crystal-explosion-options.patch
index 39ad06050..997cc73d1 100644
--- a/patches/server/0155-End-crystal-explosion-options.patch
+++ b/patches/server/0154-End-crystal-explosion-options.patch
@@ -52,7 +52,7 @@ 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 8449637ff57ac78c1936313f2dd559b1f61b0c92..e80bad1049c51998614e5c9fb917dee8a2a8bb95 100644
+index 4e3bf53c088ec64882cf87c5e3facdaeb034e02e..3b75437f3e78d7d00ca0b41f85e18dc11bdc0f1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -487,6 +487,35 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0156-Add-unsafe-Entity-serialization-API.patch b/patches/server/0155-Add-unsafe-Entity-serialization-API.patch
similarity index 98%
rename from patches/server/0156-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0155-Add-unsafe-Entity-serialization-API.patch
index 6dffbd0d6..a66c75a34 100644
--- a/patches/server/0156-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server/0155-Add-unsafe-Entity-serialization-API.patch
@@ -34,7 +34,7 @@ index 501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6..5ae88a924b2f2cfd714bd693eebc708e
      // 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 408863b137b7bda3f3e654ac3665ddeefb6d9e7b..1a3170810dacc3017dc16c2dd2ceca3d40023b2a 100644
+index ac64c94048edb8b8b2e049ed1b0c366eadbb01be..d5bfcadd00d2035c3fb8bd2ba71c1912372f6dcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -407,9 +407,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0157-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 97%
rename from patches/server/0157-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index cb2d799cd..a919148ce 100644
--- a/patches/server/0157-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -29,7 +29,7 @@ index 3de45a7a54643109fc6a8287879cf6dae87e72ec..2f9e10be559bbf685bbe8b4ac4b8a55a
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index df753f279bd24f23a6b882e124d7df176dd1bca4..bb110a2123faf072364145439320442ed4a89edf 100644
+index 3b75437f3e78d7d00ca0b41f85e18dc11bdc0f1c..cadde9d8772d61edd0e041b508e0abebbd076454 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -922,6 +922,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0158-Dont-run-with-scissors.patch b/patches/server/0157-Dont-run-with-scissors.patch
similarity index 96%
rename from patches/server/0158-Dont-run-with-scissors.patch
rename to patches/server/0157-Dont-run-with-scissors.patch
index 1b64f6bf3..fb904acd5 100644
--- a/patches/server/0158-Dont-run-with-scissors.patch
+++ b/patches/server/0157-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 94fc95f79e74f6b3e7d9cd666788cc105b4e24cb..11b9ba2bb00a9bb198cd82aca37cd4201c184e66 100644
+index 087abd2f3d8cd3f57e272551f8c576e330dda54f..27a707c9dfc52a043c98aa39ba9307a71e32a232 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1569,6 +1569,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -56,7 +56,7 @@ index 039c5e6d98228837f7818803641656d566e416f5..1e09dc436ce147d42035d48918b811eb
  
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ae8fe8d635acad84e79498fb5bf6db6469fbb7dd..198536d8f06f52623ae7492d2e0a6d428d4f72d1 100644
+index cadde9d8772d61edd0e041b508e0abebbd076454..a401e7280e888d15203c03b7cb999e4cfd3f1077 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -157,6 +157,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0159-One-Punch-Man.patch b/patches/server/0158-One-Punch-Man.patch
similarity index 96%
rename from patches/server/0159-One-Punch-Man.patch
rename to patches/server/0158-One-Punch-Man.patch
index 31776a97e..aabee5a48 100644
--- a/patches/server/0159-One-Punch-Man.patch
+++ b/patches/server/0158-One-Punch-Man.patch
@@ -30,7 +30,7 @@ index 733a9827554f129809e77fe41174b5b2b89b8e5c..b2dbe65f07ecc25be810f80aaf05d924
                  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 f3a9bae0079eadfd3734930d4b2d1ee377085843..0c301b690b0f6c529f46c90b975348b30247a4e5 100644
+index a401e7280e888d15203c03b7cb999e4cfd3f1077..0cf7884c2896dec8c3352547c8838d010506e973 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -302,6 +302,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0160-Add-config-for-snow-on-blue-ice.patch b/patches/server/0159-Add-config-for-snow-on-blue-ice.patch
similarity index 96%
rename from patches/server/0160-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0159-Add-config-for-snow-on-blue-ice.patch
index f5df175a3..7195baf27 100644
--- a/patches/server/0160-Add-config-for-snow-on-blue-ice.patch
+++ b/patches/server/0159-Add-config-for-snow-on-blue-ice.patch
@@ -29,7 +29,7 @@ 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 6d0c419ca584d41bfe9974278d78ceeb7166f393..f5d4fec6a1a648d775ea8be0b511a22958c4a2c5 100644
+index 0cf7884c2896dec8c3352547c8838d010506e973..7b8a638a9472b8c350561ac424dd513b17b4cacd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -548,6 +548,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0161-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 96%
rename from patches/server/0161-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
index 3a5a3bdef..75b8c6be4 100644
--- a/patches/server/0161-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
+++ b/patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Configurable Ender Pearl cooldown, damage, and Endermite RNG
 - Endermite spawn chance
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index a65e0a3357a27dfdf62ba45ebfeb531958851285..c2db9485e69b9679a33a57bc84cf2c76c1de2a42 100644
+index 6599f267e30d15ad179e98d3683273cd9bbc3bd0..723b1ed5078084b7f85424f66e4f7b314fc05dda 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 @@ -69,7 +69,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
@@ -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 f5d4fec6a1a648d775ea8be0b511a22958c4a2c5..16d8181614fd7ffaf682438d3fb348c133a82620 100644
+index 7b8a638a9472b8c350561ac424dd513b17b4cacd..b05787589df4066dd252e9f69336065ae29dda29 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -159,6 +159,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0161-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 92%
rename from patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0161-Config-to-ignore-nearby-mobs-when-sleeping.patch
index c55bb2550..ba141582c 100644
--- a/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0161-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 4b90ebeae7dccef28dc7fca101d5e82cfde9ee70..71542d8f5f25485e99682470264c619e7d52bebf 100644
+index 33e36a80edbc80f0f562842ed690dccc13cc2e94..af22f5b80fd8d7aba8d12d84196a57e8f054fec2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1305,7 +1305,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index 4b90ebeae7dccef28dc7fca101d5e82cfde9ee70..71542d8f5f25485e99682470264c619e
                          }
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ddb2733fc4a23fa480cdb708e4ebab9b6e827a43..54e276877fe4ba5180fff54485561792301bf8b1 100644
+index b05787589df4066dd252e9f69336065ae29dda29..39f07342dc272aa4a9727b1fff523b21a68cee43 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 {
diff --git a/patches/server/0163-Add-back-player-spawned-endermite-API.patch b/patches/server/0162-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0163-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0162-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0164-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 97%
rename from patches/server/0164-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch
index c5c48909a..fad4eced8 100644
--- a/patches/server/0164-Config-Enderman-aggressiveness-towards-Endermites.patch
+++ b/patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch
@@ -18,7 +18,7 @@ index f815cb228c46b9fa613d831bf748518e89a0772d..478b78c2c293d9f724d98ef3d600f52b
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d7de8a7b89f22974c3045a9c28daf65260e7fc98..24798c3bfd17ba8383720d759050b4c906543f39 100644
+index 39f07342dc272aa4a9727b1fff523b21a68cee43..7229ab7701ca2cfcf9690bfe238cb0d0b29375f9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -971,6 +971,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 96%
rename from patches/server/0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
index f19bee309..74b728347 100644
--- a/patches/server/0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
+++ b/patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
@@ -20,7 +20,7 @@ index 478b78c2c293d9f724d98ef3d600f52bac4890d4..aaee3f187616d78b98f1b0661ff1d891
          } 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 24798c3bfd17ba8383720d759050b4c906543f39..e8d89decde672d92e8346e035537d18cc797c8d6 100644
+index 7229ab7701ca2cfcf9690bfe238cb0d0b29375f9..7bd10666cdd3055d164cb14f32756d321ba462ce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -973,6 +973,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0166-Tick-fluids-config.patch b/patches/server/0165-Tick-fluids-config.patch
similarity index 97%
rename from patches/server/0166-Tick-fluids-config.patch
rename to patches/server/0165-Tick-fluids-config.patch
index d793622f7..a0020719f 100644
--- a/patches/server/0166-Tick-fluids-config.patch
+++ b/patches/server/0165-Tick-fluids-config.patch
@@ -36,7 +36,7 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 819addfb7e9580ce7f95f08153c41cfd1350efef..6787eebe7aa1c928d8af66ce2ba2b569b4bfa300 100644
+index 7bd10666cdd3055d164cb14f32756d321ba462ce..45337e6425d8d7ceb97a6676e16986d62aaf6595 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -414,6 +414,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0167-Config-to-disable-Llama-caravans.patch b/patches/server/0166-Config-to-disable-Llama-caravans.patch
similarity index 97%
rename from patches/server/0167-Config-to-disable-Llama-caravans.patch
rename to patches/server/0166-Config-to-disable-Llama-caravans.patch
index b70131ca0..8b2aee7ca 100644
--- a/patches/server/0167-Config-to-disable-Llama-caravans.patch
+++ b/patches/server/0166-Config-to-disable-Llama-caravans.patch
@@ -32,7 +32,7 @@ index 088bfe0df138ff77ba09aa47e262542b8aaa404b..ddef9b81c20b28cf8d8eebcbe7f4a703
          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 0ad39778c5ec508091e27fbffe1cc85503df8cf5..cf6958e8cce679cb992510da94aaea369051b399 100644
+index 45337e6425d8d7ceb97a6676e16986d62aaf6595..a651d72bfeb1425b13c2c80d6088a506eb4abb1d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1266,6 +1266,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0168-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0167-Config-to-make-Creepers-explode-on-death.patch
similarity index 97%
rename from patches/server/0168-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0167-Config-to-make-Creepers-explode-on-death.patch
index 4c42ebcd0..58829553a 100644
--- a/patches/server/0168-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0167-Config-to-make-Creepers-explode-on-death.patch
@@ -50,7 +50,7 @@ index 10095acd7b5b0b6e4e74192bb3d74ae2091aa75f..a9f3aec907798c0ce9bb684cdea8ab41
  
      private void spawnLingeringCloud() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cf6958e8cce679cb992510da94aaea369051b399..817f6a8e3b301e25d5748d53247478d83616cc1e 100644
+index a651d72bfeb1425b13c2c80d6088a506eb4abb1d..6fd4f5ea8595a88f1ecf96f9212b1b7a7112f2ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -835,6 +835,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0169-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0168-Configurable-ravager-griefable-blocks-list.patch
similarity index 98%
rename from patches/server/0169-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0168-Configurable-ravager-griefable-blocks-list.patch
index 9a306b89c..af03cc3ce 100644
--- a/patches/server/0169-Configurable-ravager-griefable-blocks-list.patch
+++ b/patches/server/0168-Configurable-ravager-griefable-blocks-list.patch
@@ -31,7 +31,7 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 817f6a8e3b301e25d5748d53247478d83616cc1e..b11be182547329bd3e5c03fbd6ca62ae86f1f2a5 100644
+index 6fd4f5ea8595a88f1ecf96f9212b1b7a7112f2ae..8396ecb2d4745ec64b60d8a553116e2296d4f588 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1606,6 +1606,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0170-Sneak-to-bulk-process-composter.patch b/patches/server/0169-Sneak-to-bulk-process-composter.patch
similarity index 96%
rename from patches/server/0170-Sneak-to-bulk-process-composter.patch
rename to patches/server/0169-Sneak-to-bulk-process-composter.patch
index fd1c5239f..24a4bb996 100644
--- a/patches/server/0170-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0169-Sneak-to-bulk-process-composter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8975a806979ac028b916b826e0d051af5e760550..d13a237319c2a581ab9300f16accc722116cba5a 100644
+index 12998d0e9ae0e148a155faa4468b0f78b8462cc9..04d94ae2d314dd24a92a4ddd93b81c7e1f8054ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -582,7 +582,7 @@ public class ServerPlayerGameMode {
@@ -75,7 +75,7 @@ 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 e30ede9fa58b626b04334b7346390498e57fd412..28c943c1632174d4ae2a13039d2eb619a56bc644 100644
+index 8396ecb2d4745ec64b60d8a553116e2296d4f588..981b3f1fa76842a80837b5277fc037a3d8b4d77d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -498,6 +498,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0171-Config-for-skipping-night.patch b/patches/server/0170-Config-for-skipping-night.patch
similarity index 92%
rename from patches/server/0171-Config-for-skipping-night.patch
rename to patches/server/0170-Config-for-skipping-night.patch
index 7b6b43010..3a8cdec8f 100644
--- a/patches/server/0171-Config-for-skipping-night.patch
+++ b/patches/server/0170-Config-for-skipping-night.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 85b3ffb58b06ff6342abdd8948c1607079c4ee8f..40b9ce197be14894610673832752b8759fabd0da 100644
+index 069d98dd18713d7dd306b7a74b62ab7735da0a6a..6d43ad60dd374366d675b52e5b5e958b0cb1e1e2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,7 +18,7 @@ index 85b3ffb58b06ff6342abdd8948c1607079c4ee8f..40b9ce197be14894610673832752b875
              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 28c943c1632174d4ae2a13039d2eb619a56bc644..f20157b4bde76c563593e4d65cee63c49584953f 100644
+index 981b3f1fa76842a80837b5277fc037a3d8b4d77d..bac79479f426d306a93522e602fd8ca2ccf1807f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -312,6 +312,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0172-Add-config-for-villager-trading.patch b/patches/server/0171-Add-config-for-villager-trading.patch
similarity index 97%
rename from patches/server/0172-Add-config-for-villager-trading.patch
rename to patches/server/0171-Add-config-for-villager-trading.patch
index cd6463e75..a28c171e7 100644
--- a/patches/server/0172-Add-config-for-villager-trading.patch
+++ b/patches/server/0171-Add-config-for-villager-trading.patch
@@ -31,7 +31,7 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326
                      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 433e72f93387625efe29db14a808db6078732e82..84b88a27f70e0cea75eadd51c82d90bc2ab003f2 100644
+index bac79479f426d306a93522e602fd8ca2ccf1807f..1421b73469da469d66818733f75f0073b06fa00b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1980,6 +1980,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0173-Allow-infinity-on-crossbows.patch b/patches/server/0172-Allow-infinity-on-crossbows.patch
similarity index 98%
rename from patches/server/0173-Allow-infinity-on-crossbows.patch
rename to patches/server/0172-Allow-infinity-on-crossbows.patch
index a975075a8..701cb688f 100644
--- a/patches/server/0173-Allow-infinity-on-crossbows.patch
+++ b/patches/server/0172-Allow-infinity-on-crossbows.patch
@@ -65,7 +65,7 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
  
      public abstract boolean canEnchant(Item item);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9b688f88e319d59724d923a1e2631879c3104ef4..04d307b09a03f67a3b2fe78be9470a8d3bb0b424 100644
+index 1e09dc436ce147d42035d48918b811eb7e898c12..8223f12a2457cd3dddff4f77e4fba1406e68889e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -272,6 +272,7 @@ public class PurpurConfig {
diff --git a/patches/server/0174-Drowning-Settings.patch b/patches/server/0173-Drowning-Settings.patch
similarity index 97%
rename from patches/server/0174-Drowning-Settings.patch
rename to patches/server/0173-Drowning-Settings.patch
index d0176bc73..f9eab469a 100644
--- a/patches/server/0174-Drowning-Settings.patch
+++ b/patches/server/0173-Drowning-Settings.patch
@@ -49,7 +49,7 @@ index b2dbe65f07ecc25be810f80aaf05d924c998dfac..7980fcfeb6e7a7ec32082cfb2879ff6d
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7aa41a254a4ccc185af997e3d6515187e83f2db4..4d2559ab69df36261034c99669f144cc8385e976 100644
+index 1421b73469da469d66818733f75f0073b06fa00b..5b7ce7a99cf41bae9508564a36394527a87a4372 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -122,6 +122,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0175-Break-individual-slabs-when-sneaking.patch b/patches/server/0174-Break-individual-slabs-when-sneaking.patch
similarity index 97%
rename from patches/server/0175-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0174-Break-individual-slabs-when-sneaking.patch
index 4f4fde5d9..8d5c5c930 100644
--- a/patches/server/0175-Break-individual-slabs-when-sneaking.patch
+++ b/patches/server/0174-Break-individual-slabs-when-sneaking.patch
@@ -47,7 +47,7 @@ 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 4d2559ab69df36261034c99669f144cc8385e976..92af920850b4976eae72572fd9cb118b8a020819 100644
+index 5b7ce7a99cf41bae9508564a36394527a87a4372..4dba41afcc59a2151c01799bcaff1b08820cfb14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -632,6 +632,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0176-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 91%
rename from patches/server/0176-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch
index 4b1d5ae2c..f5c441294 100644
--- a/patches/server/0176-Config-to-disable-hostile-mob-spawn-on-ice.patch
+++ b/patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to disable hostile mob spawn on ice
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899680efc0b 100644
+index 229490d3857ce9f5bba4e6bb4aedcff50b510ed9..e94618f4c1552bb1ef20067aa3201c6574b5c307 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
 @@ -87,6 +87,12 @@ public abstract class Monster extends PathfinderMob implements Enemy {
@@ -22,7 +22,7 @@ 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 6014c801897848f6a5edf133882995bebfe34693..366144207f5891f8caa2a00e213ca6ece439d1d7 100644
+index 4dba41afcc59a2151c01799bcaff1b08820cfb14..daca8b689c2510404f062a35a94c935aa304e6ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -577,8 +577,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0177-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 92%
rename from patches/server/0177-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch
index 471a61c1f..687ccea94 100644
--- a/patches/server/0177-Config-to-show-Armor-Stand-arms-on-spawn.patch
+++ b/patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c13469bdee95 100644
+index aee5db3cdbc49de995780d0b0e219d0878a5f304..31454b15a20e0484e21c25ffb80d4d536e2ecc0b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -114,6 +114,7 @@ public class ArmorStand extends LivingEntity {
@@ -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 366144207f5891f8caa2a00e213ca6ece439d1d7..33dfdbdcdb344851431fb8786796784202e3aff1 100644
+index daca8b689c2510404f062a35a94c935aa304e6ec..09d47cffb5070e99ca941dd88dfc495b17d65ac7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0178-Option-to-make-doors-require-redstone.patch b/patches/server/0177-Option-to-make-doors-require-redstone.patch
similarity index 98%
rename from patches/server/0178-Option-to-make-doors-require-redstone.patch
rename to patches/server/0177-Option-to-make-doors-require-redstone.patch
index 79b23eed5..5cb52559b 100644
--- a/patches/server/0178-Option-to-make-doors-require-redstone.patch
+++ b/patches/server/0177-Option-to-make-doors-require-redstone.patch
@@ -67,7 +67,7 @@ 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 33dfdbdcdb344851431fb8786796784202e3aff1..2e095d14a7fe54774d4046d80dae9cd7a405dc28 100644
+index 09d47cffb5070e99ca941dd88dfc495b17d65ac7..da526812eb623343cd5aea849c4439414a9d6569 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -523,6 +523,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0179-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
similarity index 98%
rename from patches/server/0179-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
index 5c26a9244..52c8214c9 100644
--- a/patches/server/0179-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
@@ -75,7 +75,7 @@ index d1b4fe830170ddee2b6f39eba29e7068e6ae37a3..115f8eb919e90bc4a79db1d0f7875a31
          this.getOrCreateTag().put(key, tag);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 04d307b09a03f67a3b2fe78be9470a8d3bb0b424..53a54fea80099e8e97f17ba3fc2445f02364bb35 100644
+index 8223f12a2457cd3dddff4f77e4fba1406e68889e..6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -273,6 +273,7 @@ public class PurpurConfig {
diff --git a/patches/server/0180-Configurable-sponge-absorption.patch b/patches/server/0179-Configurable-sponge-absorption.patch
similarity index 97%
rename from patches/server/0180-Configurable-sponge-absorption.patch
rename to patches/server/0179-Configurable-sponge-absorption.patch
index 473b5a95c..25948eba3 100644
--- a/patches/server/0180-Configurable-sponge-absorption.patch
+++ b/patches/server/0179-Configurable-sponge-absorption.patch
@@ -43,7 +43,7 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2fe3b219be4f3f49fe9ee28349dddcee92dfa2c9..4b7ac91429de76a61be6de53275115d76213e7a3 100644
+index da526812eb623343cd5aea849c4439414a9d6569..de88b4dc9860c386a2b407bc2703c08958433624 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -658,6 +658,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0181-Projectile-offset-config.patch b/patches/server/0180-Projectile-offset-config.patch
similarity index 99%
rename from patches/server/0181-Projectile-offset-config.patch
rename to patches/server/0180-Projectile-offset-config.patch
index c5b205044..0c8f4bb01 100644
--- a/patches/server/0181-Projectile-offset-config.patch
+++ b/patches/server/0180-Projectile-offset-config.patch
@@ -96,7 +96,7 @@ 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 bd7ce307864ae535024c1fa4621ecbeb04dea9d8..9d187f13fcb0f504f16249d99e872dfd56f8c822 100644
+index de88b4dc9860c386a2b407bc2703c08958433624..9aa4a8f8cca73c2c16052ba12ee421ddaa0b9e2f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -381,6 +381,23 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0182-Config-for-powered-rail-activation-distance.patch b/patches/server/0181-Config-for-powered-rail-activation-distance.patch
similarity index 94%
rename from patches/server/0182-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0181-Config-for-powered-rail-activation-distance.patch
index b88dbb5b6..f9472c6d3 100644
--- a/patches/server/0182-Config-for-powered-rail-activation-distance.patch
+++ b/patches/server/0181-Config-for-powered-rail-activation-distance.patch
@@ -18,7 +18,7 @@ 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 fc864f67a32cea9f52dfaaed6ec539cc9446c2c4..2d63a25e574fde7fe5694e9e49d7cd1602061365 100644
+index 9aa4a8f8cca73c2c16052ba12ee421ddaa0b9e2f..b6e75495e61d2d22224eb6faa5f5bd087b22799f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -670,6 +670,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0183-Piglin-portal-spawn-modifier.patch b/patches/server/0182-Piglin-portal-spawn-modifier.patch
similarity index 96%
rename from patches/server/0183-Piglin-portal-spawn-modifier.patch
rename to patches/server/0182-Piglin-portal-spawn-modifier.patch
index f8e8ce6a5..78ac768ca 100644
--- a/patches/server/0183-Piglin-portal-spawn-modifier.patch
+++ b/patches/server/0182-Piglin-portal-spawn-modifier.patch
@@ -31,7 +31,7 @@ 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 5718fd563eabdcdd8d85375bd31d979961a87c21..af8468fb7ea5327dac2c1aa53c9ba5f3efd92606 100644
+index b6e75495e61d2d22224eb6faa5f5bd087b22799f..f054153986dfc9b1e214b75409a216d60435d8a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1559,6 +1559,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0184-Config-to-change-max-number-of-bees.patch b/patches/server/0183-Config-to-change-max-number-of-bees.patch
similarity index 96%
rename from patches/server/0184-Config-to-change-max-number-of-bees.patch
rename to patches/server/0183-Config-to-change-max-number-of-bees.patch
index adc8a9b50..9fe76d35b 100644
--- a/patches/server/0184-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0183-Config-to-change-max-number-of-bees.patch
@@ -18,7 +18,7 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
      public BeehiveBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 53a54fea80099e8e97f17ba3fc2445f02364bb35..154ba82f0f94150d980e62d9441a5d6d137cee43 100644
+index 6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a..62e741b78c70fd755c0e083bb510d621d0f3802e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -238,6 +238,7 @@ public class PurpurConfig {
diff --git a/patches/server/0185-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch
similarity index 94%
rename from patches/server/0185-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch
index 007cd6d00..3fcaf5206 100644
--- a/patches/server/0185-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ce57f04a3e8395b90a46c50cab0b0cd6ecf8b3c2..8b7732ad47feddaf66f7db998a9ccbecea43d53b 100644
+index 3a010a01c6cfd5307b1856bb9d70e81cabe45a65..d3d6dc230674a4c6f9c388b131e1feb42660d865 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1035,7 +1035,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -31,7 +31,7 @@ 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 f7c285f84bbe635464f96d0045dfd3dcda33180b..262ea71d4b578a42b319939d7eb20b18e5ba4f61 100644
+index f054153986dfc9b1e214b75409a216d60435d8a9..90b87383f5b1e6db87b80148f672300c2bfd8ad0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -637,6 +637,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0186-Config-for-wither-explosion-radius.patch b/patches/server/0185-Config-for-wither-explosion-radius.patch
similarity index 96%
rename from patches/server/0186-Config-for-wither-explosion-radius.patch
rename to patches/server/0185-Config-for-wither-explosion-radius.patch
index d1ca81e6f..8809100ed 100644
--- a/patches/server/0186-Config-for-wither-explosion-radius.patch
+++ b/patches/server/0185-Config-for-wither-explosion-radius.patch
@@ -18,7 +18,7 @@ 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 a3ef14db546b3175938d834c74fb3da6a70199e0..5b62f0bd78c38dfd174c93bf4198c6b28b499aef 100644
+index 90b87383f5b1e6db87b80148f672300c2bfd8ad0..f3a339284d3a8eb9baa856cc969a407e1fc2aac4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2145,6 +2145,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0187-Gamemode-extra-permissions.patch b/patches/server/0186-Gamemode-extra-permissions.patch
similarity index 98%
rename from patches/server/0187-Gamemode-extra-permissions.patch
rename to patches/server/0186-Gamemode-extra-permissions.patch
index 6cb5115d7..e50b614da 100644
--- a/patches/server/0187-Gamemode-extra-permissions.patch
+++ b/patches/server/0186-Gamemode-extra-permissions.patch
@@ -54,7 +54,7 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
  
          for(ServerPlayer serverPlayer : targets) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 154ba82f0f94150d980e62d9441a5d6d137cee43..420a3fb44eb50147d070953b7107517baa4e5df9 100644
+index 62e741b78c70fd755c0e083bb510d621d0f3802e..7c108355943d71531ec7a9a997b10dc6959de09b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -221,6 +221,7 @@ public class PurpurConfig {
diff --git a/patches/server/0188-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 96%
rename from patches/server/0188-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
index 2fd44c1c5..6446df10f 100644
--- a/patches/server/0188-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
+++ b/patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
@@ -18,7 +18,7 @@ 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 4cfe4bb07f995ef52bda097e3247719c605e5de5..df34f0b8cc56004e19c25aadc523b900229f88b1 100644
+index f3a339284d3a8eb9baa856cc969a407e1fc2aac4..d8039612d92e25ac9667e513206db17ccd53b9e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -398,6 +398,21 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0189-Configurable-piston-push-limit.patch b/patches/server/0188-Configurable-piston-push-limit.patch
similarity index 96%
rename from patches/server/0189-Configurable-piston-push-limit.patch
rename to patches/server/0188-Configurable-piston-push-limit.patch
index 776805383..703fc1e26 100644
--- a/patches/server/0189-Configurable-piston-push-limit.patch
+++ b/patches/server/0188-Configurable-piston-push-limit.patch
@@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
                      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f91140cbc05330085228a13a89815705f3e7eeac..69a507c77808cfd892ebe0658ba2fbb3ed526e0a 100644
+index d8039612d92e25ac9667e513206db17ccd53b9e4..23d2d6e34e33ca53f7867e2a301e75dffea74704 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -659,6 +659,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0190-Configurable-broadcast-settings.patch b/patches/server/0189-Configurable-broadcast-settings.patch
similarity index 94%
rename from patches/server/0190-Configurable-broadcast-settings.patch
rename to patches/server/0189-Configurable-broadcast-settings.patch
index 1af1440a9..8b7fd4012 100644
--- a/patches/server/0190-Configurable-broadcast-settings.patch
+++ b/patches/server/0189-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 f83e5b3ee2489b4dd35f856a1262972939eb71cf..b599607d616f9faf209f1a4491dd3fcfd49a6126 100644
+index af22f5b80fd8d7aba8d12d84196a57e8f054fec2..674c6ffbec5874d3581d3d02683d9e5c38bff269 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -881,6 +881,7 @@ public class ServerPlayer extends Player {
@@ -29,7 +29,7 @@ index f83e5b3ee2489b4dd35f856a1262972939eb71cf..b599607d616f9faf209f1a4491dd3fcf
                  if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7e74166e12c114330a99365440d09ee7eb6023dc..ffa8fc634e46e5bbd2f97fb4d1167cacd82b3164 100644
+index 7c108355943d71531ec7a9a997b10dc6959de09b..4d09b8eb877954537abe5ba165a1e35194443341 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -178,6 +178,18 @@ public class PurpurConfig {
diff --git a/patches/server/0191-Fix-SPIGOT-6278.patch b/patches/server/0190-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0191-Fix-SPIGOT-6278.patch
rename to patches/server/0190-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0192-Configurable-mob-blindness.patch b/patches/server/0191-Configurable-mob-blindness.patch
similarity index 93%
rename from patches/server/0192-Configurable-mob-blindness.patch
rename to patches/server/0191-Configurable-mob-blindness.patch
index f406bf25e..3f10fcea0 100644
--- a/patches/server/0192-Configurable-mob-blindness.patch
+++ b/patches/server/0191-Configurable-mob-blindness.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable mob blindness
 Ported from https://github.com/raltsmc/mobblindness
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fe0e0670fce56f96a7d9204ca20a483ad709493a..d1237c85995d3aab5d9a664db6b6ef32fe10b439 100644
+index 7980fcfeb6e7a7ec32082cfb2879ff6d5480d1a2..e1308770c3510f54da40b2ff38d08186bac22518 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -991,6 +991,17 @@ public abstract class LivingEntity extends Entity {
@@ -28,7 +28,7 @@ index fe0e0670fce56f96a7d9204ca20a483ad709493a..d1237c85995d3aab5d9a664db6b6ef32
  
          return d0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7910a07cb6f3d03ced57a4dddbd0e06c457e629e..2aab50eb3e27ffd932960605cfb2016deb1eaad6 100644
+index 23d2d6e34e33ca53f7867e2a301e75dffea74704..5278ac38778ab8fd74baf5b19211477f204b1bb9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -460,6 +460,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0193-Hide-hidden-players-from-entity-selector.patch b/patches/server/0192-Hide-hidden-players-from-entity-selector.patch
similarity index 98%
rename from patches/server/0193-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0192-Hide-hidden-players-from-entity-selector.patch
index 2a6a6b3c0..dc315209d 100644
--- a/patches/server/0193-Hide-hidden-players-from-entity-selector.patch
+++ b/patches/server/0192-Hide-hidden-players-from-entity-selector.patch
@@ -59,7 +59,7 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ae258c4eaa402cc246d7a7052965ce06c58554f0..238a33ff3fc9d70a625fec5c37ec83ccbe05792f 100644
+index 4d09b8eb877954537abe5ba165a1e35194443341..d9a818087f56237e0f31cf801c421ccc8dd6147e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -234,6 +234,7 @@ public class PurpurConfig {
diff --git a/patches/server/0194-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0193-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 96%
rename from patches/server/0194-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0193-Config-for-health-to-impact-Creeper-explosion-radius.patch
index 728db8d6c..0d31f269c 100644
--- a/patches/server/0194-Config-for-health-to-impact-Creeper-explosion-radius.patch
+++ b/patches/server/0193-Config-for-health-to-impact-Creeper-explosion-radius.patch
@@ -21,7 +21,7 @@ index a9f3aec907798c0ce9bb684cdea8ab41323c4772..59531e4e9163f992ed1176fda217acbd
              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 f4ea7af63a72320d9380c7cf8ea9a2570a737b7b..0a103138f31473fdadff6c342f8b9aa22dad81fe 100644
+index 5278ac38778ab8fd74baf5b19211477f204b1bb9..96c3bccbfa80cc1bc0c3dd55416661c27257369b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -931,6 +931,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0195-Iron-golem-poppy-calms-anger.patch b/patches/server/0194-Iron-golem-poppy-calms-anger.patch
similarity index 98%
rename from patches/server/0195-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0194-Iron-golem-poppy-calms-anger.patch
index 4776f0ff0..fb9da5d53 100644
--- a/patches/server/0195-Iron-golem-poppy-calms-anger.patch
+++ b/patches/server/0194-Iron-golem-poppy-calms-anger.patch
@@ -17,7 +17,7 @@ index e327e00506f1b96fe924e52de6c45034ba56ac7a..e19e0c934c2e494a439ba8ec22b238e8
          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 0a103138f31473fdadff6c342f8b9aa22dad81fe..330dd72da29356d299ba74075819c80633c18187 100644
+index 96c3bccbfa80cc1bc0c3dd55416661c27257369b..65992ff2a5fa2cd3e27f940eac1dd6eb8b2d3cf9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1342,6 +1342,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0196-Breedable-parrots.patch b/patches/server/0195-Breedable-parrots.patch
similarity index 97%
rename from patches/server/0196-Breedable-parrots.patch
rename to patches/server/0195-Breedable-parrots.patch
index 5c2626617..d6c1b0e73 100644
--- a/patches/server/0196-Breedable-parrots.patch
+++ b/patches/server/0195-Breedable-parrots.patch
@@ -50,7 +50,7 @@ index 67c72a5b9c786d3240ade51aa48e0e63f0d758cd..bb4449f19319926cbd3ea4961a591669
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 330dd72da29356d299ba74075819c80633c18187..692d12290e3f0ac7fa9f2922a2e58700a26bac23 100644
+index 65992ff2a5fa2cd3e27f940eac1dd6eb8b2d3cf9..37a7e2af2d9967e0c5b33644254ed9528f9d7c31 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1492,6 +1492,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0197-Configurable-powered-rail-boost-modifier.patch b/patches/server/0196-Configurable-powered-rail-boost-modifier.patch
similarity index 96%
rename from patches/server/0197-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0196-Configurable-powered-rail-boost-modifier.patch
index 9a06b2a5e..b78ae9d81 100644
--- a/patches/server/0197-Configurable-powered-rail-boost-modifier.patch
+++ b/patches/server/0196-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 af3aab11f668cc7b0c8749ccb33b5b900066d774..aaa1ee02190ca0910d88f7e729ff88aff693ea18 100644
+index 37a7e2af2d9967e0c5b33644254ed9528f9d7c31..6dc93f87b20bbee2540f2a7842ed6c2a8d2675ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -227,6 +227,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch
similarity index 91%
rename from patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch
index 4ebddb6c3..becaaa0a8 100644
--- a/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config change multiplier critical damage value
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d7a3d2928a63517a1513f5572b121f77979f1b17..d201e3ad325cd6a6cca49ae310a70f36599f99b0 100644
+index 2ac738bfa2fc61150e2cd8ca0c3988aeffeb6427..c6267fa6832596c1c0944cecbbe0e4ed0eb3e0b8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index d7a3d2928a63517a1513f5572b121f77979f1b17..d201e3ad325cd6a6cca49ae310a70f36
  
                      f += f1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aaa1ee02190ca0910d88f7e729ff88aff693ea18..8d38357a0e12ed11970cb8be2cfab5bb7d05ba8c 100644
+index 6dc93f87b20bbee2540f2a7842ed6c2a8d2675ea..9330068639325527fde6d1d3fee17707344f27dc 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 {
diff --git a/patches/server/0199-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0198-Option-to-disable-dragon-egg-teleporting.patch
similarity index 94%
rename from patches/server/0199-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0198-Option-to-disable-dragon-egg-teleporting.patch
index 07ae6509b..a1f686c49 100644
--- a/patches/server/0199-Option-to-disable-dragon-egg-teleporting.patch
+++ b/patches/server/0198-Option-to-disable-dragon-egg-teleporting.patch
@@ -17,7 +17,7 @@ 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 8d38357a0e12ed11970cb8be2cfab5bb7d05ba8c..30c7fcf42c299c4f18c5659f5691a9c80d9dfaa5 100644
+index 9330068639325527fde6d1d3fee17707344f27dc..b9064a5ffa01ec122830fe70aa2be7abdd1a45a6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -571,6 +571,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0200-Config-for-unverified-username-message.patch b/patches/server/0199-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0200-Config-for-unverified-username-message.patch
rename to patches/server/0199-Config-for-unverified-username-message.patch
diff --git a/patches/server/0201-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0200-Make-anvil-cumulative-cost-configurable.patch
similarity index 95%
rename from patches/server/0201-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0200-Make-anvil-cumulative-cost-configurable.patch
index 18250badb..1536d96be 100644
--- a/patches/server/0201-Make-anvil-cumulative-cost-configurable.patch
+++ b/patches/server/0200-Make-anvil-cumulative-cost-configurable.patch
@@ -18,7 +18,7 @@ index bb80328af5051cc01609dfd79b749d9acd2d69ac..9dd5dfc95049de84916bbbd63acb6125
  
      public void setItemName(String newItemName) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6f778d5725b05430598628ff34a7b99a8a400d93..72860c591af31efbdf50b8ce606ef009c62b1610 100644
+index cfce295c9dda1a558b19f8fdf4969c24f0d9f643..197ceea9fa314ebe1d0af4eeeeb4926a79a08954 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -257,6 +257,7 @@ public class PurpurConfig {
diff --git a/patches/server/0202-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0201-ShulkerBox-allow-oversized-stacks.patch
similarity index 97%
rename from patches/server/0202-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0201-ShulkerBox-allow-oversized-stacks.patch
index f33c3eb22..8b7bb7160 100644
--- a/patches/server/0202-ShulkerBox-allow-oversized-stacks.patch
+++ b/patches/server/0201-ShulkerBox-allow-oversized-stacks.patch
@@ -35,7 +35,7 @@ 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 eed0dd192e88b2712d18b5b662f5f3c6e947326b..3bea0aa771d4d12a0f743fa34ce1d580fab17e9c 100644
+index b9064a5ffa01ec122830fe70aa2be7abdd1a45a6..d1c9bcd1216abde2179d3812dd9c3f49a529eab9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -696,6 +696,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0203-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0202-Bee-can-work-when-raining-or-at-night.patch
similarity index 97%
rename from patches/server/0203-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0202-Bee-can-work-when-raining-or-at-night.patch
index b863b1759..8f05bea22 100644
--- a/patches/server/0203-Bee-can-work-when-raining-or-at-night.patch
+++ b/patches/server/0202-Bee-can-work-when-raining-or-at-night.patch
@@ -31,7 +31,7 @@ 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 937f94eb745ad164c77bd8d2be62352eacc7ed81..2c3bab019af32d5b5df98c2007e3b125095b9b43 100644
+index d1c9bcd1216abde2179d3812dd9c3f49a529eab9..84f98b5dd5d9f15c7cc00068f053f31b82d51cdf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -805,6 +805,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch b/patches/server/0203-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0204-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0203-API-for-any-mob-to-burn-daylight.patch
index 8af9c04c5..38231358e 100644
--- a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0203-API-for-any-mob-to-burn-daylight.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8b7732ad47feddaf66f7db998a9ccbecea43d53b..6d425a5eafec8b25ce15fb4c36ea1148f5bd92aa 100644
+index d3d6dc230674a4c6f9c388b131e1feb42660d865..840e60987e4ba4b49088b82e35ecc5a1ddcc29e5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4400,5 +4400,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0204-Fix-advancement-triggers-on-entity-death.patch
similarity index 98%
rename from patches/server/0205-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0204-Fix-advancement-triggers-on-entity-death.patch
index f0f70e877..2efa04f76 100644
--- a/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch
+++ b/patches/server/0204-Fix-advancement-triggers-on-entity-death.patch
@@ -47,7 +47,7 @@ index 214bc2bcbcb88a9a62d2151a62aaa57beadc7da0..6d7a2eece40e5c665d6ec6f21f8a342e
          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 5e62ecb980199f8dba97703403ef811167a24ec5..0f8e261912feac68bdc8119d7368d8719618e787 100644
+index 02a227e1239ca3a1d54d746ea14b6ae7b12d1cd0..74e73e52139445dd2090cfd3abdbf22497a7b4da 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1026,6 +1026,41 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0206-Config-MobEffect-by-world.patch b/patches/server/0205-Config-MobEffect-by-world.patch
similarity index 98%
rename from patches/server/0206-Config-MobEffect-by-world.patch
rename to patches/server/0205-Config-MobEffect-by-world.patch
index 8a9e493ee..268c7c178 100644
--- a/patches/server/0206-Config-MobEffect-by-world.patch
+++ b/patches/server/0205-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 4fa7de97d21c1378a6ab9bc0dbda3ec372cd264d..2aa2d1c63ba3adb367ccb242ea037bfbab3977fe 100644
+index 84f98b5dd5d9f15c7cc00068f053f31b82d51cdf..ff6fee57d36e939f34b9963afb656af31650dc4c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -283,6 +283,21 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0207-Beacon-Activation-Range-Configurable.patch b/patches/server/0206-Beacon-Activation-Range-Configurable.patch
similarity index 96%
rename from patches/server/0207-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0206-Beacon-Activation-Range-Configurable.patch
index fd9074007..3ba5701b1 100644
--- a/patches/server/0207-Beacon-Activation-Range-Configurable.patch
+++ b/patches/server/0206-Beacon-Activation-Range-Configurable.patch
@@ -26,7 +26,7 @@ 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 2aa2d1c63ba3adb367ccb242ea037bfbab3977fe..aa4ce6873753d60f5112a6cbee0140d47072a14b 100644
+index ff6fee57d36e939f34b9963afb656af31650dc4c..143253d4b16cec33359723b65d1b6ae89e13525a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -536,6 +536,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0208-Add-toggle-for-sand-duping-fix.patch b/patches/server/0207-Add-toggle-for-sand-duping-fix.patch
similarity index 95%
rename from patches/server/0208-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0207-Add-toggle-for-sand-duping-fix.patch
index 7aec3bc51..0f99a1b6c 100644
--- a/patches/server/0208-Add-toggle-for-sand-duping-fix.patch
+++ b/patches/server/0207-Add-toggle-for-sand-duping-fix.patch
@@ -27,7 +27,7 @@ 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 94b1cc55220c0fbe1c8fc8e7458fc6438be1f14a..5d4267b0c4f8ceaee80832e91ddd1b0d1de0c52f 100644
+index 143253d4b16cec33359723b65d1b6ae89e13525a..8efb4959efef67e650a1344e299bb01984e884e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -722,6 +722,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0209-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0208-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 94%
rename from patches/server/0209-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0208-Add-toggle-for-end-portal-safe-teleporting.patch
index a9f69214a..dc8b70d2d 100644
--- a/patches/server/0209-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0208-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6d425a5eafec8b25ce15fb4c36ea1148f5bd92aa..b8dcebde55c73b283c13b3d82dd07388dad3eb9d 100644
+index 840e60987e4ba4b49088b82e35ecc5a1ddcc29e5..e0f61b7515d4d6b8ca4b1be29923a268a1c4e6d3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2785,7 +2785,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -45,7 +45,7 @@ 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 5d4267b0c4f8ceaee80832e91ddd1b0d1de0c52f..29723f7f677832ab0b5984f9a1d258821cfa16b1 100644
+index 8efb4959efef67e650a1344e299bb01984e884e4..7ac4ae0d7614bb0e8b6e221fa75a871af9280b21 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -657,6 +657,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0210-Flying-Fall-Damage-API.patch b/patches/server/0209-Flying-Fall-Damage-API.patch
similarity index 91%
rename from patches/server/0210-Flying-Fall-Damage-API.patch
rename to patches/server/0209-Flying-Fall-Damage-API.patch
index 720081ceb..f11e1f72a 100644
--- a/patches/server/0210-Flying-Fall-Damage-API.patch
+++ b/patches/server/0209-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b7e8ba03bd46b257ec97a494c4e7a20d0286a5dd..b0661f7ad41157c5e25ee2d87f9a0efd79039475 100644
+index dc26629d7aa1fc82dbc9902c807312cd814e5465..c1af87a22cfc13998358a71f46c09bed350f4d42 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index b7e8ba03bd46b257ec97a494c4e7a20d0286a5dd..b0661f7ad41157c5e25ee2d87f9a0efd
          } 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 2aab21f43e3c5564d1970be7a98a08e2a68d10a8..282a2ac98e19f4ead2307e464fcfbd258a262324 100644
+index 3368b953b364faf2cde8e242d59fa8c6febc105f..2ab44b6524b9fb9f415092659ea3750b57b4c0c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2636,5 +2636,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0211-Make-lightning-rod-range-configurable.patch b/patches/server/0210-Make-lightning-rod-range-configurable.patch
similarity index 92%
rename from patches/server/0211-Make-lightning-rod-range-configurable.patch
rename to patches/server/0210-Make-lightning-rod-range-configurable.patch
index 2710f7451..36034714b 100644
--- a/patches/server/0211-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0210-Make-lightning-rod-range-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 40b9ce197be14894610673832752b8759fabd0da..30322750466f266eba295d39de30461c02423df9 100644
+index 6d43ad60dd374366d675b52e5b5e958b0cb1e1e2..984dd58c368595157e51c4c843512803bc8dfd02 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1012,7 +1012,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,7 +18,7 @@ index 40b9ce197be14894610673832752b8759fabd0da..30322750466f266eba295d39de30461c
          return optional.map((blockposition1) -> {
              return blockposition1.above(1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 72860c591af31efbdf50b8ce606ef009c62b1610..5a21baed2943fd9e2f472f8548e42067efcbf419 100644
+index 197ceea9fa314ebe1d0af4eeeeb4926a79a08954..942c45e53e3458271bd2e8e2a86e5b31e2de90d3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -258,6 +258,7 @@ public class PurpurConfig {
diff --git a/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 95%
rename from patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch
index 92b4afb50..bd331d8b9 100644
--- a/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch
+++ b/patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b0661f7ad41157c5e25ee2d87f9a0efd79039475..8e81bdbaaf25d4a7e5724260b59fd327d36bc203 100644
+index c1af87a22cfc13998358a71f46c09bed350f4d42..0859225191e3ebc14a8b7ec069e9414d67c6274e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -196,6 +196,8 @@ public abstract class Player extends LivingEntity {
@@ -55,7 +55,7 @@ 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 ec87a6dc34cce3ad98e76ca44af2e61701273b60..6fc8342df3a9512d9889a8e19495d77975572ad8 100644
+index 7ac4ae0d7614bb0e8b6e221fa75a871af9280b21..87d4412a8cb4cac1d112436981d9df7c7314d6de 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -342,6 +342,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0213-Allow-player-join-full-server-by-permission.patch b/patches/server/0212-Allow-player-join-full-server-by-permission.patch
similarity index 93%
rename from patches/server/0213-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0212-Allow-player-join-full-server-by-permission.patch
index 05b26f2e3..16e61fbce 100644
--- a/patches/server/0213-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0212-Allow-player-join-full-server-by-permission.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf016f139895690d5a0e0ef2709e31eaea31649a..eea99b8f6fabae1b0c5c9ef55798173f8ba99f28 100644
+index 22a5cc3ade3cf1431a9d352fa2c30d3234413997..98040579a8ce4ce0e6828840700a3e528e434741 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -764,7 +764,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0214-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0213-Add-permission-bypass-for-portal-waiting.patch
similarity index 94%
rename from patches/server/0214-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0213-Add-permission-bypass-for-portal-waiting.patch
index 9880b45e7..c4fc05d7a 100644
--- a/patches/server/0214-Add-permission-bypass-for-portal-waiting.patch
+++ b/patches/server/0213-Add-permission-bypass-for-portal-waiting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 8e81bdbaaf25d4a7e5724260b59fd327d36bc203..841e21e160f728af12daef1eba8d25e5cd081bda 100644
+index 0859225191e3ebc14a8b7ec069e9414d67c6274e..9dd85be032f07cb67f4f384b6cda2b5735154c91 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0215-Shulker-spawn-from-bullet-options.patch b/patches/server/0214-Shulker-spawn-from-bullet-options.patch
similarity index 98%
rename from patches/server/0215-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0214-Shulker-spawn-from-bullet-options.patch
index 4b7375209..980228849 100644
--- a/patches/server/0215-Shulker-spawn-from-bullet-options.patch
+++ b/patches/server/0214-Shulker-spawn-from-bullet-options.patch
@@ -61,7 +61,7 @@ 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 9dc31d7b6bed1fcb3ebccfd6c5af6887abc0c6f1..ded3fba4787809b05da37867a2f0dce8c468b3bf 100644
+index 87d4412a8cb4cac1d112436981d9df7c7314d6de..297f7c068e0af8c65f7cc33e8731bd595b95bacf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1834,6 +1834,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0216-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0215-Eating-glow-berries-adds-glow-effect.patch
similarity index 97%
rename from patches/server/0216-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0215-Eating-glow-berries-adds-glow-effect.patch
index 5c7365448..7df5debac 100644
--- a/patches/server/0216-Eating-glow-berries-adds-glow-effect.patch
+++ b/patches/server/0215-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 98c09438637429a0fd73e0798d85dd337d1256c9..88cf92082ddd0cf14e740f252680cd1ef585169d 100644
+index 297f7c068e0af8c65f7cc33e8731bd595b95bacf..a4a1befc72efb329d5b6edec620a8a4a8bc92d74 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/0217-Option-to-make-drowned-break-doors.patch b/patches/server/0216-Option-to-make-drowned-break-doors.patch
similarity index 97%
rename from patches/server/0217-Option-to-make-drowned-break-doors.patch
rename to patches/server/0216-Option-to-make-drowned-break-doors.patch
index c35d8ade0..6a818c5d5 100644
--- a/patches/server/0217-Option-to-make-drowned-break-doors.patch
+++ b/patches/server/0216-Option-to-make-drowned-break-doors.patch
@@ -34,7 +34,7 @@ index 766dd7d70ea20c892ee9f084f2eb14c1c7b63451..30117b2b0e5d4c34c9fd1bbeccbd252b
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0808252d9f49e96e5a67fd17eb586a2a8aff765c..1a803c7af778f875a9710b08106cb103f8a422ac 100644
+index a4a1befc72efb329d5b6edec620a8a4a8bc92d74..31ba21490a9e645e679f88e7e801f0b3928d83e9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1065,6 +1065,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0218-Configurable-hunger-starvation-damage.patch b/patches/server/0217-Configurable-hunger-starvation-damage.patch
similarity index 92%
rename from patches/server/0218-Configurable-hunger-starvation-damage.patch
rename to patches/server/0217-Configurable-hunger-starvation-damage.patch
index 77acf1a28..e85cf89c0 100644
--- a/patches/server/0218-Configurable-hunger-starvation-damage.patch
+++ b/patches/server/0217-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 1a803c7af778f875a9710b08106cb103f8a422ac..783f8cd35f2d08a5ea9cd2128f41c33c31b9dd75 100644
+index 31ba21490a9e645e679f88e7e801f0b3928d83e9..07cd83c76b34c6d02dd375292ac5fc3edd5f4491 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2438,4 +2438,9 @@ public class PurpurWorldConfig {
+@@ -2432,4 +2432,9 @@ public class PurpurWorldConfig {
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
      }
diff --git a/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0218-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 98%
rename from patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0218-Redirect-System.out-calls-to-plugin-loggers.patch
index 29838b8b4..2246db184 100644
--- a/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0218-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 9cff21030215ab60a219fa719e8140c0c331a06b..f2e6676cbcf66e3334d5a76a03b1c1e8862504d3 100644
+index 4909f57006af0c8bc69773952e93d5546c3d8cbf..61877f5ba0e54bbf046dabc067c79bf4df588278 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/0220-Armor-click-equip-options.patch b/patches/server/0219-Armor-click-equip-options.patch
similarity index 94%
rename from patches/server/0220-Armor-click-equip-options.patch
rename to patches/server/0219-Armor-click-equip-options.patch
index 2f4846eba..31106603f 100644
--- a/patches/server/0220-Armor-click-equip-options.patch
+++ b/patches/server/0219-Armor-click-equip-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Armor click equip options
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2b2ac97e31dc8742f0294ec065eaf96959df6d34..693c6cbd90cde4d605931c6d80ae8056e260bf34 100644
+index 585e921585529c03756c51550110c796e6f27ea5..a61c0ca02b085d1ab2587d54c9fcdc76a726cc4e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -499,7 +499,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 2b2ac97e31dc8742f0294ec065eaf96959df6d34..693c6cbd90cde4d605931c6d80ae8056
                      if (itemstack1.isDamageableItem() && itemstack1.getDamageValue() != j) {
                          itemstack1.setDamageValue(j);
 diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
-index dba3b8e0671ee63ff077155a8964f3e245740e7e..747bc81aef6e9e8a6d3b4384e30f7e97feefdc6a 100644
+index 043ea496bd04bbf4571ec9d16e5362257b3658c8..dffa24f16b96912c3e539df71b521dd29bd6a165 100644
 --- a/src/main/java/net/minecraft/world/item/ArmorItem.java
 +++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
 @@ -146,7 +146,14 @@ public class ArmorItem extends Item implements Wearable {
@@ -58,7 +58,7 @@ 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 26445a451a18560fdb3c742b1b6b9f8b853bcbb9..9a6938358294ac1bae252ca23f3fdc70450c4df9 100644
+index 07cd83c76b34c6d02dd375292ac5fc3edd5f4491..94162749f3f9b68455ef7ef327dc4d474a19d8a1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -345,6 +345,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0221-Add-uptime-command.patch b/patches/server/0220-Add-uptime-command.patch
similarity index 96%
rename from patches/server/0221-Add-uptime-command.patch
rename to patches/server/0220-Add-uptime-command.patch
index 4525fce8d..4da6a317b 100644
--- a/patches/server/0221-Add-uptime-command.patch
+++ b/patches/server/0220-Add-uptime-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 386e9ad013369633e2be543b9281e5a5fdce9c74..48a70900082c6c2c99c955a6ac40b48859a74979 100644
+index d734addd622f6d429a79df08310bce562db3425e..d298e70100741808d466d7113eb268fb4ccf76e2 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -201,6 +201,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 386e9ad013369633e2be543b9281e5a5fdce9c74..48a70900082c6c2c99c955a6ac40b488
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd4be57611028acde485bc03640e83e07b0bd34f..928c759d30db2d35ea786b3fe0738c42ef3fed80 100644
+index d87f8d7414d630890c33e41e602936068d48abd3..9cf2fc8512a6df0952bf6c534627cd66f47d1e7d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index dd4be57611028acde485bc03640e83e07b0bd34f..928c759d30db2d35ea786b3fe0738c42
      public int autosavePeriod;
      public boolean serverAutoSave = false; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 5a21baed2943fd9e2f472f8548e42067efcbf419..a4df504ae098d27b9843bfdec064694de6d433f9 100644
+index 942c45e53e3458271bd2e8e2a86e5b31e2de90d3..fc6c0717aa13d4bdc28ba1fa2ae5e4a9be87aa18 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/0222-Structure-seed-options.patch b/patches/server/0221-Structure-seed-options.patch
similarity index 96%
rename from patches/server/0222-Structure-seed-options.patch
rename to patches/server/0221-Structure-seed-options.patch
index deda30e7b..0128c7a69 100644
--- a/patches/server/0222-Structure-seed-options.patch
+++ b/patches/server/0221-Structure-seed-options.patch
@@ -27,7 +27,7 @@ index 6a1cb38de5733e384546984a0eadd4bab53c0122..3db79ce2ee0e72fe521beaaf6373a5ff
  
                  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 a4df504ae098d27b9843bfdec064694de6d433f9..c7e87fc17c97e1f8ff5c3aae707a7bb5486fa74b 100644
+index fc6c0717aa13d4bdc28ba1fa2ae5e4a9be87aa18..a68f8efb7ad6de35d9703417cc6d65c7b99efa23 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -194,6 +194,17 @@ public class PurpurConfig {
diff --git a/patches/server/0223-Tool-actionable-options.patch b/patches/server/0222-Tool-actionable-options.patch
similarity index 99%
rename from patches/server/0223-Tool-actionable-options.patch
rename to patches/server/0222-Tool-actionable-options.patch
index 34b3dc656..8daf8a7e6 100644
--- a/patches/server/0223-Tool-actionable-options.patch
+++ b/patches/server/0222-Tool-actionable-options.patch
@@ -109,7 +109,7 @@ 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 9a6938358294ac1bae252ca23f3fdc70450c4df9..692cfd153391dad3780eb79f9f25c069f365dd95 100644
+index 94162749f3f9b68455ef7ef327dc4d474a19d8a1..d9ceea264e37f5cf27380afa2ff7b82ea94fbabb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -472,6 +472,153 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0224-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
similarity index 91%
rename from patches/server/0224-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
rename to patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
index c04f13a59..fb10b61b6 100644
--- a/patches/server/0224-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
+++ b/patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] SPIGOT-5988 Fix bed respawn location not resetting
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index eea99b8f6fabae1b0c5c9ef55798173f8ba99f28..71705517943f62ae85a9298cf484bb7c78438267 100644
+index 98040579a8ce4ce0e6828840700a3e528e434741..7934c65d9282fd7a542896750af7abae483ba0ca 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -902,6 +902,7 @@ public abstract class PlayerList {
@@ -17,7 +17,7 @@ index eea99b8f6fabae1b0c5c9ef55798173f8ba99f28..71705517943f62ae85a9298cf484bb7c
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c7e87fc17c97e1f8ff5c3aae707a7bb5486fa74b..220af6285721db4090dbed3258db73e3c44e5e21 100644
+index a68f8efb7ad6de35d9703417cc6d65c7b99efa23..90599b9022fc1a1e79652f948cdf8ad3a32a2588 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -290,6 +290,7 @@ public class PurpurConfig {
diff --git a/patches/server/0225-Store-placer-on-Block-when-placed.patch b/patches/server/0224-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0225-Store-placer-on-Block-when-placed.patch
rename to patches/server/0224-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0226-Summoner-API.patch b/patches/server/0225-Summoner-API.patch
similarity index 100%
rename from patches/server/0226-Summoner-API.patch
rename to patches/server/0225-Summoner-API.patch
diff --git a/patches/server/0227-Customizable-sleeping-actionbar-messages.patch b/patches/server/0226-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0227-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0226-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0228-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0227-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 92%
rename from patches/server/0228-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0227-option-to-disable-shulker-box-items-from-dropping-co.patch
index e4a2f85c6..94035b613 100644
--- a/patches/server/0228-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0227-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index 6c261b9ddee80139140bd1f091fcdacc3a70c8ef..65917d1438b0f480385e9117ba2a386e990b9a0b 100644
+index 8cb5e91bdf5e0a9cdcef1c3b7a683ab125751f9f..c825363812278a4a88186b49c1d4fb8c9504e70b 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
 @@ -300,7 +300,7 @@ public class BlockItem extends Item {
@@ -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 692cfd153391dad3780eb79f9f25c069f365dd95..0a0ea959bfe246197ed7a0bb353ed0749588e143 100644
+index d9ceea264e37f5cf27380afa2ff7b82ea94fbabb..290a118997a930d307e321234cc2671d1cc94f8c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -175,6 +175,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0229-Silk-touchable-budding-amethyst.patch b/patches/server/0228-Silk-touchable-budding-amethyst.patch
similarity index 95%
rename from patches/server/0229-Silk-touchable-budding-amethyst.patch
rename to patches/server/0228-Silk-touchable-budding-amethyst.patch
index 337270d7b..1fd4b7306 100644
--- a/patches/server/0229-Silk-touchable-budding-amethyst.patch
+++ b/patches/server/0228-Silk-touchable-budding-amethyst.patch
@@ -24,7 +24,7 @@ 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 0a0ea959bfe246197ed7a0bb353ed0749588e143..e1636d10a018d1b89d3ef357b1ad832170524f08 100644
+index 290a118997a930d307e321234cc2671d1cc94f8c..56f6ddc63ed3db366a17a4ebc57d27017f25aa79 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -720,6 +720,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0230-Big-dripleaf-tilt-delay.patch b/patches/server/0229-Big-dripleaf-tilt-delay.patch
similarity index 96%
rename from patches/server/0230-Big-dripleaf-tilt-delay.patch
rename to patches/server/0229-Big-dripleaf-tilt-delay.patch
index 527f206da..31d736353 100644
--- a/patches/server/0230-Big-dripleaf-tilt-delay.patch
+++ b/patches/server/0229-Big-dripleaf-tilt-delay.patch
@@ -24,7 +24,7 @@ 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 e1636d10a018d1b89d3ef357b1ad832170524f08..244a25922d0e4a7bd4929a15249b731a4671d9f3 100644
+index 56f6ddc63ed3db366a17a4ebc57d27017f25aa79..f2411dc94d0c4fbc71b3dd13f0df89a09fbdfef8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -720,6 +720,22 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0231-Player-ridable-in-water-option.patch b/patches/server/0230-Player-ridable-in-water-option.patch
similarity index 92%
rename from patches/server/0231-Player-ridable-in-water-option.patch
rename to patches/server/0230-Player-ridable-in-water-option.patch
index 7ddc37b27..d065be32a 100644
--- a/patches/server/0231-Player-ridable-in-water-option.patch
+++ b/patches/server/0230-Player-ridable-in-water-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player ridable in water option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 841e21e160f728af12daef1eba8d25e5cd081bda..8102ee4cc9f936de20a0cb6875ada524800f28f7 100644
+index 9dd85be032f07cb67f4f384b6cda2b5735154c91..e2be38964e246f48e074a807e96e2d7c37cfad64 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2062,6 +2062,11 @@ public abstract class Player extends LivingEntity {
@@ -21,7 +21,7 @@ index 841e21e160f728af12daef1eba8d25e5cd081bda..8102ee4cc9f936de20a0cb6875ada524
          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 244a25922d0e4a7bd4929a15249b731a4671d9f3..132d897f59ab4cc2d7b5f1775f4fbf415ba7f074 100644
+index f2411dc94d0c4fbc71b3dd13f0df89a09fbdfef8..9897fa9049f6bd7d2d09374292637976a1882036 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 {
diff --git a/patches/server/0232-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 96%
rename from patches/server/0232-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
index be91f75d3..bd1ec8bfa 100644
--- a/patches/server/0232-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
+++ b/patches/server/0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
@@ -18,7 +18,7 @@ index aaee3f187616d78b98f1b0661ff1d891e1a56db0..460cb4e77e9e90260596df5af33aa2a6
              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 f66a8e8abcf3eb1718b4d1851522c0e9eff88426..ae4731a523a38eee1f2ea002af674cb853d1b820 100644
+index 9897fa9049f6bd7d2d09374292637976a1882036..c9bbe0d85b16eb877c18db060c37652040571762 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1312,6 +1312,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0233-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0232-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
similarity index 100%
rename from patches/server/0233-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
rename to patches/server/0232-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
diff --git a/patches/server/0234-Add-compass-command.patch b/patches/server/0233-Add-compass-command.patch
similarity index 97%
rename from patches/server/0234-Add-compass-command.patch
rename to patches/server/0233-Add-compass-command.patch
index ee07cf726..0fedfc6a4 100644
--- a/patches/server/0234-Add-compass-command.patch
+++ b/patches/server/0233-Add-compass-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de73696446 100644
+index d298e70100741808d466d7113eb268fb4ccf76e2..0dde919a6e48664f687181967b8f180f8646b662 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -203,6 +203,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a961987c01a59e6f37c79bac6ecbe94e62fc8721..8f421cc6838455ffdc54614e7020cb510bc4c182 100644
+index 674c6ffbec5874d3581d3d02683d9e5c38bff269..6a6019462c76b92a9f6644b175ea3403b01ad98d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -111,7 +111,7 @@ index 1c27d959bb4caeb6af331f4e240d9ef10454b475..15963a7d4d721f3a8b665c1917cd5f28
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4086b6b30b78caa62f370f616213556e04a8e1fc..bed9d3397aea378274c4d9aa427d07bd8671325c 100644
+index c9bbe0d85b16eb877c18db060c37652040571762..6888c9ff183a869f241a72f36df6f3691897edfc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -176,6 +176,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0235-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0234-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 96%
rename from patches/server/0235-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0234-Config-to-prevent-horses-from-standing-with-riders.patch
index 55390e6ae..83d54d6a8 100644
--- a/patches/server/0235-Config-to-prevent-horses-from-standing-with-riders.patch
+++ b/patches/server/0234-Config-to-prevent-horses-from-standing-with-riders.patch
@@ -20,7 +20,7 @@ index 41bd09ca3cfc722f03d6bf8361f56f8fe0721b87..3f7f8af62aca9825c2475a95a6ae6244
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 18c54adc5b19318916e30d473d817ad87767b099..0c12e83509e8a5bc9fdba8e9f5e1b9ba78cc618c 100644
+index 6888c9ff183a869f241a72f36df6f3691897edfc..c86ecc0d293f0f780e287c29e7383506275eabd5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1510,6 +1510,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0236-Toggle-for-kinetic-damage.patch b/patches/server/0235-Toggle-for-kinetic-damage.patch
similarity index 96%
rename from patches/server/0236-Toggle-for-kinetic-damage.patch
rename to patches/server/0235-Toggle-for-kinetic-damage.patch
index 598d3cbbb..732facffd 100644
--- a/patches/server/0236-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0235-Toggle-for-kinetic-damage.patch
@@ -22,7 +22,7 @@ index 6d7a2eece40e5c665d6ec6f21f8a342e350fbec4..fa3d4b52653398a18105b92e41e0186f
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d0aceb0c113979ba427e4067a4a782d76d82d5a8..631772aad05c3a51c4d76662872bb5cd1d93a7ac 100644
+index c86ecc0d293f0f780e287c29e7383506275eabd5..0f87222f076cb16c4851bb72ef3d8b0b569e9494 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -138,12 +138,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0237-Add-Option-for-disable-observer-clocks.patch b/patches/server/0236-Add-Option-for-disable-observer-clocks.patch
similarity index 95%
rename from patches/server/0237-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0236-Add-Option-for-disable-observer-clocks.patch
index 514315cf9..368e6a889 100644
--- a/patches/server/0237-Add-Option-for-disable-observer-clocks.patch
+++ b/patches/server/0236-Add-Option-for-disable-observer-clocks.patch
@@ -18,7 +18,7 @@ index 101317912b8299f5be406b75c19cfddb30c1f3f3..21f5632bbc58a1c34b85d9fef2408938
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 86d0ff5ca456df5f1d59f26e7bf5201f6ba59cb0..2e44ded2182482894f2320588e66b1aaea0a72d2 100644
+index 0f87222f076cb16c4851bb72ef3d8b0b569e9494..607f4cde4b55503908a4ac11a0b9f0db8db6c947 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -321,6 +321,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0238-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0237-Customizeable-Zombie-Villager-curing-times.patch
similarity index 92%
rename from patches/server/0238-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0237-Customizeable-Zombie-Villager-curing-times.patch
index 54434d599..e53be20d7 100644
--- a/patches/server/0238-Customizeable-Zombie-Villager-curing-times.patch
+++ b/patches/server/0237-Customizeable-Zombie-Villager-curing-times.patch
@@ -18,10 +18,10 @@ index cea87c026130334503ad0d4753f4a8e46669e86c..a320483ef8b72edc40453c9e88bd90bd
  
                  this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 210da3e9b7e8fc6206b2c2e0ba55eda10fefe74e..9f4d9d4dccbbfbdb3dcce729827bc3ad98ffa3a4 100644
+index 607f4cde4b55503908a4ac11a0b9f0db8db6c947..5983666699e458aeb1d787370fac1800b959dee5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2586,6 +2586,8 @@ public class PurpurWorldConfig {
+@@ -2580,6 +2580,8 @@ public class PurpurWorldConfig {
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
      public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index 210da3e9b7e8fc6206b2c2e0ba55eda10fefe74e..9f4d9d4dccbbfbdb3dcce729827bc3ad
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2600,6 +2602,8 @@ public class PurpurWorldConfig {
+@@ -2594,6 +2596,8 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
diff --git a/patches/server/0239-Option-for-sponges-to-work-on-lava.patch b/patches/server/0238-Option-for-sponges-to-work-on-lava.patch
similarity index 95%
rename from patches/server/0239-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0238-Option-for-sponges-to-work-on-lava.patch
index 0b803a062..9dbcf4062 100644
--- a/patches/server/0239-Option-for-sponges-to-work-on-lava.patch
+++ b/patches/server/0238-Option-for-sponges-to-work-on-lava.patch
@@ -18,7 +18,7 @@ index 5b10e1110f938745c8f9ed0b55960566bc720c30..c97fddfc680a9d1934c751e0e87e287d
                          ++i;
                          if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1235d3a61b1a08b332e2d6d17fdc0742e7f1a07b..5044899f567635dd7a0d6f6d64cf8dae806028b2 100644
+index 5983666699e458aeb1d787370fac1800b959dee5..b856613b8085fde1d53ed83a5a5bb46f1a19c1b7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -950,9 +950,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0240-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0239-Toggle-for-Wither-s-spawn-sound.patch
similarity index 96%
rename from patches/server/0240-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0239-Toggle-for-Wither-s-spawn-sound.patch
index 9d39a80d3..a5950a246 100644
--- a/patches/server/0240-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0239-Toggle-for-Wither-s-spawn-sound.patch
@@ -18,7 +18,7 @@ index 8a100e5bf4f40f2fd75fbe5a90cfce499b6f534a..6b75aaca3f22cdf3b6b51db04d6d2ed6
                      // this.world.b(1023, new BlockPosition(this), 0);
                      //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 77d8d4dd79b69e8dd849764ed7e5cb86805a7ada..2d4d6dfeebaff6e5a54e3e9953b5209523b966be 100644
+index b856613b8085fde1d53ed83a5a5bb46f1a19c1b7..213ce168873e865947962787cc1d82f0dfe19b6e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2435,6 +2435,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0241-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0240-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 95%
rename from patches/server/0241-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0240-Cactus-breaks-from-solid-neighbors-config.patch
index 0756f08d5..8c2d517ac 100644
--- a/patches/server/0241-Cactus-breaks-from-solid-neighbors-config.patch
+++ b/patches/server/0240-Cactus-breaks-from-solid-neighbors-config.patch
@@ -18,7 +18,7 @@ index 2a02fdf58640d26b82e0ca22d0d8ff3326921b61..c65ec767363b76aa8e8234037d937423
          return false;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d0b113400f5144da5c1cf441e3256e4c471c2d55..2c9aa1590fa11121f4996da91f2d17fb805dcb75 100644
+index 213ce168873e865947962787cc1d82f0dfe19b6e..a27718df469c94544d8900e9d1cd26ff17b821fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -752,6 +752,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0242-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0241-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 96%
rename from patches/server/0242-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0241-Config-to-remove-curse-of-binding-with-weakness.patch
index d40b4ee88..08fd1ff36 100644
--- a/patches/server/0242-Config-to-remove-curse-of-binding-with-weakness.patch
+++ b/patches/server/0241-Config-to-remove-curse-of-binding-with-weakness.patch
@@ -26,7 +26,7 @@ index 777c21d8f3d5a7e9c156d25263f4b50ad67bd7c7..98cc31b2f318c468d1d2a26b24441bfe
  
                  @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c9aa1590fa11121f4996da91f2d17fb805dcb75..768de1265faf28ed78fe60b8e6b01ec5d4fbf335 100644
+index a27718df469c94544d8900e9d1cd26ff17b821fc..7931b33300e1131b38e332c80c088bfaf688e0ce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -359,6 +359,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0243-Conduit-behavior-configuration.patch b/patches/server/0242-Conduit-behavior-configuration.patch
similarity index 96%
rename from patches/server/0243-Conduit-behavior-configuration.patch
rename to patches/server/0242-Conduit-behavior-configuration.patch
index 77dd05c94..927b83be8 100644
--- a/patches/server/0243-Conduit-behavior-configuration.patch
+++ b/patches/server/0242-Conduit-behavior-configuration.patch
@@ -44,10 +44,10 @@ index fc996199616156d04d6ae06ddc3da8d2c159c771..dd76fe8aa67a9c4142295b72b1c3cb78
              }
              CraftEventFactory.blockDamage = null;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66e0f02aa0e5404795b3d68165091086799ba0a8..66fc9dc62d2a69a944cae699bc62cc687e49ec08 100644
+index 7931b33300e1131b38e332c80c088bfaf688e0ce..2717f0c6344ed0df8ce6132a66e237319df92e4c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2647,4 +2647,27 @@ public class PurpurWorldConfig {
+@@ -2641,4 +2641,27 @@ public class PurpurWorldConfig {
      private void hungerSettings() {
          hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
      }
diff --git a/patches/server/0244-Cauldron-fill-chances.patch b/patches/server/0243-Cauldron-fill-chances.patch
similarity index 92%
rename from patches/server/0244-Cauldron-fill-chances.patch
rename to patches/server/0243-Cauldron-fill-chances.patch
index 41fb7a60b..518552ed7 100644
--- a/patches/server/0244-Cauldron-fill-chances.patch
+++ b/patches/server/0243-Cauldron-fill-chances.patch
@@ -18,10 +18,10 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66fc9dc62d2a69a944cae699bc62cc687e49ec08..447d02a5a32c1133dd14e3a66f905fc1479b2d42 100644
+index 2717f0c6344ed0df8ce6132a66e237319df92e4c..d55a4d9b55bee1a0399bf8d6e6c1e6acd90321fd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2670,4 +2670,11 @@ public class PurpurWorldConfig {
+@@ -2664,4 +2664,11 @@ public class PurpurWorldConfig {
          });
          conduitBlocks = conduitBlockList.toArray(Block[]::new);
      }
diff --git a/patches/server/0245-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0244-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 96%
rename from patches/server/0245-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0244-Config-to-allow-mobs-to-pathfind-over-rails.patch
index 3027abdf6..ce25c48c7 100644
--- a/patches/server/0245-Config-to-allow-mobs-to-pathfind-over-rails.patch
+++ b/patches/server/0244-Config-to-allow-mobs-to-pathfind-over-rails.patch
@@ -18,7 +18,7 @@ index 60605a8a021cc56f9c3ba22bc43c43c302fb1a70..e7dc64c3ef715e3e58d79bb55546a122
                      if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) {
                          double g = (double)(x - direction.getStepX()) + 0.5D;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2cbe45967515555ed2ccad80ceb394b904905f5b..8da13b954557aca5267dfb123b5e7bac3c7bf786 100644
+index d55a4d9b55bee1a0399bf8d6e6c1e6acd90321fd..84f2135fc50e2c3a4f6035e1231ba70bd0e2eac4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -655,6 +655,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0246-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 95%
rename from patches/server/0246-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch
index 07ba3f7fd..53a2fa924 100644
--- a/patches/server/0246-Add-force-and-prompt-parameters-to-resource-pack-api.patch
+++ b/patches/server/0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6f52f6c3bce625cc6a2031b03f04777400fa5f79..bf7209db86c948f40c687149d706a09178aeb404 100644
+index 2ab44b6524b9fb9f415092659ea3750b57b4c0c4..13cd8838d365cad9ac8b6de5757eb1c45b3c2a93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -25,6 +25,8 @@ import java.util.WeakHashMap;
diff --git a/patches/server/0247-Shulker-change-color-with-dye.patch b/patches/server/0246-Shulker-change-color-with-dye.patch
similarity index 97%
rename from patches/server/0247-Shulker-change-color-with-dye.patch
rename to patches/server/0246-Shulker-change-color-with-dye.patch
index 7613990f1..673fd6dc3 100644
--- a/patches/server/0247-Shulker-change-color-with-dye.patch
+++ b/patches/server/0246-Shulker-change-color-with-dye.patch
@@ -47,7 +47,7 @@ index 06c6be23da8d1090aed33f48fc0bbbe442a974b4..ae6e73a34fe0392be05120428716479f
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c39cbf1181dbc6e1fc244821225324c2c856f27c..33a58e5cfbabd8b9deec0c153254b2bdc9149512 100644
+index 84f2135fc50e2c3a4f6035e1231ba70bd0e2eac4..2d39f14fdf2eff4556a4d9e4920f2fd25a2f9d5a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2043,6 +2043,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0248-Extended-OfflinePlayer-API.patch b/patches/server/0247-Extended-OfflinePlayer-API.patch
similarity index 99%
rename from patches/server/0248-Extended-OfflinePlayer-API.patch
rename to patches/server/0247-Extended-OfflinePlayer-API.patch
index 18dd4b64a..299efd95f 100644
--- a/patches/server/0248-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0247-Extended-OfflinePlayer-API.patch
@@ -223,7 +223,7 @@ index b20bfe5ab165bf86985e5ff2f93f415d9710e0e4..830d3163990002c7c1ba0a5a63531fa1
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bf7209db86c948f40c687149d706a09178aeb404..010c5ea04ae1ff2c21e40857b9f8932fb4a45f62 100644
+index 13cd8838d365cad9ac8b6de5757eb1c45b3c2a93..aad35b054114366cbf0ab2e232efb97419142d57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1926,6 +1926,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0249-Added-the-ability-to-add-combustible-items.patch b/patches/server/0248-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0249-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0248-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0250-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 97%
rename from patches/server/0250-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
index 8d027b356..9b54977b4 100644
--- a/patches/server/0250-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
+++ b/patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
@@ -25,7 +25,7 @@ index 74a748f988b08139edc67dcac43686680ebd97aa..056716734eb83bf73e6d5b016d545f2c
          // CraftBukkit start
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6fe474a70c65b30534a7513bdfba60d469cb9081..3bc56add3d0344c710d5cccb1522f855fd1d406c 100644
+index 2d39f14fdf2eff4556a4d9e4920f2fd25a2f9d5a..0b8337e23fe6352a21340d79d64b5c89c5664441 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -656,6 +656,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0251-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 98%
rename from patches/server/0251-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
index b870d79f3..8b8c6465e 100644
--- a/patches/server/0251-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
+++ b/patches/server/0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
@@ -45,7 +45,7 @@ index af4287e2fff8bc920f615ba56f78bd5acdec8721..31f84a7231667b593da8ed6cdada976f
      public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS)));
      public static final Block BIG_DRIPLEAF = register("big_dripleaf", new BigDripleafBlock(BlockBehaviour.Properties.of(Material.PLANT).strength(0.1F).sound(SoundType.BIG_DRIPLEAF)));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 60fba94dded07f01e1c0100697ff3c4f787241e4..52d6819b5840d423510ab889a24016414b7a2cfe 100644
+index 0b8337e23fe6352a21340d79d64b5c89c5664441..dee41edc75353252b2c1dae3dee265ac7396a140 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -712,6 +712,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0252-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0251-Shift-right-click-to-use-exp-for-mending.patch
similarity index 96%
rename from patches/server/0252-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0251-Shift-right-click-to-use-exp-for-mending.patch
index d5c558410..7e1f53e3c 100644
--- a/patches/server/0252-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0251-Shift-right-click-to-use-exp-for-mending.patch
@@ -36,7 +36,7 @@ index a61c0ca02b085d1ab2587d54c9fcdc76a726cc4e..a11a7deefb7fdf7ca9b23f85f5ae5f7c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 11b9ba2bb00a9bb198cd82aca37cd4201c184e66..ddd685d0a0e23e4dcd0cd2e7a9269f431235d3af 100644
+index 27a707c9dfc52a043c98aa39ba9307a71e32a232..306691d449decd3f40a3cbbf9ec9782877da5674 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1931,6 +1931,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -48,7 +48,7 @@ index 11b9ba2bb00a9bb198cd82aca37cd4201c184e66..ddd685d0a0e23e4dcd0cd2e7a9269f43
                  cancelled = event.useItemInHand() == Event.Result.DENY;
              } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 023f02e67026015e683769635d6ca6e7aa46d341..f68121df10d9ec51b4b0defc081cc9ac9dc72cfb 100644
+index dee41edc75353252b2c1dae3dee265ac7396a140..cf94fe5e55cb42f81d96870ce0fcffb3ee0caddb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -360,6 +360,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0253-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0252-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 98%
rename from patches/server/0253-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0252-Dolphins-naturally-aggressive-to-players-chance.patch
index 766235994..f7fc1760f 100644
--- a/patches/server/0253-Dolphins-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0252-Dolphins-naturally-aggressive-to-players-chance.patch
@@ -47,7 +47,7 @@ index cff66ff55b5741d58cecf331444fac87798de4c9..b7cb3db55ddfa5a56c9cd3fa050adfb7
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b00a8883fa7476bbf8c6eb82e6bb7520f9f2e279..1176bf5ed5f3cd770dfaef543c045e42d16ff55d 100644
+index cf94fe5e55cb42f81d96870ce0fcffb3ee0caddb..9bb24aacd36d571e9b12e87c8cf2b78b0891b48d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1226,6 +1226,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0254-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0253-Cows-naturally-aggressive-to-players-chance.patch
similarity index 98%
rename from patches/server/0254-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0253-Cows-naturally-aggressive-to-players-chance.patch
index 84faa5d6a..ccb4be024 100644
--- a/patches/server/0254-Cows-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0253-Cows-naturally-aggressive-to-players-chance.patch
@@ -59,7 +59,7 @@ index 36c06895e270be41ac37a012c9c2444f5968d4c5..7900aa1db625a7f98773a574aac5c87d
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1176bf5ed5f3cd770dfaef543c045e42d16ff55d..4d36b9359b9fa237acaa9d2dab132718ec5f35b1 100644
+index 9bb24aacd36d571e9b12e87c8cf2b78b0891b48d..c182ddd23d3de94deee3f31afee880df3b3726ba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1179,7 +1179,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0254-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 96%
rename from patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0254-Option-for-beds-to-explode-on-villager-sleep.patch
index bf55e180e..42b7339bc 100644
--- a/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch
+++ b/patches/server/0254-Option-for-beds-to-explode-on-villager-sleep.patch
@@ -22,7 +22,7 @@ index 259f220a7ce23ff9b82e5f69889b9def9b682aa3..f21c0ef251f5fd830c72cacba7ce909e
          this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error
          this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4d36b9359b9fa237acaa9d2dab132718ec5f35b1..67e83db043459b03b544d5f03e34ba68b6a82cf7 100644
+index c182ddd23d3de94deee3f31afee880df3b3726ba..c6cb7c1de2eccfea27281d76be336a3e680c5dad 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -731,11 +731,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0256-horses-tempted-by-gold-config.patch b/patches/server/0255-horses-tempted-by-gold-config.patch
similarity index 95%
rename from patches/server/0256-horses-tempted-by-gold-config.patch
rename to patches/server/0255-horses-tempted-by-gold-config.patch
index eb881ed06..589ee1234 100644
--- a/patches/server/0256-horses-tempted-by-gold-config.patch
+++ b/patches/server/0255-horses-tempted-by-gold-config.patch
@@ -17,7 +17,7 @@ index 3f7f8af62aca9825c2475a95a6ae62446cf6ad30..f8de46caf169da91b18c04a8f4c2e65f
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 67e83db043459b03b544d5f03e34ba68b6a82cf7..7d93284fe3372943c077cf5a9225fe7f3f6c8e0e 100644
+index c6cb7c1de2eccfea27281d76be336a3e680c5dad..b8146303d1f079f0a75fde23c6c1be8abbd1ac8c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1558,6 +1558,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0257-llama-tempted-by-hay-config.patch b/patches/server/0256-llama-tempted-by-hay-config.patch
similarity index 96%
rename from patches/server/0257-llama-tempted-by-hay-config.patch
rename to patches/server/0256-llama-tempted-by-hay-config.patch
index 6d93d04c7..8f95567af 100644
--- a/patches/server/0257-llama-tempted-by-hay-config.patch
+++ b/patches/server/0256-llama-tempted-by-hay-config.patch
@@ -17,7 +17,7 @@ index ddef9b81c20b28cf8d8eebcbe7f4a7036ba21dfb..9e72325a05982ae593a6a49f4e4b007c
          this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.7D));
          this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d93284fe3372943c077cf5a9225fe7f3f6c8e0e..88a2edb61fd0911ea5af0537afe741b4d1eadcb3 100644
+index b8146303d1f079f0a75fde23c6c1be8abbd1ac8c..048b6cee3396a0fe09378ee4527f1413b9f0cedd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1659,6 +1659,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0258-Halloween-options-and-optimizations.patch b/patches/server/0257-Halloween-options-and-optimizations.patch
similarity index 98%
rename from patches/server/0258-Halloween-options-and-optimizations.patch
rename to patches/server/0257-Halloween-options-and-optimizations.patch
index ca9805439..0d16f88cc 100644
--- a/patches/server/0258-Halloween-options-and-optimizations.patch
+++ b/patches/server/0257-Halloween-options-and-optimizations.patch
@@ -60,7 +60,7 @@ index 4ccc743cba68f9af2d1663a28bfe94d48e478c97..52820c4f09e5e6f542c8835ea5be7cfb
                  this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 88a2edb61fd0911ea5af0537afe741b4d1eadcb3..672d1b72da721cf74420d0f092a4fa1b75ef7d95 100644
+index 048b6cee3396a0fe09378ee4527f1413b9f0cedd..22fa1209876b2d3856f5de5086ab4f6fc3f676fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1530,6 +1530,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0259-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0258-Config-for-Grindstones-ignoring-curses.patch
similarity index 100%
rename from patches/server/0259-Config-for-Grindstones-ignoring-curses.patch
rename to patches/server/0258-Config-for-Grindstones-ignoring-curses.patch
diff --git a/patches/server/0260-UPnP-Port-Forwarding.patch b/patches/server/0259-UPnP-Port-Forwarding.patch
similarity index 100%
rename from patches/server/0260-UPnP-Port-Forwarding.patch
rename to patches/server/0259-UPnP-Port-Forwarding.patch