From f40f91c27383c9eceda23b10bd19612e7e4ca910 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Thu, 2 Dec 2021 19:15:58 -0500
Subject: [PATCH] remove broken patch (for now)

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

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-Fix-stuck-in-portals.patch b/patches/server/0139-Fix-stuck-in-portals.patch
similarity index 97%
rename from patches/server/0140-Fix-stuck-in-portals.patch
rename to patches/server/0139-Fix-stuck-in-portals.patch
index fa16ca6dd..7698c9c21 100644
--- a/patches/server/0140-Fix-stuck-in-portals.patch
+++ b/patches/server/0139-Fix-stuck-in-portals.patch
@@ -17,7 +17,7 @@ index 67a9f4d394372b229a42f54344590b02439bb260..0d58442a23793c0e0d70a2caf16736b5
                  // 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 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec94cf891c 100644
+index 186072ce4012c562e659674c7ef1fb01e51011b4..adfd0f5e939fcd35a564682d913153944d806e5d 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/0141-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from patches/server/0141-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0142-Config-to-always-tame-in-Creative.patch b/patches/server/0141-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0142-Config-to-always-tame-in-Creative.patch
rename to patches/server/0141-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0143-End-crystal-explosion-options.patch b/patches/server/0142-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0143-End-crystal-explosion-options.patch
rename to patches/server/0142-End-crystal-explosion-options.patch
diff --git a/patches/server/0144-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0144-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
diff --git a/patches/server/0145-Dont-run-with-scissors.patch b/patches/server/0144-Dont-run-with-scissors.patch
similarity index 98%
rename from patches/server/0145-Dont-run-with-scissors.patch
rename to patches/server/0144-Dont-run-with-scissors.patch
index a7dea6b28..e0aaefb9c 100644
--- a/patches/server/0145-Dont-run-with-scissors.patch
+++ b/patches/server/0144-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 b36c984e1c38c5f8ca644e51157e82452612ebcf..982e04ba9f2b0cd2640a639052e871d0c41ef058 100644
+index 99ec8a60f51b8679f972c938c18cde3a6bfe64de..d372bb18c85665220d8156b21e743ec88bf29930 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1528,6 +1528,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0146-One-Punch-Man.patch b/patches/server/0145-One-Punch-Man.patch
similarity index 96%
rename from patches/server/0146-One-Punch-Man.patch
rename to patches/server/0145-One-Punch-Man.patch
index b4df1e0d0..e439ba328 100644
--- a/patches/server/0146-One-Punch-Man.patch
+++ b/patches/server/0145-One-Punch-Man.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man!
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5268bc9c2fd7cc3aac78f89e463e275e0e351202..d61f3bd4afaa5f890d70606cfb7ea5cb97067a33 100644
+index 679ceed9d18b59b35572145e0fa21e51e4760d27..934bb735c1948113b01f9ba6799ecc1ad92dbb76 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2123,6 +2123,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0147-Add-config-for-snow-on-blue-ice.patch b/patches/server/0146-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0147-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0146-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0148-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0148-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0149-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 100%
rename from patches/server/0149-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch
diff --git a/patches/server/0150-Add-back-player-spawned-endermite-API.patch b/patches/server/0149-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0150-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0149-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0151-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0151-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0152-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0152-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0153-Tick-fluids-config.patch b/patches/server/0152-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0153-Tick-fluids-config.patch
rename to patches/server/0152-Tick-fluids-config.patch
diff --git a/patches/server/0154-Config-to-disable-Llama-caravans.patch b/patches/server/0153-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0154-Config-to-disable-Llama-caravans.patch
rename to patches/server/0153-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0155-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0155-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0154-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0156-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0156-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0155-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0157-Sneak-to-bulk-process-composter.patch b/patches/server/0156-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0157-Sneak-to-bulk-process-composter.patch
rename to patches/server/0156-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0158-Config-for-skipping-night.patch b/patches/server/0157-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0158-Config-for-skipping-night.patch
rename to patches/server/0157-Config-for-skipping-night.patch
diff --git a/patches/server/0159-Add-config-for-villager-trading.patch b/patches/server/0158-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0159-Add-config-for-villager-trading.patch
rename to patches/server/0158-Add-config-for-villager-trading.patch
diff --git a/patches/server/0160-Allow-infinity-on-crossbows.patch b/patches/server/0159-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0160-Allow-infinity-on-crossbows.patch
rename to patches/server/0159-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0161-Drowning-Settings.patch b/patches/server/0160-Drowning-Settings.patch
similarity index 95%
rename from patches/server/0161-Drowning-Settings.patch
rename to patches/server/0160-Drowning-Settings.patch
index e587baf4d..97dc3656e 100644
--- a/patches/server/0161-Drowning-Settings.patch
+++ b/patches/server/0160-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 197326d2831f804620fbfe289a1617ec94cf891c..ce02c8ba13c3e940709361e91747f9c97a166f18 100644
+index adfd0f5e939fcd35a564682d913153944d806e5d..07a644587f4f1a9679edc37a2b639889fde4ce88 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
@@ -27,7 +27,7 @@ index 197326d2831f804620fbfe289a1617ec94cf891c..ce02c8ba13c3e940709361e91747f9c9
  
      public int getAirSupply() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d61f3bd4afaa5f890d70606cfb7ea5cb97067a33..f3b5ef83240d58655029e33bbb1ea17bae304639 100644
+index 934bb735c1948113b01f9ba6799ecc1ad92dbb76..b036b0145a83eeb424beb261483b0515518dacd5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -420,7 +420,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0162-Break-individual-slabs-when-sneaking.patch b/patches/server/0161-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0162-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0161-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0163-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0163-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0164-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0164-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0165-Option-to-make-doors-require-redstone.patch b/patches/server/0164-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0165-Option-to-make-doors-require-redstone.patch
rename to patches/server/0164-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0166-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0166-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0165-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0167-Configurable-sponge-absorption.patch b/patches/server/0166-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0167-Configurable-sponge-absorption.patch
rename to patches/server/0166-Configurable-sponge-absorption.patch
diff --git a/patches/server/0168-Projectile-offset-config.patch b/patches/server/0167-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0168-Projectile-offset-config.patch
rename to patches/server/0167-Projectile-offset-config.patch
diff --git a/patches/server/0169-Config-for-powered-rail-activation-distance.patch b/patches/server/0168-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0169-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0168-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0170-Piglin-portal-spawn-modifier.patch b/patches/server/0169-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0170-Piglin-portal-spawn-modifier.patch
rename to patches/server/0169-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0171-Config-to-change-max-number-of-bees.patch b/patches/server/0170-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0171-Config-to-change-max-number-of-bees.patch
rename to patches/server/0170-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch
similarity index 97%
rename from patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch
index 3dacd56df..e9cdae6a8 100644
--- a/patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0171-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 ce02c8ba13c3e940709361e91747f9c97a166f18..35a04f593c66ae898b8b891dd4082aefe4d3feef 100644
+index 07a644587f4f1a9679edc37a2b639889fde4ce88..283f79e39a478dbcfe7912c6d24658ebd2f5209c 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/0173-Config-for-wither-explosion-radius.patch b/patches/server/0172-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0173-Config-for-wither-explosion-radius.patch
rename to patches/server/0172-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0174-Gamemode-extra-permissions.patch b/patches/server/0173-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0174-Gamemode-extra-permissions.patch
rename to patches/server/0173-Gamemode-extra-permissions.patch
diff --git a/patches/server/0175-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0175-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0176-Configurable-piston-push-limit.patch b/patches/server/0175-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0176-Configurable-piston-push-limit.patch
rename to patches/server/0175-Configurable-piston-push-limit.patch
diff --git a/patches/server/0177-Configurable-broadcast-settings.patch b/patches/server/0176-Configurable-broadcast-settings.patch
similarity index 100%
rename from patches/server/0177-Configurable-broadcast-settings.patch
rename to patches/server/0176-Configurable-broadcast-settings.patch
diff --git a/patches/server/0178-Fix-SPIGOT-6278.patch b/patches/server/0177-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0178-Fix-SPIGOT-6278.patch
rename to patches/server/0177-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0179-Configurable-mob-blindness.patch b/patches/server/0178-Configurable-mob-blindness.patch
similarity index 96%
rename from patches/server/0179-Configurable-mob-blindness.patch
rename to patches/server/0178-Configurable-mob-blindness.patch
index 509a7c1ba..a74d8f95a 100644
--- a/patches/server/0179-Configurable-mob-blindness.patch
+++ b/patches/server/0178-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 f3b5ef83240d58655029e33bbb1ea17bae304639..59f4415ba484e49897a20b8e9fc576b7d8b4bfe8 100644
+index b036b0145a83eeb424beb261483b0515518dacd5..2c5d453f57b28008e5b98cf6aec044cb3ffb2385 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -987,6 +987,17 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0180-Hide-hidden-players-from-entity-selector.patch b/patches/server/0179-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0180-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0179-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0181-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server/0181-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server/0182-Iron-golem-poppy-calms-anger.patch b/patches/server/0181-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/server/0182-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0181-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/server/0183-Breedable-parrots.patch b/patches/server/0182-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0183-Breedable-parrots.patch
rename to patches/server/0182-Breedable-parrots.patch
diff --git a/patches/server/0184-Configurable-powered-rail-boost-modifier.patch b/patches/server/0183-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0184-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0183-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0185-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch
similarity index 100%
rename from patches/server/0185-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch
diff --git a/patches/server/0186-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0186-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0187-Config-for-unverified-username-message.patch b/patches/server/0186-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0187-Config-for-unverified-username-message.patch
rename to patches/server/0186-Config-for-unverified-username-message.patch
diff --git a/patches/server/0188-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0188-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0187-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0189-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0189-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0188-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0190-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0190-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0189-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0191-API-for-any-mob-to-burn-daylight.patch b/patches/server/0190-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0191-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0190-API-for-any-mob-to-burn-daylight.patch
index 3f7d3eaff..e2375fee3 100644
--- a/patches/server/0191-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0190-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 35a04f593c66ae898b8b891dd4082aefe4d3feef..a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b 100644
+index 283f79e39a478dbcfe7912c6d24658ebd2f5209c..a954228a1486d3db1a3cdca3eec9f11edf92e015 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/0192-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0191-Fix-advancement-triggers-on-entity-death.patch
similarity index 98%
rename from patches/server/0192-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0191-Fix-advancement-triggers-on-entity-death.patch
index 8186208f0..f4d79690f 100644
--- a/patches/server/0192-Fix-advancement-triggers-on-entity-death.patch
+++ b/patches/server/0191-Fix-advancement-triggers-on-entity-death.patch
@@ -16,7 +16,7 @@ restoring it back to the entity just before the criterion triggers run and
 then finally clearing the equipment again right after the criterion is done.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1d9fa83b33921f64fe6e0917084e01b1a0dfa20e..c4fe33b1c7aa979f7bea21e091db393f61fc07ad 100644
+index b4e33ccc2e62a0183867cbf11394ce637fae058d..cbda521957675303270c3308819c544fee549c18 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1657,10 +1657,13 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0193-Config-MobEffect-by-world.patch b/patches/server/0192-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0193-Config-MobEffect-by-world.patch
rename to patches/server/0192-Config-MobEffect-by-world.patch
diff --git a/patches/server/0194-Beacon-Activation-Range-Configurable.patch b/patches/server/0193-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0194-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0193-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0195-Add-toggle-for-sand-duping-fix.patch b/patches/server/0194-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0195-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0194-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 97%
rename from patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch
index 39b6d0845..b95778025 100644
--- a/patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0195-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 a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b..3f2a2b8ff167a50d8c29583a7f4ee708b5ca77bb 100644
+index a954228a1486d3db1a3cdca3eec9f11edf92e015..9d6c9d623f3d0d8637f00566abe538a6d8c51d24 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/0197-Flying-Fall-Damage-API.patch b/patches/server/0196-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/server/0197-Flying-Fall-Damage-API.patch
rename to patches/server/0196-Flying-Fall-Damage-API.patch
diff --git a/patches/server/0198-Make-lightning-rod-range-configurable.patch b/patches/server/0197-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0198-Make-lightning-rod-range-configurable.patch
rename to patches/server/0197-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0199-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 100%
rename from patches/server/0199-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch
diff --git a/patches/server/0200-Allow-player-join-full-server-by-permission.patch b/patches/server/0199-Allow-player-join-full-server-by-permission.patch
similarity index 100%
rename from patches/server/0200-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0199-Allow-player-join-full-server-by-permission.patch
diff --git a/patches/server/0201-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0200-Add-permission-bypass-for-portal-waiting.patch
similarity index 100%
rename from patches/server/0201-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0200-Add-permission-bypass-for-portal-waiting.patch
diff --git a/patches/server/0202-Shulker-spawn-from-bullet-options.patch b/patches/server/0201-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0202-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0201-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0203-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0203-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0202-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0204-Option-to-make-drowned-break-doors.patch b/patches/server/0203-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0204-Option-to-make-drowned-break-doors.patch
rename to patches/server/0203-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0205-Configurable-hunger-starvation-damage.patch b/patches/server/0204-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0205-Configurable-hunger-starvation-damage.patch
rename to patches/server/0204-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0206-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 98%
rename from patches/server/0206-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
index 630f7ad8a..8603949c5 100644
--- a/patches/server/0206-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
@@ -20,7 +20,7 @@ index 455776981274e64724376a3182b60784b56db9cf..cd859eec6b0bee44bce83614e5570938
  
          thread.setDaemon(true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2462f582bc539162e594ac66be1bae83c8436197..c3c6dc82565b5edcc975bc5d951a8b20767bc346 100644
+index 55baa26e2938ad8cb04a3b5f468db6ebea28b1ff..a8e037522300f3c9ba455f5ea505d0f375e3e39d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -295,7 +295,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0207-Armor-click-equip-options.patch b/patches/server/0206-Armor-click-equip-options.patch
similarity index 100%
rename from patches/server/0207-Armor-click-equip-options.patch
rename to patches/server/0206-Armor-click-equip-options.patch
diff --git a/patches/server/0208-Add-uptime-command.patch b/patches/server/0207-Add-uptime-command.patch
similarity index 100%
rename from patches/server/0208-Add-uptime-command.patch
rename to patches/server/0207-Add-uptime-command.patch
diff --git a/patches/server/0209-Structure-seed-options.patch b/patches/server/0208-Structure-seed-options.patch
similarity index 95%
rename from patches/server/0209-Structure-seed-options.patch
rename to patches/server/0208-Structure-seed-options.patch
index a6ff20d6f..3ad5ae862 100644
--- a/patches/server/0209-Structure-seed-options.patch
+++ b/patches/server/0208-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 11b0697f668f6c0965a74081c149585fdf49b209..096f05db09d98e2b8edfd35d2cd97f9b4085d056 100644
+index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..fe0f14b363f4e6b583cd079f2cf627605731f764 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -588,6 +588,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/0210-Tool-actionable-options.patch b/patches/server/0209-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0210-Tool-actionable-options.patch
rename to patches/server/0209-Tool-actionable-options.patch
diff --git a/patches/server/0211-Store-placer-on-Block-when-placed.patch b/patches/server/0210-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0211-Store-placer-on-Block-when-placed.patch
rename to patches/server/0210-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0212-Summoner-API.patch b/patches/server/0211-Summoner-API.patch
similarity index 100%
rename from patches/server/0212-Summoner-API.patch
rename to patches/server/0211-Summoner-API.patch
diff --git a/patches/server/0213-Customizable-sleeping-actionbar-messages.patch b/patches/server/0212-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0213-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0212-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0214-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0214-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0215-Silk-touchable-budding-amethyst.patch b/patches/server/0214-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0215-Silk-touchable-budding-amethyst.patch
rename to patches/server/0214-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0216-Big-dripleaf-tilt-delay.patch b/patches/server/0215-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0216-Big-dripleaf-tilt-delay.patch
rename to patches/server/0215-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0217-Player-ridable-in-water-option.patch b/patches/server/0216-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0217-Player-ridable-in-water-option.patch
rename to patches/server/0216-Player-ridable-in-water-option.patch
diff --git a/patches/server/0218-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0218-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0219-Add-compass-command.patch b/patches/server/0218-Add-compass-command.patch
similarity index 100%
rename from patches/server/0219-Add-compass-command.patch
rename to patches/server/0218-Add-compass-command.patch
diff --git a/patches/server/0220-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 100%
rename from patches/server/0220-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch
diff --git a/patches/server/0221-Toggle-for-kinetic-damage.patch b/patches/server/0220-Toggle-for-kinetic-damage.patch
similarity index 96%
rename from patches/server/0221-Toggle-for-kinetic-damage.patch
rename to patches/server/0220-Toggle-for-kinetic-damage.patch
index 987aa861e..ce45d239f 100644
--- a/patches/server/0221-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0220-Toggle-for-kinetic-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c4fe33b1c7aa979f7bea21e091db393f61fc07ad..748f5fb6977eb4208332e3e75b84fd1b7d888cb1 100644
+index cbda521957675303270c3308819c544fee549c18..42463d6823b4f045af22665fd5e4685e98e484a1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2791,7 +2791,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0222-Add-Option-for-disable-observer-clocks.patch b/patches/server/0221-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0222-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0221-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0223-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0223-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0224-Option-for-sponges-to-work-on-lava.patch b/patches/server/0223-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0224-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0223-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0225-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0225-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0226-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0226-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0227-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0227-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0228-Conduit-behavior-configuration.patch b/patches/server/0227-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0228-Conduit-behavior-configuration.patch
rename to patches/server/0227-Conduit-behavior-configuration.patch
diff --git a/patches/server/0229-Cauldron-fill-chances.patch b/patches/server/0228-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0229-Cauldron-fill-chances.patch
rename to patches/server/0228-Cauldron-fill-chances.patch
diff --git a/patches/server/0230-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0230-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0231-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/server/0231-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/server/0232-Shulker-change-color-with-dye.patch b/patches/server/0231-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0232-Shulker-change-color-with-dye.patch
rename to patches/server/0231-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0233-Extended-OfflinePlayer-API.patch b/patches/server/0232-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0233-Extended-OfflinePlayer-API.patch
rename to patches/server/0232-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0234-Added-the-ability-to-add-combustible-items.patch b/patches/server/0233-Added-the-ability-to-add-combustible-items.patch
similarity index 97%
rename from patches/server/0234-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0233-Added-the-ability-to-add-combustible-items.patch
index 5968e1d91..e87202265 100644
--- a/patches/server/0234-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0233-Added-the-ability-to-add-combustible-items.patch
@@ -51,7 +51,7 @@ index 600a71b8da335ddfc70f782cbbb08647ae98a89c..e7387a287ac84dcf8f39c547538432e5
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c3c6dc82565b5edcc975bc5d951a8b20767bc346..e6e5cc640e690b4e8dc980948d4977ca9a6d4de1 100644
+index a8e037522300f3c9ba455f5ea505d0f375e3e39d..130d295cb703e1bfe6eb4409431c4adbb7153f50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1421,6 +1421,19 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0235-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0235-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch
similarity index 98%
rename from patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch
index cc368d748..b49b57f8d 100644
--- a/patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch
@@ -36,7 +36,7 @@ index ff159296b0d8acef3af74cd578b00a93fba08f36..ff025406e5755aa3654509bd98363f09
 +    // 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 982e04ba9f2b0cd2640a639052e871d0c41ef058..28e90810f2d9fa1894b45c070731d815cd28cdea 100644
+index d372bb18c85665220d8156b21e743ec88bf29930..35c9fdce59a69453741379d660471ae1e3e50816 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1875,6 +1875,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0238-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0238-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0239-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0239-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0240-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0240-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0241-Halloween-options-and-optimizations.patch b/patches/server/0240-Halloween-options-and-optimizations.patch
similarity index 100%
rename from patches/server/0241-Halloween-options-and-optimizations.patch
rename to patches/server/0240-Halloween-options-and-optimizations.patch
diff --git a/patches/server/0242-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch
similarity index 100%
rename from patches/server/0242-Config-for-Grindstones-ignoring-curses.patch
rename to patches/server/0241-Config-for-Grindstones-ignoring-curses.patch
diff --git a/patches/server/0243-UPnP-Port-Forwarding.patch b/patches/server/0242-UPnP-Port-Forwarding.patch
similarity index 100%
rename from patches/server/0243-UPnP-Port-Forwarding.patch
rename to patches/server/0242-UPnP-Port-Forwarding.patch
diff --git a/patches/server/0244-Campfire-option-for-lit-when-placed.patch b/patches/server/0243-Campfire-option-for-lit-when-placed.patch
similarity index 100%
rename from patches/server/0244-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0243-Campfire-option-for-lit-when-placed.patch
diff --git a/patches/server/0245-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 100%
rename from patches/server/0245-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch
diff --git a/patches/server/0246-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch
similarity index 100%
rename from patches/server/0246-Add-option-to-disable-zombie-villagers-cure.patch
rename to patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch
diff --git a/patches/server/0247-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0246-Persistent-BlockEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0247-Persistent-BlockEntity-Lore-and-DisplayName.patch
rename to patches/server/0246-Persistent-BlockEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0248-Signs-allow-color-codes.patch b/patches/server/0247-Signs-allow-color-codes.patch
similarity index 98%
rename from patches/server/0248-Signs-allow-color-codes.patch
rename to patches/server/0247-Signs-allow-color-codes.patch
index ac99731c5..5f8ed36ee 100644
--- a/patches/server/0248-Signs-allow-color-codes.patch
+++ b/patches/server/0247-Signs-allow-color-codes.patch
@@ -17,7 +17,7 @@ index d2cbc3ec9cfebc7576caf25606f4dbf30698310c..c416d5257d3bff7ad76466525f3cecf6
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28e90810f2d9fa1894b45c070731d815cd28cdea..6f7a7b988d0e548bd6521c71f6dff98ac67eeb65 100644
+index 35c9fdce59a69453741379d660471ae1e3e50816..8860409f94a7a6ed899f53649b204d343390938a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3073,11 +3073,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/api/0031-Add-StructureGenerateEvent.patch b/patches/todo/api/0031-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/api/0031-Add-StructureGenerateEvent.patch
rename to patches/todo/api/0031-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0139-Add-StructureGenerateEvent.patch b/patches/todo/server/0139-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0139-Add-StructureGenerateEvent.patch
rename to patches/todo/server/0139-Add-StructureGenerateEvent.patch