From 516b9ad8f3ea0d1cdc5423f58375ded50c38da9b Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Thu, 25 Nov 2021 11:52:45 -0500
Subject: [PATCH] drop some

---
 ...n-change-for-adventure-deprecations.patch} |  0
 ...tment-target-for-bows-and-crossbows.patch} |  0
 ...> 0033-Iron-golem-poppy-calms-anger.patch} |  0
 ...34-API-for-any-mob-to-burn-daylight.patch} |  0
 ...atch => 0035-Flying-Fall-Damage-API.patch} |  0
 ...d-back-player-spawned-endermite-API.patch} |  0
 ... 0037-Fix-default-permission-system.patch} |  0
 ...oner-API.patch => 0038-Summoner-API.patch} |  0
 ...-version-command-output-for-console.patch} |  0
 ...mpt-parameters-to-resource-pack-api.patch} |  0
 ... => 0041-Extended-OfflinePlayer-API.patch} |  0
 ...he-ability-to-add-combustible-items.patch} |  0
 ... => 0139-Farmland-trampling-changes.patch} |  0
 ...0-Movement-options-for-armor-stands.patch} |  2 +-
 ....patch => 0141-Fix-stuck-in-portals.patch} |  4 +-
 ...ggle-for-water-sensitive-mob-damage.patch} |  2 +-
 ...3-Config-to-always-tame-in-Creative.patch} |  0
 ... 0144-End-crystal-explosion-options.patch} |  0
 ...ther-Ender-Dragon-can-ride-vehicles.patch} |  2 +-
 ...atch => 0146-Dont-run-with-scissors.patch} |  0
 ...nch-Man.patch => 0147-One-Punch-Man.patch} |  0
 ...148-Add-config-for-snow-on-blue-ice.patch} |  0
 ...r-Pearl-cooldown-damage-and-Endermi.patch} |  0
 ...to-ignore-nearby-mobs-when-sleeping.patch} |  2 +-
 ...d-back-player-spawned-endermite-API.patch} |  0
 ...n-aggressiveness-towards-Endermites.patch} |  0
 ...Dragon-Head-wearers-and-stare-aggro.patch} |  0
 ...ig.patch => 0154-Tick-fluids-config.patch} |  0
 ...55-Config-to-disable-Llama-caravans.patch} |  0
 ...g-to-make-Creepers-explode-on-death.patch} |  0
 ...rable-ravager-griefable-blocks-list.patch} |  0
 ...158-Sneak-to-bulk-process-composter.patch} |  0
 ...h => 0159-Config-for-skipping-night.patch} |  0
 ...160-Add-config-for-villager-trading.patch} |  0
 ...=> 0161-Allow-infinity-on-crossbows.patch} |  0
 ...ngs.patch => 0162-Drowning-Settings.patch} |  2 +-
 ...reak-individual-slabs-when-sneaking.patch} |  0
 ...to-disable-hostile-mob-spawn-on-ice.patch} |  0
 ...g-to-show-Armor-Stand-arms-on-spawn.patch} |  0
 ...tion-to-make-doors-require-redstone.patch} |  0
 ...Config-to-allow-for-unsafe-enchants.patch} |  0
 ...0168-Configurable-sponge-absorption.patch} |  0
 ...ch => 0169-Projectile-offset-config.patch} |  0
 ...or-powered-rail-activation-distance.patch} |  0
 ...> 0171-Piglin-portal-spawn-modifier.patch} |  0
 ...Config-to-change-max-number-of-bees.patch} |  0
 ...le-damage-settings-for-magma-blocks.patch} |  2 +-
 ...-Config-for-wither-explosion-radius.patch} |  0
 ... => 0175-Gamemode-extra-permissions.patch} |  0
 ...ng-the-blocks-that-turn-into-dirt-p.patch} |  0
 ...0177-Configurable-piston-push-limit.patch} |  0
 ...178-Configurable-broadcast-settings.patch} |  2 +-
 ...-6278.patch => 0179-Fix-SPIGOT-6278.patch} |  0
 ... => 0180-Configurable-mob-blindness.patch} |  0
 ...hidden-players-from-entity-selector.patch} |  0
 ...-to-impact-Creeper-explosion-radius.patch} |  0
 ...> 0183-Iron-golem-poppy-calms-anger.patch} |  0
 ...ots.patch => 0184-Breedable-parrots.patch} |  0
 ...gurable-powered-rail-boost-modifier.patch} |  0
 ...ge-multiplier-critical-damage-value.patch} |  0
 ...n-to-disable-dragon-egg-teleporting.patch} |  0
 ...fig-for-unverified-username-message.patch} |  0
 ...-anvil-cumulative-cost-configurable.patch} |  0
 ...0-ShulkerBox-allow-oversized-stacks.patch} |  0
 ...e-can-work-when-raining-or-at-night.patch} |  0
 ...92-API-for-any-mob-to-burn-daylight.patch} |  2 +-
 ...dvancement-triggers-on-entity-death.patch} |  0
 ...h => 0194-Config-MobEffect-by-world.patch} |  0
 ...eacon-Activation-Range-Configurable.patch} |  0
 ...0196-Add-toggle-for-sand-duping-fix.patch} |  0
 ...gle-for-end-portal-safe-teleporting.patch} |  2 +-
 ...atch => 0198-Flying-Fall-Damage-API.patch} |  0
 ...ke-lightning-rod-range-configurable.patch} |  0
 ...ng-food-fills-hunger-bar-completely.patch} |  0
 ...ayer-join-full-server-by-permission.patch} |  0
 ...ermission-bypass-for-portal-waiting.patch} |  0
 ...3-Shulker-spawn-from-bullet-options.patch} |  0
 ...ating-glow-berries-adds-glow-effect.patch} |  0
 ...-Option-to-make-drowned-break-doors.patch} |  0
 ...nfigurable-hunger-starvation-damage.patch} |  0
 ...-System.out-calls-to-plugin-loggers.patch} |  0
 ...h => 0208-Armor-click-equip-options.patch} |  0
 ...nd.patch => 0209-Add-uptime-command.patch} |  0
 ...atch => 0210-Structure-seed-options.patch} |  4 +-
 ...tch => 0211-Tool-actionable-options.patch} |  0
 ...2-Store-placer-on-Block-when-placed.patch} |  0
 ...oner-API.patch => 0213-Summoner-API.patch} |  2 +-
 ...mizable-sleeping-actionbar-messages.patch} |  0
 ...-shulker-box-items-from-dropping-co.patch} |  0
 ...216-Silk-touchable-budding-amethyst.patch} |  0
 ...tch => 0217-Big-dripleaf-tilt-delay.patch} |  0
 ...0218-Player-ridable-in-water-option.patch} |  0
 ...-Enderman-teleport-on-projectile-hi.patch} |  0
 ...d.patch => 0220-Add-compass-command.patch} |  2 +-
 ...nt-horses-from-standing-with-riders.patch} |  0
 ...h => 0222-Toggle-for-kinetic-damage.patch} |  0
 ...-Option-for-disable-observer-clocks.patch} |  0
 ...zeable-Zombie-Villager-curing-times.patch} |  0
 ...-Option-for-sponges-to-work-on-lava.patch} |  0
 ...226-Toggle-for-Wither-s-spawn-sound.patch} |  2 +-
 ...-breaks-from-solid-neighbors-config.patch} |  0
 ...move-curse-of-binding-with-weakness.patch} |  0
 ...0229-Conduit-behavior-configuration.patch} |  0
 ...patch => 0230-Cauldron-fill-chances.patch} |  0
 ...o-allow-mobs-to-pathfind-over-rails.patch} |  0
 ...mpt-parameters-to-resource-pack-api.patch} |  0
 ... 0233-Shulker-change-color-with-dye.patch} |  0
 ... => 0234-Extended-OfflinePlayer-API.patch} |  0
 ...he-ability-to-add-combustible-items.patch} |  0
 ...in-and-thunder-should-stop-on-sleep.patch} |  0
 ...-blocks-to-grow-into-trees-naturall.patch} |  0
 ...-right-click-to-use-exp-for-mending.patch} |  0
 ...urally-aggressive-to-players-chance.patch} |  0
 ...urally-aggressive-to-players-chance.patch} |  0
 ...r-beds-to-explode-on-villager-sleep.patch} |  0
 ...Halloween-options-and-optimizations.patch} |  2 +-
 ...fig-for-Grindstones-ignoring-curses.patch} |  0
 .../0243-horses-tempted-by-gold-config.patch  | 38 ------------------
 ....patch => 0244-UPnP-Port-Forwarding.patch} |  0
 .../0244-llama-tempted-by-hay-config.patch    | 39 -------------------
 ...Campfire-option-for-lit-when-placed.patch} |  2 +-
 ...tinguish-fire-blocks-with-snowballs.patch} |  2 +-
 ...on-to-disable-zombie-villagers-cure.patch} |  6 +--
 123 files changed, 22 insertions(+), 99 deletions(-)
 rename patches/api/{0032-Conflict-on-change-for-adventure-deprecations.patch => 0031-Conflict-on-change-for-adventure-deprecations.patch} (100%)
 rename patches/api/{0033-Add-enchantment-target-for-bows-and-crossbows.patch => 0032-Add-enchantment-target-for-bows-and-crossbows.patch} (100%)
 rename patches/api/{0034-Iron-golem-poppy-calms-anger.patch => 0033-Iron-golem-poppy-calms-anger.patch} (100%)
 rename patches/api/{0035-API-for-any-mob-to-burn-daylight.patch => 0034-API-for-any-mob-to-burn-daylight.patch} (100%)
 rename patches/api/{0036-Flying-Fall-Damage-API.patch => 0035-Flying-Fall-Damage-API.patch} (100%)
 rename patches/api/{0037-Add-back-player-spawned-endermite-API.patch => 0036-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/api/{0038-Fix-default-permission-system.patch => 0037-Fix-default-permission-system.patch} (100%)
 rename patches/api/{0039-Summoner-API.patch => 0038-Summoner-API.patch} (100%)
 rename patches/api/{0040-Clean-up-version-command-output-for-console.patch => 0039-Clean-up-version-command-output-for-console.patch} (100%)
 rename patches/api/{0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (100%)
 rename patches/api/{0042-Extended-OfflinePlayer-API.patch => 0041-Extended-OfflinePlayer-API.patch} (100%)
 rename patches/api/{0043-Added-the-ability-to-add-combustible-items.patch => 0042-Added-the-ability-to-add-combustible-items.patch} (100%)
 rename patches/server/{0140-Farmland-trampling-changes.patch => 0139-Farmland-trampling-changes.patch} (100%)
 rename patches/server/{0141-Movement-options-for-armor-stands.patch => 0140-Movement-options-for-armor-stands.patch} (98%)
 rename patches/server/{0142-Fix-stuck-in-portals.patch => 0141-Fix-stuck-in-portals.patch} (94%)
 rename patches/server/{0143-Toggle-for-water-sensitive-mob-damage.patch => 0142-Toggle-for-water-sensitive-mob-damage.patch} (99%)
 rename patches/server/{0144-Config-to-always-tame-in-Creative.patch => 0143-Config-to-always-tame-in-Creative.patch} (100%)
 rename patches/server/{0145-End-crystal-explosion-options.patch => 0144-End-crystal-explosion-options.patch} (100%)
 rename patches/server/{0146-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (97%)
 rename patches/server/{0147-Dont-run-with-scissors.patch => 0146-Dont-run-with-scissors.patch} (100%)
 rename patches/server/{0148-One-Punch-Man.patch => 0147-One-Punch-Man.patch} (100%)
 rename patches/server/{0149-Add-config-for-snow-on-blue-ice.patch => 0148-Add-config-for-snow-on-blue-ice.patch} (100%)
 rename patches/server/{0150-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (100%)
 rename patches/server/{0151-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0150-Config-to-ignore-nearby-mobs-when-sleeping.patch} (96%)
 rename patches/server/{0152-Add-back-player-spawned-endermite-API.patch => 0151-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/server/{0153-Config-Enderman-aggressiveness-towards-Endermites.patch => 0152-Config-Enderman-aggressiveness-towards-Endermites.patch} (100%)
 rename patches/server/{0154-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (100%)
 rename patches/server/{0155-Tick-fluids-config.patch => 0154-Tick-fluids-config.patch} (100%)
 rename patches/server/{0156-Config-to-disable-Llama-caravans.patch => 0155-Config-to-disable-Llama-caravans.patch} (100%)
 rename patches/server/{0157-Config-to-make-Creepers-explode-on-death.patch => 0156-Config-to-make-Creepers-explode-on-death.patch} (100%)
 rename patches/server/{0158-Configurable-ravager-griefable-blocks-list.patch => 0157-Configurable-ravager-griefable-blocks-list.patch} (100%)
 rename patches/server/{0159-Sneak-to-bulk-process-composter.patch => 0158-Sneak-to-bulk-process-composter.patch} (100%)
 rename patches/server/{0160-Config-for-skipping-night.patch => 0159-Config-for-skipping-night.patch} (100%)
 rename patches/server/{0161-Add-config-for-villager-trading.patch => 0160-Add-config-for-villager-trading.patch} (100%)
 rename patches/server/{0162-Allow-infinity-on-crossbows.patch => 0161-Allow-infinity-on-crossbows.patch} (100%)
 rename patches/server/{0163-Drowning-Settings.patch => 0162-Drowning-Settings.patch} (97%)
 rename patches/server/{0164-Break-individual-slabs-when-sneaking.patch => 0163-Break-individual-slabs-when-sneaking.patch} (100%)
 rename patches/server/{0165-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0164-Config-to-disable-hostile-mob-spawn-on-ice.patch} (100%)
 rename patches/server/{0166-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0165-Config-to-show-Armor-Stand-arms-on-spawn.patch} (100%)
 rename patches/server/{0167-Option-to-make-doors-require-redstone.patch => 0166-Option-to-make-doors-require-redstone.patch} (100%)
 rename patches/server/{0168-Config-to-allow-for-unsafe-enchants.patch => 0167-Config-to-allow-for-unsafe-enchants.patch} (100%)
 rename patches/server/{0169-Configurable-sponge-absorption.patch => 0168-Configurable-sponge-absorption.patch} (100%)
 rename patches/server/{0170-Projectile-offset-config.patch => 0169-Projectile-offset-config.patch} (100%)
 rename patches/server/{0171-Config-for-powered-rail-activation-distance.patch => 0170-Config-for-powered-rail-activation-distance.patch} (100%)
 rename patches/server/{0172-Piglin-portal-spawn-modifier.patch => 0171-Piglin-portal-spawn-modifier.patch} (100%)
 rename patches/server/{0173-Config-to-change-max-number-of-bees.patch => 0172-Config-to-change-max-number-of-bees.patch} (100%)
 rename patches/server/{0174-Configurable-damage-settings-for-magma-blocks.patch => 0173-Configurable-damage-settings-for-magma-blocks.patch} (97%)
 rename patches/server/{0175-Config-for-wither-explosion-radius.patch => 0174-Config-for-wither-explosion-radius.patch} (100%)
 rename patches/server/{0176-Gamemode-extra-permissions.patch => 0175-Gamemode-extra-permissions.patch} (100%)
 rename patches/server/{0177-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (100%)
 rename patches/server/{0178-Configurable-piston-push-limit.patch => 0177-Configurable-piston-push-limit.patch} (100%)
 rename patches/server/{0179-Configurable-broadcast-settings.patch => 0178-Configurable-broadcast-settings.patch} (97%)
 rename patches/server/{0180-Fix-SPIGOT-6278.patch => 0179-Fix-SPIGOT-6278.patch} (100%)
 rename patches/server/{0181-Configurable-mob-blindness.patch => 0180-Configurable-mob-blindness.patch} (100%)
 rename patches/server/{0182-Hide-hidden-players-from-entity-selector.patch => 0181-Hide-hidden-players-from-entity-selector.patch} (100%)
 rename patches/server/{0183-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0182-Config-for-health-to-impact-Creeper-explosion-radius.patch} (100%)
 rename patches/server/{0184-Iron-golem-poppy-calms-anger.patch => 0183-Iron-golem-poppy-calms-anger.patch} (100%)
 rename patches/server/{0185-Breedable-parrots.patch => 0184-Breedable-parrots.patch} (100%)
 rename patches/server/{0186-Configurable-powered-rail-boost-modifier.patch => 0185-Configurable-powered-rail-boost-modifier.patch} (100%)
 rename patches/server/{0187-Add-config-change-multiplier-critical-damage-value.patch => 0186-Add-config-change-multiplier-critical-damage-value.patch} (100%)
 rename patches/server/{0188-Option-to-disable-dragon-egg-teleporting.patch => 0187-Option-to-disable-dragon-egg-teleporting.patch} (100%)
 rename patches/server/{0189-Config-for-unverified-username-message.patch => 0188-Config-for-unverified-username-message.patch} (100%)
 rename patches/server/{0190-Make-anvil-cumulative-cost-configurable.patch => 0189-Make-anvil-cumulative-cost-configurable.patch} (100%)
 rename patches/server/{0191-ShulkerBox-allow-oversized-stacks.patch => 0190-ShulkerBox-allow-oversized-stacks.patch} (100%)
 rename patches/server/{0192-Bee-can-work-when-raining-or-at-night.patch => 0191-Bee-can-work-when-raining-or-at-night.patch} (100%)
 rename patches/server/{0193-API-for-any-mob-to-burn-daylight.patch => 0192-API-for-any-mob-to-burn-daylight.patch} (99%)
 rename patches/server/{0194-Fix-advancement-triggers-on-entity-death.patch => 0193-Fix-advancement-triggers-on-entity-death.patch} (100%)
 rename patches/server/{0195-Config-MobEffect-by-world.patch => 0194-Config-MobEffect-by-world.patch} (100%)
 rename patches/server/{0196-Beacon-Activation-Range-Configurable.patch => 0195-Beacon-Activation-Range-Configurable.patch} (100%)
 rename patches/server/{0197-Add-toggle-for-sand-duping-fix.patch => 0196-Add-toggle-for-sand-duping-fix.patch} (100%)
 rename patches/server/{0198-Add-toggle-for-end-portal-safe-teleporting.patch => 0197-Add-toggle-for-end-portal-safe-teleporting.patch} (97%)
 rename patches/server/{0199-Flying-Fall-Damage-API.patch => 0198-Flying-Fall-Damage-API.patch} (100%)
 rename patches/server/{0200-Make-lightning-rod-range-configurable.patch => 0199-Make-lightning-rod-range-configurable.patch} (100%)
 rename patches/server/{0201-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0200-Burp-after-eating-food-fills-hunger-bar-completely.patch} (100%)
 rename patches/server/{0202-Allow-player-join-full-server-by-permission.patch => 0201-Allow-player-join-full-server-by-permission.patch} (100%)
 rename patches/server/{0203-Add-permission-bypass-for-portal-waiting.patch => 0202-Add-permission-bypass-for-portal-waiting.patch} (100%)
 rename patches/server/{0204-Shulker-spawn-from-bullet-options.patch => 0203-Shulker-spawn-from-bullet-options.patch} (100%)
 rename patches/server/{0205-Eating-glow-berries-adds-glow-effect.patch => 0204-Eating-glow-berries-adds-glow-effect.patch} (100%)
 rename patches/server/{0206-Option-to-make-drowned-break-doors.patch => 0205-Option-to-make-drowned-break-doors.patch} (100%)
 rename patches/server/{0207-Configurable-hunger-starvation-damage.patch => 0206-Configurable-hunger-starvation-damage.patch} (100%)
 rename patches/server/{0208-Redirect-System.out-calls-to-plugin-loggers.patch => 0207-Redirect-System.out-calls-to-plugin-loggers.patch} (100%)
 rename patches/server/{0209-Armor-click-equip-options.patch => 0208-Armor-click-equip-options.patch} (100%)
 rename patches/server/{0210-Add-uptime-command.patch => 0209-Add-uptime-command.patch} (100%)
 rename patches/server/{0211-Structure-seed-options.patch => 0210-Structure-seed-options.patch} (95%)
 rename patches/server/{0212-Tool-actionable-options.patch => 0211-Tool-actionable-options.patch} (100%)
 rename patches/server/{0213-Store-placer-on-Block-when-placed.patch => 0212-Store-placer-on-Block-when-placed.patch} (100%)
 rename patches/server/{0214-Summoner-API.patch => 0213-Summoner-API.patch} (99%)
 rename patches/server/{0215-Customizable-sleeping-actionbar-messages.patch => 0214-Customizable-sleeping-actionbar-messages.patch} (100%)
 rename patches/server/{0216-option-to-disable-shulker-box-items-from-dropping-co.patch => 0215-option-to-disable-shulker-box-items-from-dropping-co.patch} (100%)
 rename patches/server/{0217-Silk-touchable-budding-amethyst.patch => 0216-Silk-touchable-budding-amethyst.patch} (100%)
 rename patches/server/{0218-Big-dripleaf-tilt-delay.patch => 0217-Big-dripleaf-tilt-delay.patch} (100%)
 rename patches/server/{0219-Player-ridable-in-water-option.patch => 0218-Player-ridable-in-water-option.patch} (100%)
 rename patches/server/{0220-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (100%)
 rename patches/server/{0221-Add-compass-command.patch => 0220-Add-compass-command.patch} (99%)
 rename patches/server/{0222-Config-to-prevent-horses-from-standing-with-riders.patch => 0221-Config-to-prevent-horses-from-standing-with-riders.patch} (100%)
 rename patches/server/{0223-Toggle-for-kinetic-damage.patch => 0222-Toggle-for-kinetic-damage.patch} (100%)
 rename patches/server/{0224-Add-Option-for-disable-observer-clocks.patch => 0223-Add-Option-for-disable-observer-clocks.patch} (100%)
 rename patches/server/{0225-Customizeable-Zombie-Villager-curing-times.patch => 0224-Customizeable-Zombie-Villager-curing-times.patch} (100%)
 rename patches/server/{0226-Option-for-sponges-to-work-on-lava.patch => 0225-Option-for-sponges-to-work-on-lava.patch} (100%)
 rename patches/server/{0227-Toggle-for-Wither-s-spawn-sound.patch => 0226-Toggle-for-Wither-s-spawn-sound.patch} (96%)
 rename patches/server/{0228-Cactus-breaks-from-solid-neighbors-config.patch => 0227-Cactus-breaks-from-solid-neighbors-config.patch} (100%)
 rename patches/server/{0229-Config-to-remove-curse-of-binding-with-weakness.patch => 0228-Config-to-remove-curse-of-binding-with-weakness.patch} (100%)
 rename patches/server/{0230-Conduit-behavior-configuration.patch => 0229-Conduit-behavior-configuration.patch} (100%)
 rename patches/server/{0231-Cauldron-fill-chances.patch => 0230-Cauldron-fill-chances.patch} (100%)
 rename patches/server/{0232-Config-to-allow-mobs-to-pathfind-over-rails.patch => 0231-Config-to-allow-mobs-to-pathfind-over-rails.patch} (100%)
 rename patches/server/{0233-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (100%)
 rename patches/server/{0234-Shulker-change-color-with-dye.patch => 0233-Shulker-change-color-with-dye.patch} (100%)
 rename patches/server/{0235-Extended-OfflinePlayer-API.patch => 0234-Extended-OfflinePlayer-API.patch} (100%)
 rename patches/server/{0236-Added-the-ability-to-add-combustible-items.patch => 0235-Added-the-ability-to-add-combustible-items.patch} (100%)
 rename patches/server/{0237-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch => 0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch} (100%)
 rename patches/server/{0238-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch => 0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch} (100%)
 rename patches/server/{0239-Shift-right-click-to-use-exp-for-mending.patch => 0238-Shift-right-click-to-use-exp-for-mending.patch} (100%)
 rename patches/server/{0240-Dolphins-naturally-aggressive-to-players-chance.patch => 0239-Dolphins-naturally-aggressive-to-players-chance.patch} (100%)
 rename patches/server/{0241-Cows-naturally-aggressive-to-players-chance.patch => 0240-Cows-naturally-aggressive-to-players-chance.patch} (100%)
 rename patches/server/{0242-Option-for-beds-to-explode-on-villager-sleep.patch => 0241-Option-for-beds-to-explode-on-villager-sleep.patch} (100%)
 rename patches/server/{0245-Halloween-options-and-optimizations.patch => 0242-Halloween-options-and-optimizations.patch} (98%)
 rename patches/server/{0246-Config-for-Grindstones-ignoring-curses.patch => 0243-Config-for-Grindstones-ignoring-curses.patch} (100%)
 delete mode 100644 patches/server/0243-horses-tempted-by-gold-config.patch
 rename patches/server/{0247-UPnP-Port-Forwarding.patch => 0244-UPnP-Port-Forwarding.patch} (100%)
 delete mode 100644 patches/server/0244-llama-tempted-by-hay-config.patch
 rename patches/server/{0248-Campfire-option-for-lit-when-placed.patch => 0245-Campfire-option-for-lit-when-placed.patch} (96%)
 rename patches/server/{0249-options-to-extinguish-fire-blocks-with-snowballs.patch => 0246-options-to-extinguish-fire-blocks-with-snowballs.patch} (98%)
 rename patches/server/{0250-Add-option-to-disable-zombie-villagers-cure.patch => 0247-Add-option-to-disable-zombie-villagers-cure.patch} (92%)

diff --git a/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
similarity index 100%
rename from patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch
rename to patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
diff --git a/patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch
similarity index 100%
rename from patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch
rename to patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch
diff --git a/patches/api/0034-Iron-golem-poppy-calms-anger.patch b/patches/api/0033-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/api/0034-Iron-golem-poppy-calms-anger.patch
rename to patches/api/0033-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/api/0035-API-for-any-mob-to-burn-daylight.patch b/patches/api/0034-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from patches/api/0035-API-for-any-mob-to-burn-daylight.patch
rename to patches/api/0034-API-for-any-mob-to-burn-daylight.patch
diff --git a/patches/api/0036-Flying-Fall-Damage-API.patch b/patches/api/0035-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/api/0036-Flying-Fall-Damage-API.patch
rename to patches/api/0035-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0037-Add-back-player-spawned-endermite-API.patch b/patches/api/0036-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/api/0037-Add-back-player-spawned-endermite-API.patch
rename to patches/api/0036-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/api/0038-Fix-default-permission-system.patch b/patches/api/0037-Fix-default-permission-system.patch
similarity index 100%
rename from patches/api/0038-Fix-default-permission-system.patch
rename to patches/api/0037-Fix-default-permission-system.patch
diff --git a/patches/api/0039-Summoner-API.patch b/patches/api/0038-Summoner-API.patch
similarity index 100%
rename from patches/api/0039-Summoner-API.patch
rename to patches/api/0038-Summoner-API.patch
diff --git a/patches/api/0040-Clean-up-version-command-output-for-console.patch b/patches/api/0039-Clean-up-version-command-output-for-console.patch
similarity index 100%
rename from patches/api/0040-Clean-up-version-command-output-for-console.patch
rename to patches/api/0039-Clean-up-version-command-output-for-console.patch
diff --git a/patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/api/0042-Extended-OfflinePlayer-API.patch b/patches/api/0041-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/api/0042-Extended-OfflinePlayer-API.patch
rename to patches/api/0041-Extended-OfflinePlayer-API.patch
diff --git a/patches/api/0043-Added-the-ability-to-add-combustible-items.patch b/patches/api/0042-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/api/0043-Added-the-ability-to-add-combustible-items.patch
rename to patches/api/0042-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0140-Farmland-trampling-changes.patch b/patches/server/0139-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0140-Farmland-trampling-changes.patch
rename to patches/server/0139-Farmland-trampling-changes.patch
diff --git a/patches/server/0141-Movement-options-for-armor-stands.patch b/patches/server/0140-Movement-options-for-armor-stands.patch
similarity index 98%
rename from patches/server/0141-Movement-options-for-armor-stands.patch
rename to patches/server/0140-Movement-options-for-armor-stands.patch
index 7be4806be..fcb0ded3d 100644
--- a/patches/server/0141-Movement-options-for-armor-stands.patch
+++ b/patches/server/0140-Movement-options-for-armor-stands.patch
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8766be89f7bc2f3ce427d4ec428d1fa65a10d995..47067ff24923002f9083022cbec4a90896ce3012 100644
+index 1d5ab54742ee9818ffd8cf1687e89269f449e6c4..1428e4f1aa8262ff33c789c419451ecef192116f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1502,7 +1502,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0142-Fix-stuck-in-portals.patch b/patches/server/0141-Fix-stuck-in-portals.patch
similarity index 94%
rename from patches/server/0142-Fix-stuck-in-portals.patch
rename to patches/server/0141-Fix-stuck-in-portals.patch
index 670bd3e65..0b0e51eed 100644
--- a/patches/server/0142-Fix-stuck-in-portals.patch
+++ b/patches/server/0141-Fix-stuck-in-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 244440eb9d4e85cb73bb6c0dd645d069a036917c..a66827bc04d05f9643e00ecd4bc3595cc7517b78 100644
+index dd186ad2080d358ee1ed5c8ac6725a9e3dcaeb39..8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1171,6 +1171,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 244440eb9d4e85cb73bb6c0dd645d069a036917c..a66827bc04d05f9643e00ecd4bc3595c
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 47067ff24923002f9083022cbec4a90896ce3012..a3420d0a30fbb3f837c863ef559f66ddaa6dc6bd 100644
+index 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec94cf891c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2626,12 +2626,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0143-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch
similarity index 99%
rename from patches/server/0143-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch
index 81956ee1c..dd90326ae 100644
--- a/patches/server/0143-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch
@@ -575,7 +575,7 @@ index 6ba83c938456dc79c8cd948ae981c6f2e93702ae..ed1c473ef80202b3aa4996b5acb97288
  
      public static AttributeSupplier.Builder createAttributes() {
 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 c935177150c8270329dbf7cc43da31c603555c52..580af65dd27616cd6c17f3b8e39abbb1c4549ef4 100644
+index 86cd0a6d42a232ad81e0593f3b5b23c97d20db39..29351213075a26b5beefeeba012d05fc9c986696 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
 @@ -218,6 +218,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0144-Config-to-always-tame-in-Creative.patch b/patches/server/0143-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0144-Config-to-always-tame-in-Creative.patch
rename to patches/server/0143-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0145-End-crystal-explosion-options.patch b/patches/server/0144-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0145-End-crystal-explosion-options.patch
rename to patches/server/0144-End-crystal-explosion-options.patch
diff --git a/patches/server/0146-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 97%
rename from patches/server/0146-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index eaf072925..596ed919a 100644
--- a/patches/server/0146-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -17,7 +17,7 @@ index ed1c473ef80202b3aa4996b5acb9728857eaec8c..ea5e71b2264c73888d9355f31177a50c
      }
  
 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 580af65dd27616cd6c17f3b8e39abbb1c4549ef4..edd9c27c21bd3c377ecb9f14541140b73642c694 100644
+index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a5517380ab3 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
 @@ -733,6 +733,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0147-Dont-run-with-scissors.patch b/patches/server/0146-Dont-run-with-scissors.patch
similarity index 100%
rename from patches/server/0147-Dont-run-with-scissors.patch
rename to patches/server/0146-Dont-run-with-scissors.patch
diff --git a/patches/server/0148-One-Punch-Man.patch b/patches/server/0147-One-Punch-Man.patch
similarity index 100%
rename from patches/server/0148-One-Punch-Man.patch
rename to patches/server/0147-One-Punch-Man.patch
diff --git a/patches/server/0149-Add-config-for-snow-on-blue-ice.patch b/patches/server/0148-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0149-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0148-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0150-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0150-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0151-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0150-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 96%
rename from patches/server/0151-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0150-Config-to-ignore-nearby-mobs-when-sleeping.patch
index 60b27a668..f22741bf4 100644
--- a/patches/server/0151-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0150-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 a66827bc04d05f9643e00ecd4bc3595cc7517b78..75879a818d7adae2a4d027b66ced5d7d2270729f 100644
+index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1321,7 +1321,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0152-Add-back-player-spawned-endermite-API.patch b/patches/server/0151-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0152-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0151-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0153-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0152-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0153-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0152-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0154-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0154-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0155-Tick-fluids-config.patch b/patches/server/0154-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0155-Tick-fluids-config.patch
rename to patches/server/0154-Tick-fluids-config.patch
diff --git a/patches/server/0156-Config-to-disable-Llama-caravans.patch b/patches/server/0155-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0156-Config-to-disable-Llama-caravans.patch
rename to patches/server/0155-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0157-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0156-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0157-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0156-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0158-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0157-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0158-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0157-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0159-Sneak-to-bulk-process-composter.patch b/patches/server/0158-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0159-Sneak-to-bulk-process-composter.patch
rename to patches/server/0158-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0160-Config-for-skipping-night.patch b/patches/server/0159-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0160-Config-for-skipping-night.patch
rename to patches/server/0159-Config-for-skipping-night.patch
diff --git a/patches/server/0161-Add-config-for-villager-trading.patch b/patches/server/0160-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0161-Add-config-for-villager-trading.patch
rename to patches/server/0160-Add-config-for-villager-trading.patch
diff --git a/patches/server/0162-Allow-infinity-on-crossbows.patch b/patches/server/0161-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0162-Allow-infinity-on-crossbows.patch
rename to patches/server/0161-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0163-Drowning-Settings.patch b/patches/server/0162-Drowning-Settings.patch
similarity index 97%
rename from patches/server/0163-Drowning-Settings.patch
rename to patches/server/0162-Drowning-Settings.patch
index 8705a2afa..7f10f7a6d 100644
--- a/patches/server/0163-Drowning-Settings.patch
+++ b/patches/server/0162-Drowning-Settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a3420d0a30fbb3f837c863ef559f66ddaa6dc6bd..c422495386021e2b1b0048d608ca06f4703e1f34 100644
+index 197326d2831f804620fbfe289a1617ec94cf891c..ce02c8ba13c3e940709361e91747f9c97a166f18 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -502,7 +502,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0164-Break-individual-slabs-when-sneaking.patch b/patches/server/0163-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0164-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0163-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0165-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0164-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0165-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0164-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0166-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0165-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0166-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0165-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0167-Option-to-make-doors-require-redstone.patch b/patches/server/0166-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0167-Option-to-make-doors-require-redstone.patch
rename to patches/server/0166-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0168-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0167-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0168-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0167-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0169-Configurable-sponge-absorption.patch b/patches/server/0168-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0169-Configurable-sponge-absorption.patch
rename to patches/server/0168-Configurable-sponge-absorption.patch
diff --git a/patches/server/0170-Projectile-offset-config.patch b/patches/server/0169-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0170-Projectile-offset-config.patch
rename to patches/server/0169-Projectile-offset-config.patch
diff --git a/patches/server/0171-Config-for-powered-rail-activation-distance.patch b/patches/server/0170-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0171-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0170-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0172-Piglin-portal-spawn-modifier.patch b/patches/server/0171-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0172-Piglin-portal-spawn-modifier.patch
rename to patches/server/0171-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0173-Config-to-change-max-number-of-bees.patch b/patches/server/0172-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0173-Config-to-change-max-number-of-bees.patch
rename to patches/server/0172-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0174-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0173-Configurable-damage-settings-for-magma-blocks.patch
similarity index 97%
rename from patches/server/0174-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0173-Configurable-damage-settings-for-magma-blocks.patch
index 71608655b..571ec228e 100644
--- a/patches/server/0174-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0173-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 c422495386021e2b1b0048d608ca06f4703e1f34..b8a7af8b7dc7b76566fc462969797bd5c4530e8f 100644
+index ce02c8ba13c3e940709361e91747f9c97a166f18..35a04f593c66ae898b8b891dd4082aefe4d3feef 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1019,7 +1019,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0175-Config-for-wither-explosion-radius.patch b/patches/server/0174-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0175-Config-for-wither-explosion-radius.patch
rename to patches/server/0174-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0176-Gamemode-extra-permissions.patch b/patches/server/0175-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0176-Gamemode-extra-permissions.patch
rename to patches/server/0175-Gamemode-extra-permissions.patch
diff --git a/patches/server/0177-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0177-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0178-Configurable-piston-push-limit.patch b/patches/server/0177-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0178-Configurable-piston-push-limit.patch
rename to patches/server/0177-Configurable-piston-push-limit.patch
diff --git a/patches/server/0179-Configurable-broadcast-settings.patch b/patches/server/0178-Configurable-broadcast-settings.patch
similarity index 97%
rename from patches/server/0179-Configurable-broadcast-settings.patch
rename to patches/server/0178-Configurable-broadcast-settings.patch
index d26a69875..41a98b78c 100644
--- a/patches/server/0179-Configurable-broadcast-settings.patch
+++ b/patches/server/0178-Configurable-broadcast-settings.patch
@@ -17,7 +17,7 @@ index 945fb3200d52b83eaee2e62d6db5c43e088218eb..a87a532ce9e69bf4a90aac73ad51e4a8
                      // 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 75879a818d7adae2a4d027b66ced5d7d2270729f..10802bbcebb9a8bc05396573a51d347c0022bc34 100644
+index 0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc..3ad8167804f38262e1e7ecd878fce76573568ab8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -910,6 +910,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0180-Fix-SPIGOT-6278.patch b/patches/server/0179-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0180-Fix-SPIGOT-6278.patch
rename to patches/server/0179-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0181-Configurable-mob-blindness.patch b/patches/server/0180-Configurable-mob-blindness.patch
similarity index 100%
rename from patches/server/0181-Configurable-mob-blindness.patch
rename to patches/server/0180-Configurable-mob-blindness.patch
diff --git a/patches/server/0182-Hide-hidden-players-from-entity-selector.patch b/patches/server/0181-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0182-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0181-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0183-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0182-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server/0183-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0182-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server/0184-Iron-golem-poppy-calms-anger.patch b/patches/server/0183-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/server/0184-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0183-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/server/0185-Breedable-parrots.patch b/patches/server/0184-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0185-Breedable-parrots.patch
rename to patches/server/0184-Breedable-parrots.patch
diff --git a/patches/server/0186-Configurable-powered-rail-boost-modifier.patch b/patches/server/0185-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0186-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0185-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0187-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0186-Add-config-change-multiplier-critical-damage-value.patch
similarity index 100%
rename from patches/server/0187-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0186-Add-config-change-multiplier-critical-damage-value.patch
diff --git a/patches/server/0188-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0187-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0188-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0187-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0189-Config-for-unverified-username-message.patch b/patches/server/0188-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0189-Config-for-unverified-username-message.patch
rename to patches/server/0188-Config-for-unverified-username-message.patch
diff --git a/patches/server/0190-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0189-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0190-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0189-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0191-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0190-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0191-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0190-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0192-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0191-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0192-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0191-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0193-API-for-any-mob-to-burn-daylight.patch b/patches/server/0192-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0193-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0192-API-for-any-mob-to-burn-daylight.patch
index a6a12e2f9..9042e2516 100644
--- a/patches/server/0193-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0192-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 b8a7af8b7dc7b76566fc462969797bd5c4530e8f..9b817c1754f035b9a6b066bdbfa323191f2679ff 100644
+index 35a04f593c66ae898b8b891dd4082aefe4d3feef..a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4253,5 +4253,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0194-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0193-Fix-advancement-triggers-on-entity-death.patch
similarity index 100%
rename from patches/server/0194-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0193-Fix-advancement-triggers-on-entity-death.patch
diff --git a/patches/server/0195-Config-MobEffect-by-world.patch b/patches/server/0194-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0195-Config-MobEffect-by-world.patch
rename to patches/server/0194-Config-MobEffect-by-world.patch
diff --git a/patches/server/0196-Beacon-Activation-Range-Configurable.patch b/patches/server/0195-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0196-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0195-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0197-Add-toggle-for-sand-duping-fix.patch b/patches/server/0196-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0197-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0196-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0198-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0197-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 97%
rename from patches/server/0198-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0197-Add-toggle-for-end-portal-safe-teleporting.patch
index 9bf2e3d02..8b30fa1b2 100644
--- a/patches/server/0198-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0197-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 9b817c1754f035b9a6b066bdbfa323191f2679ff..335b08aa2806bacbde99148af9dc7ca129fdc0d4 100644
+index a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b..3f2a2b8ff167a50d8c29583a7f4ee708b5ca77bb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2677,7 +2677,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0199-Flying-Fall-Damage-API.patch b/patches/server/0198-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/server/0199-Flying-Fall-Damage-API.patch
rename to patches/server/0198-Flying-Fall-Damage-API.patch
diff --git a/patches/server/0200-Make-lightning-rod-range-configurable.patch b/patches/server/0199-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0200-Make-lightning-rod-range-configurable.patch
rename to patches/server/0199-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0201-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0200-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 100%
rename from patches/server/0201-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0200-Burp-after-eating-food-fills-hunger-bar-completely.patch
diff --git a/patches/server/0202-Allow-player-join-full-server-by-permission.patch b/patches/server/0201-Allow-player-join-full-server-by-permission.patch
similarity index 100%
rename from patches/server/0202-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0201-Allow-player-join-full-server-by-permission.patch
diff --git a/patches/server/0203-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0202-Add-permission-bypass-for-portal-waiting.patch
similarity index 100%
rename from patches/server/0203-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0202-Add-permission-bypass-for-portal-waiting.patch
diff --git a/patches/server/0204-Shulker-spawn-from-bullet-options.patch b/patches/server/0203-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0204-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0203-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0205-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0204-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0205-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0204-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0206-Option-to-make-drowned-break-doors.patch b/patches/server/0205-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0206-Option-to-make-drowned-break-doors.patch
rename to patches/server/0205-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0207-Configurable-hunger-starvation-damage.patch b/patches/server/0206-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0207-Configurable-hunger-starvation-damage.patch
rename to patches/server/0206-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0208-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0207-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 100%
rename from patches/server/0208-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0207-Redirect-System.out-calls-to-plugin-loggers.patch
diff --git a/patches/server/0209-Armor-click-equip-options.patch b/patches/server/0208-Armor-click-equip-options.patch
similarity index 100%
rename from patches/server/0209-Armor-click-equip-options.patch
rename to patches/server/0208-Armor-click-equip-options.patch
diff --git a/patches/server/0210-Add-uptime-command.patch b/patches/server/0209-Add-uptime-command.patch
similarity index 100%
rename from patches/server/0210-Add-uptime-command.patch
rename to patches/server/0209-Add-uptime-command.patch
diff --git a/patches/server/0211-Structure-seed-options.patch b/patches/server/0210-Structure-seed-options.patch
similarity index 95%
rename from patches/server/0211-Structure-seed-options.patch
rename to patches/server/0210-Structure-seed-options.patch
index 5a6ddd43c..1b1b29cae 100644
--- a/patches/server/0211-Structure-seed-options.patch
+++ b/patches/server/0210-Structure-seed-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Structure seed options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index c34023c69c9a97824417a40f5fac8f2e71f4b6f3..98686a2c86d4f2fabf027ad05824b218ac4ff6a8 100644
+index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76efe1b851f8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -587,6 +587,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
+@@ -580,6 +580,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
                      case "village":
                          seed = conf.villageSeed;
                          break;
diff --git a/patches/server/0212-Tool-actionable-options.patch b/patches/server/0211-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0212-Tool-actionable-options.patch
rename to patches/server/0211-Tool-actionable-options.patch
diff --git a/patches/server/0213-Store-placer-on-Block-when-placed.patch b/patches/server/0212-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0213-Store-placer-on-Block-when-placed.patch
rename to patches/server/0212-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0214-Summoner-API.patch b/patches/server/0213-Summoner-API.patch
similarity index 99%
rename from patches/server/0214-Summoner-API.patch
rename to patches/server/0213-Summoner-API.patch
index 783d18fcf..8b596b96c 100644
--- a/patches/server/0214-Summoner-API.patch
+++ b/patches/server/0213-Summoner-API.patch
@@ -93,7 +93,7 @@ index d457978c0345aa51c03880cf87a08494b2e117c5..51aaacb529c052e3e9b96a1f6db454d8
      }
  
 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 edd9c27c21bd3c377ecb9f14541140b73642c694..e711e68d245c2dabb76e8a200c3f353c6ece0886 100644
+index b6f1ad54cdacafb0995a992ff3990a5517380ab3..2943342e6dddc3b89411b7a6548d56b69a201d25 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
 @@ -86,6 +86,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0215-Customizable-sleeping-actionbar-messages.patch b/patches/server/0214-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0215-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0214-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0216-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0215-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0216-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0215-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0217-Silk-touchable-budding-amethyst.patch b/patches/server/0216-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0217-Silk-touchable-budding-amethyst.patch
rename to patches/server/0216-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0218-Big-dripleaf-tilt-delay.patch b/patches/server/0217-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0218-Big-dripleaf-tilt-delay.patch
rename to patches/server/0217-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0219-Player-ridable-in-water-option.patch b/patches/server/0218-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0219-Player-ridable-in-water-option.patch
rename to patches/server/0218-Player-ridable-in-water-option.patch
diff --git a/patches/server/0220-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0220-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0221-Add-compass-command.patch b/patches/server/0220-Add-compass-command.patch
similarity index 99%
rename from patches/server/0221-Add-compass-command.patch
rename to patches/server/0220-Add-compass-command.patch
index 0152f79bb..73f557507 100644
--- a/patches/server/0221-Add-compass-command.patch
+++ b/patches/server/0220-Add-compass-command.patch
@@ -17,7 +17,7 @@ index 2be6bbe31c61a9b66c685cca79407c26dd99cf1b..3ee6451e9aa21738c2e89a6609cc5cbf
  
          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 10802bbcebb9a8bc05396573a51d347c0022bc34..1e9ad5756eb56c69f2f28a0b912663a6cde1ae59 100644
+index 3ad8167804f38262e1e7ecd878fce76573568ab8..a6176958f1eac3bf6b49ec48a9fe99fff5d847a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -257,6 +257,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0222-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0221-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 100%
rename from patches/server/0222-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0221-Config-to-prevent-horses-from-standing-with-riders.patch
diff --git a/patches/server/0223-Toggle-for-kinetic-damage.patch b/patches/server/0222-Toggle-for-kinetic-damage.patch
similarity index 100%
rename from patches/server/0223-Toggle-for-kinetic-damage.patch
rename to patches/server/0222-Toggle-for-kinetic-damage.patch
diff --git a/patches/server/0224-Add-Option-for-disable-observer-clocks.patch b/patches/server/0223-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0224-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0223-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0225-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0224-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0225-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0224-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0226-Option-for-sponges-to-work-on-lava.patch b/patches/server/0225-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0226-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0225-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0227-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch
similarity index 96%
rename from patches/server/0227-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch
index 46a67dcc1..42d4ec4b1 100644
--- a/patches/server/0227-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for Wither's spawn sound
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index e711e68d245c2dabb76e8a200c3f353c6ece0886..fa803a71110f40abce9be682ce1c4863d4690829 100644
+index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6cafb819d82d 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
 @@ -414,7 +414,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0228-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0227-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0228-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0227-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0229-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0228-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0229-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0228-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0230-Conduit-behavior-configuration.patch b/patches/server/0229-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0230-Conduit-behavior-configuration.patch
rename to patches/server/0229-Conduit-behavior-configuration.patch
diff --git a/patches/server/0231-Cauldron-fill-chances.patch b/patches/server/0230-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0231-Cauldron-fill-chances.patch
rename to patches/server/0230-Cauldron-fill-chances.patch
diff --git a/patches/server/0232-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0231-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0232-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0231-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0233-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/server/0233-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/server/0234-Shulker-change-color-with-dye.patch b/patches/server/0233-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0234-Shulker-change-color-with-dye.patch
rename to patches/server/0233-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0235-Extended-OfflinePlayer-API.patch b/patches/server/0234-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0235-Extended-OfflinePlayer-API.patch
rename to patches/server/0234-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0236-Added-the-ability-to-add-combustible-items.patch b/patches/server/0235-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0236-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0235-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0237-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0237-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0238-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0238-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0239-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0238-Shift-right-click-to-use-exp-for-mending.patch
similarity index 100%
rename from patches/server/0239-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0238-Shift-right-click-to-use-exp-for-mending.patch
diff --git a/patches/server/0240-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0239-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0240-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0239-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0241-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0240-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0241-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0240-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0242-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0241-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0242-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0241-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0245-Halloween-options-and-optimizations.patch b/patches/server/0242-Halloween-options-and-optimizations.patch
similarity index 98%
rename from patches/server/0245-Halloween-options-and-optimizations.patch
rename to patches/server/0242-Halloween-options-and-optimizations.patch
index 94b4be2ef..6952c3c28 100644
--- a/patches/server/0245-Halloween-options-and-optimizations.patch
+++ b/patches/server/0242-Halloween-options-and-optimizations.patch
@@ -60,7 +60,7 @@ index 2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38..52eda2e110839c0845de6cd60445f9a0
                  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 53b081713f1dd6e5f18e76c12f88f50a13ee47d6..7a8dd3dda52be2d70fcbce77d09d5a312f65ab0b 100644
+index a42ca33ad5cdaabfba014bb52aa85bd9002f3abd..03aabc7d5eee53e78ff258ca798165778c1379a0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1504,6 +1504,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0246-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0243-Config-for-Grindstones-ignoring-curses.patch
similarity index 100%
rename from patches/server/0246-Config-for-Grindstones-ignoring-curses.patch
rename to patches/server/0243-Config-for-Grindstones-ignoring-curses.patch
diff --git a/patches/server/0243-horses-tempted-by-gold-config.patch b/patches/server/0243-horses-tempted-by-gold-config.patch
deleted file mode 100644
index a26839f2f..000000000
--- a/patches/server/0243-horses-tempted-by-gold-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: oharass <oharass@bk.ru>
-Date: Mon, 6 Sep 2021 05:13:09 +0300
-Subject: [PATCH] horses tempted by gold config
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index c9daf65ce500e29ce8f73d1ec6379fc2e172ae64..ea6b49cb000fb94e51df087fcc051d1cc50c05d1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -169,6 +169,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
- 
-     protected void addBehaviourGoals() {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
-+        if (this.level.purpurConfig.horseTemptedByGold) // Purpur
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.GOLDEN_CARROT, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE), false));
-     }
- 
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a42ca33ad5cdaabfba014bb52aa85bd9002f3abd..68a38651aac5ce09b8825320de4090afdc6cd568 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1532,6 +1532,7 @@ public class PurpurWorldConfig {
-     public int horseBreedingTicks = 6000;
-     public boolean horseTakeDamageFromWater = false;
-     public boolean horseStandWithRider = true;
-+    public boolean horseTemptedByGold = true;
-     private void horseSettings() {
-         horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
-         if (PurpurConfig.version < 10) {
-@@ -1550,6 +1551,7 @@ public class PurpurWorldConfig {
-         horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
-         horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater);
-         horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);
-+        horseTemptedByGold = getBoolean("mobs.horse.tempted-by-gold", horseTemptedByGold);
-     }
- 
-     public boolean huskRidable = false;
diff --git a/patches/server/0247-UPnP-Port-Forwarding.patch b/patches/server/0244-UPnP-Port-Forwarding.patch
similarity index 100%
rename from patches/server/0247-UPnP-Port-Forwarding.patch
rename to patches/server/0244-UPnP-Port-Forwarding.patch
diff --git a/patches/server/0244-llama-tempted-by-hay-config.patch b/patches/server/0244-llama-tempted-by-hay-config.patch
deleted file mode 100644
index 17bfafbf1..000000000
--- a/patches/server/0244-llama-tempted-by-hay-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: oharass <oharass@bk.ru>
-Date: Mon, 6 Sep 2021 05:53:11 +0300
-Subject: [PATCH] llama tempted by hay config
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 13fd55f198f36ed6b5d3b242e07535c5dfe797b1..80aa869afd28348f02f3189d0b06df9268137637 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -191,7 +191,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
-         this.goalSelector.addGoal(3, new RangedAttackGoal(this, 1.25D, 40, 20.0F));
-         this.goalSelector.addGoal(3, new PanicGoal(this, 1.2D));
-         this.goalSelector.addGoal(4, new BreedGoal(this, 1.0D));
--        this.goalSelector.addGoal(5, new TemptGoal(this, 1.25D, Ingredient.of(Items.HAY_BLOCK), false));
-+        if (this.level.purpurConfig.llamaTemptedByHay) this.goalSelector.addGoal(5, new TemptGoal(this, 1.25D, Ingredient.of(Items.HAY_BLOCK), false));
-         this.goalSelector.addGoal(6, new FollowParentGoal(this, 1.0D));
-         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 0.7D));
-         this.goalSelector.addGoal(8, 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 68a38651aac5ce09b8825320de4090afdc6cd568..53b081713f1dd6e5f18e76c12f88f50a13ee47d6 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1633,6 +1633,7 @@ public class PurpurWorldConfig {
-     public int llamaBreedingTicks = 6000;
-     public boolean llamaTakeDamageFromWater = false;
-     public boolean llamaJoinCaravans = true;
-+    public boolean llamaTemptedByHay = true;
-     private void llamaSettings() {
-         llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
-         llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1652,6 +1653,7 @@ public class PurpurWorldConfig {
-         llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
-         llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);
-         llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);
-+        llamaTemptedByHay = getBoolean("mobs.llama.tempted-by-hay", llamaTemptedByHay);
-     }
- 
-     public boolean magmaCubeRidable = false;
diff --git a/patches/server/0248-Campfire-option-for-lit-when-placed.patch b/patches/server/0245-Campfire-option-for-lit-when-placed.patch
similarity index 96%
rename from patches/server/0248-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0245-Campfire-option-for-lit-when-placed.patch
index 729861a80..ace12a44f 100644
--- a/patches/server/0248-Campfire-option-for-lit-when-placed.patch
+++ b/patches/server/0245-Campfire-option-for-lit-when-placed.patch
@@ -18,7 +18,7 @@ index 0b60b545271e62df86a0eb3c1f0f315a014b24cd..44df9e5034887c756c00bdcfb3ea04d4
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7a8dd3dda52be2d70fcbce77d09d5a312f65ab0b..3eb3212723ce452eacfcfc99d5dd394fb66cdd0e 100644
+index 03aabc7d5eee53e78ff258ca798165778c1379a0..aa69690ed0d7e392dc53e8f3e6aa1b35294cdaa0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -982,6 +982,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0249-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 98%
rename from patches/server/0249-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch
index 7524c156d..e52b9d02b 100644
--- a/patches/server/0249-options-to-extinguish-fire-blocks-with-snowballs.patch
+++ b/patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch
@@ -46,7 +46,7 @@ index d5d84893c77b4e60a19032d765d76bfd24cbbb2b..ef265cec066ef3b84c2b3a4929af5183
      protected void onHit(HitResult hitResult) {
          super.onHit(hitResult);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3eb3212723ce452eacfcfc99d5dd394fb66cdd0e..e5fbb22590bcce03aa7b4085a7bd5bdfcb5c9dd2 100644
+index aa69690ed0d7e392dc53e8f3e6aa1b35294cdaa0..55815af39a06445d1ee730f817cbbace2f424cd2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -179,6 +179,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0250-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch
similarity index 92%
rename from patches/server/0250-Add-option-to-disable-zombie-villagers-cure.patch
rename to patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch
index 8c986a702..2255be482 100644
--- a/patches/server/0250-Add-option-to-disable-zombie-villagers-cure.patch
+++ b/patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch
@@ -18,10 +18,10 @@ index c6ba41c2b4cc96bc97ed2e2220c0f3fa4f31dbe3..22a5d2f0de4bdd4432d1beff840f448a
                      itemstack.shrink(1);
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e5fbb22590bcce03aa7b4085a7bd5bdfcb5c9dd2..f6db214d51654f03f653d2daa276a1728eabcb85 100644
+index 55815af39a06445d1ee730f817cbbace2f424cd2..4c37df85046aede9ca37c92384fb282767c82644 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2622,6 +2622,7 @@ public class PurpurWorldConfig {
+@@ -2618,6 +2618,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerTakeDamageFromWater = false;
      public int zombieVillagerCuringTimeMin = 3600;
      public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index e5fbb22590bcce03aa7b4085a7bd5bdfcb5c9dd2..f6db214d51654f03f653d2daa276a172
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2638,6 +2639,7 @@ public class PurpurWorldConfig {
+@@ -2634,6 +2635,7 @@ public class PurpurWorldConfig {
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
          zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);