From 69c7c31f9a5c115693adf3b09088d17c2be18118 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 21 Oct 2021 10:58:16 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
https://github.com/PaperMC/Paper/commit/26c37d99d5802d8b920fd4d476bf620b80c9203a create random seeds for features using SecureRandom
https://github.com/PaperMC/Paper/commit/589bf2f1bfaf038270045ae961f5df3f1cf42299 Upgrade gson to 2.8.8 (Closes #6370)
https://github.com/PaperMC/Paper/commit/0a6103597baa53f84a1cfcb325987d6274386d5e Get entity default attributes (#6449)
https://github.com/PaperMC/Paper/commit/40057019e07c50d132dbe8597a3794717a995e4f Correctly inflate villager activation bounding box (#6798)
https://github.com/PaperMC/Paper/commit/e5f9241d1511c2e20e3a6cdc3b611052815a5b17 Left handed API (#6775)
https://github.com/PaperMC/Paper/commit/40ee63496cec27712349613f1063389897fbe711 Add advancement display API (#6175)
https://github.com/PaperMC/Paper/commit/9d570042ed6c895f95e6a254a3c2e9fa3719d912 Add ItemFactory#getMonsterEgg API (#6772)
https://github.com/PaperMC/Paper/commit/55ca459515b2c4cc5c99543713698bd50324aa29 rename method to getSpawnEgg
https://github.com/PaperMC/Paper/commit/bb397ba74c034ffe5ae164d774a043cb7bca0472 Add critical damage API (#6275)
https://github.com/PaperMC/Paper/commit/f47aeafe0054ab75070a76cc79380d4501407ad3 Add Horse Animation API (#5599)
https://github.com/PaperMC/Paper/commit/7a0886180f01d39c8ac3b8c2f46b8aeb6c615092 AT & Mapping fixes (#6809)
https://github.com/PaperMC/Paper/commit/5553432644a4606348d59e674b5ed1047ebdf25b docs: Update gradle instructions for Java 16 (#6811) [ci skip]
https://github.com/PaperMC/Paper/commit/a1f49e4c600f2ada525171d969c893261088c155 Fix command suggestion leak (#6592)
https://github.com/PaperMC/Paper/commit/9472d38f3c05a9f833cac72368cf49eb419200a1 Fix method name for Critical damage (#6813)
---
 gradle.properties                             |   2 +-
 patches/api/0008-Advancement-API.patch        | 123 ---------------
 ...9-Llama-API.patch => 0008-Llama-API.patch} |   0
 ...{0010-AFK-API.patch => 0009-AFK-API.patch} |   0
 ...atch => 0010-Bring-back-server-name.patch} |   0
 ...t.patch => 0011-ExecuteCommandEvent.patch} |   0
 ... 0012-LivingEntity-safeFallDistance.patch} |   0
 ...old.patch => 0013-Lagging-threshold.patch} |   0
 ...14-PlayerSetSpawnerTypeWithEggEvent.patch} |   0
 ...ch => 0015-EMC-MonsterEggSpawnEvent.patch} |   0
 .../api/0015-ItemFactory-getMonsterEgg.patch  |  26 ----
 ...ch => 0016-Player-invulnerabilities.patch} |   0
 ...9-Anvil-API.patch => 0017-Anvil-API.patch} |   0
 ... 0018-ItemStack-convenience-methods.patch} |   0
 ...d-to-crystals-and-crystals-shoot-ph.patch} |   0
 ...atch => 0020-ChatColor-conveniences.patch} |   0
 ...021-LivingEntity-broadcastItemBreak.patch} |   0
 ...atch => 0022-Item-entity-immunities.patch} |   0
 ...t-Improve-output-of-plugins-command.patch} |   0
 ...able-zombie-aggressiveness-towards-.patch} |   0
 ...-to-recipe-s-ExactChoice-ingredient.patch} |   0
 ...26-Alphabetize-in-game-plugins-list.patch} |   0
 ...lf-API.patch => 0027-Rabid-Wolf-API.patch} |   0
 ...-check-to-EntityDamagedByEntityEvent.patch |  56 -------
 ...c-warnings-missing-param-and-return.patch} |  36 +----
 patches/api/0029-Left-handed-API.patch        |  31 ----
 ...tch => 0029-PlayerBookTooLargeEvent.patch} |   0
 ...herite-armor-grants-fire-resistance.patch} |   0
 ...031-Add-EntityTeleportHinderedEvent.patch} |   0
 ... => 0032-Add-StructureGenerateEvent.patch} |   0
 ...Add-unsafe-Entity-serialization-API.patch} |   6 +-
 ...n-change-for-adventure-deprecations.patch} |   4 +-
 ...tment-target-for-bows-and-crossbows.patch} |   0
 ...> 0036-Iron-golem-poppy-calms-anger.patch} |   0
 ...37-API-for-any-mob-to-burn-daylight.patch} |   0
 ...atch => 0038-Flying-Fall-Damage-API.patch} |   0
 ...d-back-player-spawned-endermite-API.patch} |   0
 ... 0040-Fix-default-permission-system.patch} |   0
 ...oner-API.patch => 0041-Summoner-API.patch} |   0
 ...-version-command-output-for-console.patch} |   0
 ...mpt-parameters-to-resource-pack-api.patch} |   0
 ... => 0044-Extended-OfflinePlayer-API.patch} |   0
 ...he-ability-to-add-combustible-items.patch} |   0
 .../server/0001-Airplane-Server-Changes.patch |  12 +-
 .../server/0005-Purpur-client-support.patch   |  10 +-
 patches/server/0007-Ridables.patch            |  28 ++--
 ...-Configurable-entity-base-attributes.patch | 142 +++++++++---------
 patches/server/0011-Advancement-API.patch     | 142 ------------------
 ...2-Llama-API.patch => 0011-Llama-API.patch} |   2 +-
 ...{0013-AFK-API.patch => 0012-AFK-API.patch} |  14 +-
 ...atch => 0013-Bring-back-server-name.patch} |   0
 ...> 0014-Configurable-server-mod-name.patch} |   0
 ... 0015-LivingEntity-safeFallDistance.patch} |   4 +-
 ...old.patch => 0016-Lagging-threshold.patch} |   0
 ...17-PlayerSetSpawnerTypeWithEggEvent.patch} |   2 +-
 ...ch => 0018-EMC-MonsterEggSpawnEvent.patch} |   0
 .../0018-ItemFactory-getMonsterEgg.patch      |  42 ------
 ...ch => 0019-Player-invulnerabilities.patch} |   4 +-
 ...2-Anvil-API.patch => 0020-Anvil-API.patch} |   0
 ...1-Configurable-villager-brain-ticks.patch} |   2 +-
 ...0022-Alternative-Keepalive-Handling.patch} |   4 +-
 ...s.patch => 0023-Silk-touch-spawners.patch} |   0
 ...72-Fix-Add-turtle-egg-block-options.patch} |   0
 ...-vanilla-command-permission-handler.patch} |   0
 ...settings-suppressing-pointless-logs.patch} |   2 +-
 ...> 0027-Disable-outdated-build-check.patch} |   0
 ...gs.patch => 0028-Giants-AI-settings.patch} |   0
 ...> 0029-Zombie-horse-naturally-spawn.patch} |   2 +-
 ...030-Charged-creeper-naturally-spawn.patch} |   2 +-
 ...it-naturally-spawn-toast-and-killer.patch} |   2 +-
 ...er-showing-in-ping-before-server-fu.patch} |   0
 ...33-Dont-send-useless-entity-packets.patch} |   2 +-
 ...atch => 0034-Tulips-change-fox-type.patch} |   2 +-
 ...patch => 0035-Breedable-Polar-Bears.patch} |   2 +-
 ...atch => 0036-Chickens-can-retaliate.patch} |   2 +-
 ...ption-to-set-armorstand-step-height.patch} |   2 +-
 ....patch => 0038-Cat-spawning-options.patch} |   0
 ...n-black-cats-spawning-in-swamp-huts.patch} |   0
 ...ms.patch => 0040-Cows-eat-mushrooms.patch} |   2 +-
 ...ow-rotation-when-shearing-mooshroom.patch} |   0
 ...patch => 0042-Pigs-give-saddle-back.patch} |   2 +-
 ...3-Snowman-drop-and-put-back-pumpkin.patch} |   2 +-
 ...4-Ender-dragon-always-drop-full-exp.patch} |   0
 ... 0045-Signs-editable-on-right-click.patch} |   0
 ...tch => 0046-Signs-allow-color-codes.patch} |   6 +-
 ...oisten-from-water-directly-under-it.patch} |   0
 ...Minecart-settings-and-WASD-controls.patch} |   2 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |   2 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |   0
 ...ould-check-if-entity-can-use-portal.patch} |   2 +-
 ...052-Fix-the-dead-lagging-the-server.patch} |   4 +-
 ...Skip-events-if-there-s-no-listeners.patch} |   2 +-
 ... 0054-Add-permission-for-F3-N-debug.patch} |   0
 ...ch => 0055-Configurable-TPS-Catchup.patch} |   0
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |   0
 ...erman-and-creeper-griefing-controls.patch} |   4 +-
 ...058-Villagers-follow-emerald-blocks.patch} |   6 +-
 ...ch => 0059-Allow-leashing-villagers.patch} |   6 +-
 ...rable-search-radius-for-villagers-t.patch} |   2 +-
 ... => 0061-Implement-infinite-liquids.patch} |   0
 ...2-Make-lava-flow-speed-configurable.patch} |   0
 ...dd-player-death-exp-control-options.patch} |   4 +-
 ...rable-void-damage-height-and-damage.patch} |   2 +-
 ...=> 0065-Add-canSaveToDisk-to-Entity.patch} |   0
 ...spenser-curse-of-binding-protection.patch} |   6 +-
 ...-for-boats-to-eject-players-on-land.patch} |   2 +-
 ...-mends-most-damages-equipment-first.patch} |   0
 ...069-Add-5-second-tps-average-in-tps.patch} |   0
 ...h => 0070-Implement-elytra-settings.patch} |   4 +-
 ...atch => 0071-Item-entity-immunities.patch} |   0
 ...mand.patch => 0072-Add-ping-command.patch} |   4 +-
 ...mand.patch => 0073-Add-demo-command.patch} |   4 +-
 ...d.patch => 0074-Add-credits-command.patch} |   4 +-
 ...=> 0075-Configurable-jockey-options.patch} |   8 +-
 ...d-to-crystals-and-crystals-shoot-ph.patch} |   2 +-
 ...> 0077-Add-phantom-spawning-options.patch} |   0
 ...078-Implement-bed-explosion-options.patch} |   2 +-
 ...nt-respawn-anchor-explosion-options.patch} |   0
 ...Add-allow-water-in-end-world-option.patch} |   0
 ... => 0081-Allow-color-codes-in-books.patch} |  14 +-
 ...espan.patch => 0082-Entity-lifespan.patch} |   4 +-
 ...eport-to-spawn-if-outside-world-bor.patch} |   6 +-
 ...ty.patch => 0084-Squid-EAR-immunity.patch} |   2 +-
 ...atch => 0085-Phantoms-burn-in-light.patch} |   2 +-
 ...0086-Configurable-villager-breeding.patch} |   2 +-
 ... 0087-Redstone-deactivates-spawners.patch} |   0
 ...ch => 0088-Totems-work-in-inventory.patch} |   4 +-
 ...-Add-vindicator-johnny-spawn-chance.patch} |   2 +-
 ...on-to-disable-certain-block-updates.patch} |   2 +-
 ...0091-Dispensers-place-anvils-option.patch} |   0
 ...rs.patch => 0092-Allow-anvil-colors.patch} |   2 +-
 ... 0093-Add-no-random-tick-block-list.patch} |   4 +-
 ...-disable-dolphin-treasure-searching.patch} |   2 +-
 ...patch => 0095-Short-enderman-height.patch} |   6 +-
 ...top-squids-floating-on-top-of-water.patch} |   0
 ...-height-for-nether-surface-builders.patch} |   0
 ...ng-obsidian-valid-for-portal-frames.patch} |   2 +-
 ...ities-can-use-portals-configuration.patch} |   0
 ...100-LivingEntity-broadcastItemBreak.patch} |   0
 ...tomizable-wither-health-and-healing.patch} |   2 +-
 ...gling-special-MobSpawners-per-world.patch} |   4 +-
 ...patch => 0103-Raid-cooldown-setting.patch} |   2 +-
 ...-config-options-per-projectile-type.patch} |   6 +-
 ...able-zombie-aggressiveness-towards-.patch} |   4 +-
 ...ent-TileEntity-Lore-and-DisplayName.patch} |   2 +-
 ...-to-recipe-s-ExactChoice-ingredient.patch} |   0
 ...y.patch => 0108-Flying-squids-Oh-my.patch} |   4 +-
 ...patch => 0109-Infinity-bow-settings.patch} |   2 +-
 ...ge.patch => 0110-Stonecutter-damage.patch} |   0
 ...=> 0111-Configurable-daylight-cycle.patch} |   4 +-
 ...e-and-mending-enchantments-together.patch} |   2 +-
 ...3-Furnace-uses-lava-from-underneath.patch} |   4 +-
 ...ws-should-not-reset-despawn-counter.patch} |   2 +-
 ...e-add-farmland-mechanics-from-Alpha.patch} |   2 +-
 ...ustable-breeding-cooldown-to-config.patch} |   0
 ...-entity-breeding-times-configurable.patch} |  48 +++---
 ...es-from-item-forms-of-entities-to-e.patch} |   4 +-
 ...when-using-a-Name-Tag-on-an-Armor-S.patch} |   2 +-
 ...ting-and-weeping-vines-growth-rates.patch} |   0
 ...twisting-vines-configurable-max-gro.patch} |   0
 ...lowing-Endermen-to-despawn-even-whi.patch} |   2 +-
 ...23-Add-configurable-snowball-damage.patch} |   2 +-
 ...4-Changeable-Mob-Left-Handed-Chance.patch} |   0
 ...=> 0125-Add-boat-fall-damage-config.patch} |   0
 ...-check-to-EntityDamagedByEntityEvent.patch |  65 --------
 ...0126-Snow-Golem-rate-of-fire-config.patch} |   0
 ...-Configurable-disable-give-dropping.patch} |   0
 patches/server/0127-Left-handed-API.patch     |  27 ----
 ... => 0128-Lobotomize-stuck-villagers.patch} |   0
 ...illager-Clerics-to-farm-Nether-Wart.patch} |   0
 ...ied-Piglin-death-always-counting-as.patch} |   0
 ...timise-player-list-ticksSpread-out-.patch} |   0
 ...le-chance-for-wolves-to-spawn-rabid.patch} |   0
 ...3-Configurable-default-collar-color.patch} |   0
 ...tch => 0134-Phantom-flames-on-swoop.patch} |   0
 ...-to-open-even-with-a-solid-block-on.patch} |   0
 ...SBar.patch => 0136-Implement-TPSBar.patch} |   2 +-
 ...h => 0137-Striders-give-saddle-back.patch} |   0
 ...tch => 0138-PlayerBookTooLargeEvent.patch} |   6 +-
 ...herite-armor-grants-fire-resistance.patch} |   4 +-
 ...140-Fix-rotating-UP-DOWN-CW-and-CCW.patch} |   0
 ...efing-bypass-to-everything-affected.patch} |   2 +-
 ...llow-Note-Block-sounds-when-blocked.patch} |   0
 ...143-Add-EntityTeleportHinderedEvent.patch} |   0
 ... => 0144-Add-StructureGenerateEvent.patch} |   0
 ... => 0145-Farmland-trampling-changes.patch} |   0
 ...6-Movement-options-for-armor-stands.patch} |   0
 ....patch => 0147-Fix-stuck-in-portals.patch} |   0
 ...ggle-for-water-sensitive-mob-damage.patch} |   0
 ...9-Config-to-always-tame-in-Creative.patch} |   0
 ... 0150-End-crystal-explosion-options.patch} |   0
 ...Add-unsafe-Entity-serialization-API.patch} |   2 +-
 ...ther-Ender-Dragon-can-ride-vehicles.patch} |   0
 ...atch => 0153-Dont-run-with-scissors.patch} |   6 +-
 ...nch-Man.patch => 0154-One-Punch-Man.patch} |   2 +-
 ...155-Add-config-for-snow-on-blue-ice.patch} |   0
 ...r-Pearl-cooldown-damage-and-Endermi.patch} |   0
 ...to-ignore-nearby-mobs-when-sleeping.patch} |   0
 ...d-back-player-spawned-endermite-API.patch} |   0
 ...n-aggressiveness-towards-Endermites.patch} |   0
 ...Dragon-Head-wearers-and-stare-aggro.patch} |   0
 ...ig.patch => 0161-Tick-fluids-config.patch} |   0
 ...62-Config-to-disable-Llama-caravans.patch} |   0
 ...g-to-make-Creepers-explode-on-death.patch} |   0
 ...rable-ravager-griefable-blocks-list.patch} |   0
 ...165-Sneak-to-bulk-process-composter.patch} |   0
 ...h => 0166-Config-for-skipping-night.patch} |   2 +-
 ...167-Add-config-for-villager-trading.patch} |   0
 ...=> 0168-Allow-infinity-on-crossbows.patch} |   0
 ...ngs.patch => 0169-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
 ...0175-Configurable-sponge-absorption.patch} |   0
 ...ch => 0176-Projectile-offset-config.patch} |   0
 ...or-powered-rail-activation-distance.patch} |   0
 ...> 0178-Piglin-portal-spawn-modifier.patch} |   0
 ...Config-to-change-max-number-of-bees.patch} |   0
 ...le-damage-settings-for-magma-blocks.patch} |   0
 ...-Config-for-wither-explosion-radius.patch} |   0
 ... => 0182-Gamemode-extra-permissions.patch} |   0
 ...ng-the-blocks-that-turn-into-dirt-p.patch} |   0
 ...0184-Configurable-piston-push-limit.patch} |   0
 ...185-Configurable-broadcast-settings.patch} |   0
 ...-6278.patch => 0186-Fix-SPIGOT-6278.patch} |   0
 ... => 0187-Configurable-mob-blindness.patch} |   2 +-
 ...hidden-players-from-entity-selector.patch} |   0
 ...-to-impact-Creeper-explosion-radius.patch} |   0
 ...> 0190-Iron-golem-poppy-calms-anger.patch} |   0
 ...ots.patch => 0191-Breedable-parrots.patch} |   0
 ...gurable-powered-rail-boost-modifier.patch} |   0
 ...ge-multiplier-critical-damage-value.patch} |   6 +-
 ...n-to-disable-dragon-egg-teleporting.patch} |   0
 ...fig-for-unverified-username-message.patch} |   0
 ...-anvil-cumulative-cost-configurable.patch} |   0
 ...7-ShulkerBox-allow-oversized-stacks.patch} |   0
 ...e-can-work-when-raining-or-at-night.patch} |   0
 ...99-API-for-any-mob-to-burn-daylight.patch} |   4 +-
 ...dvancement-triggers-on-entity-death.patch} |   6 +-
 ...h => 0201-Config-MobEffect-by-world.patch} |   0
 ...eacon-Activation-Range-Configurable.patch} |   0
 ...0203-Add-toggle-for-sand-duping-fix.patch} |   0
 ...gle-for-end-portal-safe-teleporting.patch} |   0
 ...atch => 0205-Flying-Fall-Damage-API.patch} |   8 +-
 ...ke-lightning-rod-range-configurable.patch} |   2 +-
 ...ng-food-fills-hunger-bar-completely.patch} |   8 +-
 ...ayer-join-full-server-by-permission.patch} |   2 +-
 ...ermission-bypass-for-portal-waiting.patch} |   8 +-
 ...0-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} |   2 +-
 ...h => 0215-Armor-click-equip-options.patch} |   0
 ...nd.patch => 0216-Add-uptime-command.patch} |   2 +-
 ...atch => 0217-Structure-seed-options.patch} |   0
 ...tch => 0218-Tool-actionable-options.patch} |   0
 ...9-Store-placer-on-Block-when-placed.patch} |   0
 ...oner-API.patch => 0220-Summoner-API.patch} |   0
 ...mizable-sleeping-actionbar-messages.patch} |   0
 ...-shulker-box-items-from-dropping-co.patch} |   0
 ...223-Silk-touchable-budding-amethyst.patch} |   0
 ...tch => 0224-Big-dripleaf-tilt-delay.patch} |   0
 ...0225-Player-ridable-in-water-option.patch} |   4 +-
 ...-Enderman-teleport-on-projectile-hi.patch} |   0
 ...ue-Crash-with-Plugin-or-Datapack-Ge.patch} |   0
 ...d.patch => 0228-Add-compass-command.patch} |   0
 ...nt-horses-from-standing-with-riders.patch} |   2 +-
 ...h => 0230-Toggle-for-kinetic-damage.patch} |   4 +-
 ...-Option-for-disable-observer-clocks.patch} |   0
 ...zeable-Zombie-Villager-curing-times.patch} |   0
 ...-Option-for-sponges-to-work-on-lava.patch} |   0
 ...234-Toggle-for-Wither-s-spawn-sound.patch} |   0
 ...-breaks-from-solid-neighbors-config.patch} |   0
 ...move-curse-of-binding-with-weakness.patch} |   0
 ...0237-Conduit-behavior-configuration.patch} |   0
 ...patch => 0238-Cauldron-fill-chances.patch} |   0
 ...o-allow-mobs-to-pathfind-over-rails.patch} |   0
 ...mpt-parameters-to-resource-pack-api.patch} |   0
 ... 0241-Shulker-change-color-with-dye.patch} |   0
 ... => 0242-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} |   4 +-
 ...urally-aggressive-to-players-chance.patch} |   0
 ...urally-aggressive-to-players-chance.patch} |   0
 ...r-beds-to-explode-on-villager-sleep.patch} |   0
 ... 0250-horses-tempted-by-gold-config.patch} |   2 +-
 ...=> 0251-llama-tempted-by-hay-config.patch} |   0
 ...Halloween-options-and-optimizations.patch} |   0
 ...fig-for-Grindstones-ignoring-curses.patch} |   0
 ....patch => 0254-UPnP-Port-Forwarding.patch} |   2 +-
 ...Campfire-option-for-lit-when-placed.patch} |   0
 ...tinguish-fire-blocks-with-snowballs.patch} |   0
 297 files changed, 297 insertions(+), 837 deletions(-)
 delete mode 100644 patches/api/0008-Advancement-API.patch
 rename patches/api/{0009-Llama-API.patch => 0008-Llama-API.patch} (100%)
 rename patches/api/{0010-AFK-API.patch => 0009-AFK-API.patch} (100%)
 rename patches/api/{0011-Bring-back-server-name.patch => 0010-Bring-back-server-name.patch} (100%)
 rename patches/api/{0012-ExecuteCommandEvent.patch => 0011-ExecuteCommandEvent.patch} (100%)
 rename patches/api/{0013-LivingEntity-safeFallDistance.patch => 0012-LivingEntity-safeFallDistance.patch} (100%)
 rename patches/api/{0014-Lagging-threshold.patch => 0013-Lagging-threshold.patch} (100%)
 rename patches/api/{0016-PlayerSetSpawnerTypeWithEggEvent.patch => 0014-PlayerSetSpawnerTypeWithEggEvent.patch} (100%)
 rename patches/api/{0017-EMC-MonsterEggSpawnEvent.patch => 0015-EMC-MonsterEggSpawnEvent.patch} (100%)
 delete mode 100644 patches/api/0015-ItemFactory-getMonsterEgg.patch
 rename patches/api/{0018-Player-invulnerabilities.patch => 0016-Player-invulnerabilities.patch} (100%)
 rename patches/api/{0019-Anvil-API.patch => 0017-Anvil-API.patch} (100%)
 rename patches/api/{0020-ItemStack-convenience-methods.patch => 0018-ItemStack-convenience-methods.patch} (100%)
 rename patches/api/{0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%)
 rename patches/api/{0022-ChatColor-conveniences.patch => 0020-ChatColor-conveniences.patch} (100%)
 rename patches/api/{0023-LivingEntity-broadcastItemBreak.patch => 0021-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/api/{0024-Item-entity-immunities.patch => 0022-Item-entity-immunities.patch} (100%)
 rename patches/api/{0025-Spigot-Improve-output-of-plugins-command.patch => 0023-Spigot-Improve-output-of-plugins-command.patch} (100%)
 rename patches/api/{0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%)
 rename patches/api/{0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/api/{0030-Alphabetize-in-game-plugins-list.patch => 0026-Alphabetize-in-game-plugins-list.patch} (100%)
 rename patches/api/{0031-Rabid-Wolf-API.patch => 0027-Rabid-Wolf-API.patch} (100%)
 delete mode 100644 patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
 rename patches/api/{0032-Fix-javadoc-warnings-missing-param-and-return.patch => 0028-Fix-javadoc-warnings-missing-param-and-return.patch} (97%)
 delete mode 100644 patches/api/0029-Left-handed-API.patch
 rename patches/api/{0033-PlayerBookTooLargeEvent.patch => 0029-PlayerBookTooLargeEvent.patch} (100%)
 rename patches/api/{0034-Full-netherite-armor-grants-fire-resistance.patch => 0030-Full-netherite-armor-grants-fire-resistance.patch} (100%)
 rename patches/api/{0035-Add-EntityTeleportHinderedEvent.patch => 0031-Add-EntityTeleportHinderedEvent.patch} (100%)
 rename patches/api/{0036-Add-StructureGenerateEvent.patch => 0032-Add-StructureGenerateEvent.patch} (100%)
 rename patches/api/{0037-Add-unsafe-Entity-serialization-API.patch => 0033-Add-unsafe-Entity-serialization-API.patch} (91%)
 rename patches/api/{0038-Conflict-on-change-for-adventure-deprecations.patch => 0034-Conflict-on-change-for-adventure-deprecations.patch} (99%)
 rename patches/api/{0039-Add-enchantment-target-for-bows-and-crossbows.patch => 0035-Add-enchantment-target-for-bows-and-crossbows.patch} (100%)
 rename patches/api/{0040-Iron-golem-poppy-calms-anger.patch => 0036-Iron-golem-poppy-calms-anger.patch} (100%)
 rename patches/api/{0041-API-for-any-mob-to-burn-daylight.patch => 0037-API-for-any-mob-to-burn-daylight.patch} (100%)
 rename patches/api/{0042-Flying-Fall-Damage-API.patch => 0038-Flying-Fall-Damage-API.patch} (100%)
 rename patches/api/{0043-Add-back-player-spawned-endermite-API.patch => 0039-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/api/{0044-Fix-default-permission-system.patch => 0040-Fix-default-permission-system.patch} (100%)
 rename patches/api/{0045-Summoner-API.patch => 0041-Summoner-API.patch} (100%)
 rename patches/api/{0046-Clean-up-version-command-output-for-console.patch => 0042-Clean-up-version-command-output-for-console.patch} (100%)
 rename patches/api/{0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0043-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (100%)
 rename patches/api/{0048-Extended-OfflinePlayer-API.patch => 0044-Extended-OfflinePlayer-API.patch} (100%)
 rename patches/api/{0049-Added-the-ability-to-add-combustible-items.patch => 0045-Added-the-ability-to-add-combustible-items.patch} (100%)
 delete mode 100644 patches/server/0011-Advancement-API.patch
 rename patches/server/{0012-Llama-API.patch => 0011-Llama-API.patch} (98%)
 rename patches/server/{0013-AFK-API.patch => 0012-AFK-API.patch} (96%)
 rename patches/server/{0014-Bring-back-server-name.patch => 0013-Bring-back-server-name.patch} (100%)
 rename patches/server/{0015-Configurable-server-mod-name.patch => 0014-Configurable-server-mod-name.patch} (100%)
 rename patches/server/{0016-LivingEntity-safeFallDistance.patch => 0015-LivingEntity-safeFallDistance.patch} (95%)
 rename patches/server/{0017-Lagging-threshold.patch => 0016-Lagging-threshold.patch} (100%)
 rename patches/server/{0019-PlayerSetSpawnerTypeWithEggEvent.patch => 0017-PlayerSetSpawnerTypeWithEggEvent.patch} (97%)
 rename patches/server/{0020-EMC-MonsterEggSpawnEvent.patch => 0018-EMC-MonsterEggSpawnEvent.patch} (100%)
 delete mode 100644 patches/server/0018-ItemFactory-getMonsterEgg.patch
 rename patches/server/{0021-Player-invulnerabilities.patch => 0019-Player-invulnerabilities.patch} (98%)
 rename patches/server/{0022-Anvil-API.patch => 0020-Anvil-API.patch} (100%)
 rename patches/server/{0023-Configurable-villager-brain-ticks.patch => 0021-Configurable-villager-brain-ticks.patch} (97%)
 rename patches/server/{0024-Alternative-Keepalive-Handling.patch => 0022-Alternative-Keepalive-Handling.patch} (96%)
 rename patches/server/{0025-Silk-touch-spawners.patch => 0023-Silk-touch-spawners.patch} (100%)
 rename patches/server/{0026-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0024-MC-168772-Fix-Add-turtle-egg-block-options.patch} (100%)
 rename patches/server/{0027-Fix-vanilla-command-permission-handler.patch => 0025-Fix-vanilla-command-permission-handler.patch} (100%)
 rename patches/server/{0028-Logger-settings-suppressing-pointless-logs.patch => 0026-Logger-settings-suppressing-pointless-logs.patch} (97%)
 rename patches/server/{0029-Disable-outdated-build-check.patch => 0027-Disable-outdated-build-check.patch} (100%)
 rename patches/server/{0030-Giants-AI-settings.patch => 0028-Giants-AI-settings.patch} (100%)
 rename patches/server/{0031-Zombie-horse-naturally-spawn.patch => 0029-Zombie-horse-naturally-spawn.patch} (97%)
 rename patches/server/{0032-Charged-creeper-naturally-spawn.patch => 0030-Charged-creeper-naturally-spawn.patch} (96%)
 rename patches/server/{0033-Rabbit-naturally-spawn-toast-and-killer.patch => 0031-Rabbit-naturally-spawn-toast-and-killer.patch} (96%)
 rename patches/server/{0034-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%)
 rename patches/server/{0035-Dont-send-useless-entity-packets.patch => 0033-Dont-send-useless-entity-packets.patch} (97%)
 rename patches/server/{0036-Tulips-change-fox-type.patch => 0034-Tulips-change-fox-type.patch} (97%)
 rename patches/server/{0037-Breedable-Polar-Bears.patch => 0035-Breedable-Polar-Bears.patch} (97%)
 rename patches/server/{0038-Chickens-can-retaliate.patch => 0036-Chickens-can-retaliate.patch} (97%)
 rename patches/server/{0039-Add-option-to-set-armorstand-step-height.patch => 0037-Add-option-to-set-armorstand-step-height.patch} (94%)
 rename patches/server/{0040-Cat-spawning-options.patch => 0038-Cat-spawning-options.patch} (100%)
 rename patches/server/{0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%)
 rename patches/server/{0042-Cows-eat-mushrooms.patch => 0040-Cows-eat-mushrooms.patch} (98%)
 rename patches/server/{0043-Fix-cow-rotation-when-shearing-mooshroom.patch => 0041-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0044-Pigs-give-saddle-back.patch => 0042-Pigs-give-saddle-back.patch} (96%)
 rename patches/server/{0045-Snowman-drop-and-put-back-pumpkin.patch => 0043-Snowman-drop-and-put-back-pumpkin.patch} (96%)
 rename patches/server/{0046-Ender-dragon-always-drop-full-exp.patch => 0044-Ender-dragon-always-drop-full-exp.patch} (100%)
 rename patches/server/{0047-Signs-editable-on-right-click.patch => 0045-Signs-editable-on-right-click.patch} (100%)
 rename patches/server/{0048-Signs-allow-color-codes.patch => 0046-Signs-allow-color-codes.patch} (95%)
 rename patches/server/{0049-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0047-Allow-soil-to-moisten-from-water-directly-under-it.patch} (100%)
 rename patches/server/{0050-Minecart-settings-and-WASD-controls.patch => 0048-Minecart-settings-and-WASD-controls.patch} (99%)
 rename patches/server/{0051-Disable-loot-drops-on-death-by-cramming.patch => 0049-Disable-loot-drops-on-death-by-cramming.patch} (95%)
 rename patches/server/{0052-Option-to-toggle-milk-curing-bad-omen.patch => 0050-Option-to-toggle-milk-curing-bad-omen.patch} (100%)
 rename patches/server/{0053-End-gateway-should-check-if-entity-can-use-portal.patch => 0051-End-gateway-should-check-if-entity-can-use-portal.patch} (91%)
 rename patches/server/{0054-Fix-the-dead-lagging-the-server.patch => 0052-Fix-the-dead-lagging-the-server.patch} (90%)
 rename patches/server/{0055-Skip-events-if-there-s-no-listeners.patch => 0053-Skip-events-if-there-s-no-listeners.patch} (93%)
 rename patches/server/{0056-Add-permission-for-F3-N-debug.patch => 0054-Add-permission-for-F3-N-debug.patch} (100%)
 rename patches/server/{0057-Configurable-TPS-Catchup.patch => 0055-Configurable-TPS-Catchup.patch} (100%)
 rename patches/server/{0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (100%)
 rename patches/server/{0059-Add-enderman-and-creeper-griefing-controls.patch => 0057-Add-enderman-and-creeper-griefing-controls.patch} (95%)
 rename patches/server/{0060-Villagers-follow-emerald-blocks.patch => 0058-Villagers-follow-emerald-blocks.patch} (95%)
 rename patches/server/{0061-Allow-leashing-villagers.patch => 0059-Allow-leashing-villagers.patch} (94%)
 rename patches/server/{0062-Implement-configurable-search-radius-for-villagers-t.patch => 0060-Implement-configurable-search-radius-for-villagers-t.patch} (96%)
 rename patches/server/{0063-Implement-infinite-liquids.patch => 0061-Implement-infinite-liquids.patch} (100%)
 rename patches/server/{0064-Make-lava-flow-speed-configurable.patch => 0062-Make-lava-flow-speed-configurable.patch} (100%)
 rename patches/server/{0065-Add-player-death-exp-control-options.patch => 0063-Add-player-death-exp-control-options.patch} (94%)
 rename patches/server/{0066-Configurable-void-damage-height-and-damage.patch => 0064-Configurable-void-damage-height-and-damage.patch} (97%)
 rename patches/server/{0067-Add-canSaveToDisk-to-Entity.patch => 0065-Add-canSaveToDisk-to-Entity.patch} (100%)
 rename patches/server/{0068-Dispenser-curse-of-binding-protection.patch => 0066-Dispenser-curse-of-binding-protection.patch} (91%)
 rename patches/server/{0069-Add-option-for-boats-to-eject-players-on-land.patch => 0067-Add-option-for-boats-to-eject-players-on-land.patch} (95%)
 rename patches/server/{0070-Mending-mends-most-damages-equipment-first.patch => 0068-Mending-mends-most-damages-equipment-first.patch} (100%)
 rename patches/server/{0071-Add-5-second-tps-average-in-tps.patch => 0069-Add-5-second-tps-average-in-tps.patch} (100%)
 rename patches/server/{0072-Implement-elytra-settings.patch => 0070-Implement-elytra-settings.patch} (98%)
 rename patches/server/{0073-Item-entity-immunities.patch => 0071-Item-entity-immunities.patch} (100%)
 rename patches/server/{0074-Add-ping-command.patch => 0072-Add-ping-command.patch} (95%)
 rename patches/server/{0075-Add-demo-command.patch => 0073-Add-demo-command.patch} (95%)
 rename patches/server/{0076-Add-credits-command.patch => 0074-Add-credits-command.patch} (95%)
 rename patches/server/{0077-Configurable-jockey-options.patch => 0075-Configurable-jockey-options.patch} (97%)
 rename patches/server/{0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (99%)
 rename patches/server/{0079-Add-phantom-spawning-options.patch => 0077-Add-phantom-spawning-options.patch} (100%)
 rename patches/server/{0080-Implement-bed-explosion-options.patch => 0078-Implement-bed-explosion-options.patch} (97%)
 rename patches/server/{0081-Implement-respawn-anchor-explosion-options.patch => 0079-Implement-respawn-anchor-explosion-options.patch} (100%)
 rename patches/server/{0082-Add-allow-water-in-end-world-option.patch => 0080-Add-allow-water-in-end-world-option.patch} (100%)
 rename patches/server/{0083-Allow-color-codes-in-books.patch => 0081-Allow-color-codes-in-books.patch} (87%)
 rename patches/server/{0084-Entity-lifespan.patch => 0082-Entity-lifespan.patch} (95%)
 rename patches/server/{0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (93%)
 rename patches/server/{0086-Squid-EAR-immunity.patch => 0084-Squid-EAR-immunity.patch} (95%)
 rename patches/server/{0087-Phantoms-burn-in-light.patch => 0085-Phantoms-burn-in-light.patch} (98%)
 rename patches/server/{0088-Configurable-villager-breeding.patch => 0086-Configurable-villager-breeding.patch} (95%)
 rename patches/server/{0089-Redstone-deactivates-spawners.patch => 0087-Redstone-deactivates-spawners.patch} (100%)
 rename patches/server/{0090-Totems-work-in-inventory.patch => 0088-Totems-work-in-inventory.patch} (93%)
 rename patches/server/{0091-Add-vindicator-johnny-spawn-chance.patch => 0089-Add-vindicator-johnny-spawn-chance.patch} (96%)
 rename patches/server/{0092-Add-option-to-disable-certain-block-updates.patch => 0090-Add-option-to-disable-certain-block-updates.patch} (99%)
 rename patches/server/{0093-Dispensers-place-anvils-option.patch => 0091-Dispensers-place-anvils-option.patch} (100%)
 rename patches/server/{0094-Allow-anvil-colors.patch => 0092-Allow-anvil-colors.patch} (96%)
 rename patches/server/{0095-Add-no-random-tick-block-list.patch => 0093-Add-no-random-tick-block-list.patch} (95%)
 rename patches/server/{0096-Add-option-to-disable-dolphin-treasure-searching.patch => 0094-Add-option-to-disable-dolphin-treasure-searching.patch} (95%)
 rename patches/server/{0097-Short-enderman-height.patch => 0095-Short-enderman-height.patch} (91%)
 rename patches/server/{0098-Stop-squids-floating-on-top-of-water.patch => 0096-Stop-squids-floating-on-top-of-water.patch} (100%)
 rename patches/server/{0099-Use-configured-height-for-nether-surface-builders.patch => 0097-Use-configured-height-for-nether-surface-builders.patch} (100%)
 rename patches/server/{0100-Crying-obsidian-valid-for-portal-frames.patch => 0098-Crying-obsidian-valid-for-portal-frames.patch} (96%)
 rename patches/server/{0101-Entities-can-use-portals-configuration.patch => 0099-Entities-can-use-portals-configuration.patch} (100%)
 rename patches/server/{0102-LivingEntity-broadcastItemBreak.patch => 0100-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/server/{0103-Customizable-wither-health-and-healing.patch => 0101-Customizable-wither-health-and-healing.patch} (96%)
 rename patches/server/{0104-Allow-toggling-special-MobSpawners-per-world.patch => 0102-Allow-toggling-special-MobSpawners-per-world.patch} (97%)
 rename patches/server/{0105-Raid-cooldown-setting.patch => 0103-Raid-cooldown-setting.patch} (97%)
 rename patches/server/{0106-Despawn-rate-config-options-per-projectile-type.patch => 0104-Despawn-rate-config-options-per-projectile-type.patch} (98%)
 rename patches/server/{0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0105-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (97%)
 rename patches/server/{0108-Persistent-TileEntity-Lore-and-DisplayName.patch => 0106-Persistent-TileEntity-Lore-and-DisplayName.patch} (99%)
 rename patches/server/{0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0107-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0110-Flying-squids-Oh-my.patch => 0108-Flying-squids-Oh-my.patch} (95%)
 rename patches/server/{0111-Infinity-bow-settings.patch => 0109-Infinity-bow-settings.patch} (97%)
 rename patches/server/{0112-Stonecutter-damage.patch => 0110-Stonecutter-damage.patch} (100%)
 rename patches/server/{0113-Configurable-daylight-cycle.patch => 0111-Configurable-daylight-cycle.patch} (96%)
 rename patches/server/{0114-Allow-infinite-and-mending-enchantments-together.patch => 0112-Allow-infinite-and-mending-enchantments-together.patch} (95%)
 rename patches/server/{0115-Furnace-uses-lava-from-underneath.patch => 0113-Furnace-uses-lava-from-underneath.patch} (95%)
 rename patches/server/{0116-Arrows-should-not-reset-despawn-counter.patch => 0114-Arrows-should-not-reset-despawn-counter.patch} (91%)
 rename patches/server/{0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0115-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (95%)
 rename patches/server/{0118-Add-adjustable-breeding-cooldown-to-config.patch => 0116-Add-adjustable-breeding-cooldown-to-config.patch} (100%)
 rename patches/server/{0119-Make-entity-breeding-times-configurable.patch => 0117-Make-entity-breeding-times-configurable.patch} (94%)
 rename patches/server/{0120-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0118-Apply-display-names-from-item-forms-of-entities-to-e.patch} (98%)
 rename patches/server/{0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0119-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (95%)
 rename patches/server/{0122-Add-twisting-and-weeping-vines-growth-rates.patch => 0120-Add-twisting-and-weeping-vines-growth-rates.patch} (100%)
 rename patches/server/{0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0121-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (100%)
 rename patches/server/{0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0122-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (96%)
 rename patches/server/{0126-Add-configurable-snowball-damage.patch => 0123-Add-configurable-snowball-damage.patch} (95%)
 rename patches/server/{0128-Changeable-Mob-Left-Handed-Chance.patch => 0124-Changeable-Mob-Left-Handed-Chance.patch} (100%)
 rename patches/server/{0129-Add-boat-fall-damage-config.patch => 0125-Add-boat-fall-damage-config.patch} (100%)
 delete mode 100644 patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
 rename patches/server/{0130-Snow-Golem-rate-of-fire-config.patch => 0126-Snow-Golem-rate-of-fire-config.patch} (100%)
 rename patches/server/{0131-EMC-Configurable-disable-give-dropping.patch => 0127-EMC-Configurable-disable-give-dropping.patch} (100%)
 delete mode 100644 patches/server/0127-Left-handed-API.patch
 rename patches/server/{0132-Lobotomize-stuck-villagers.patch => 0128-Lobotomize-stuck-villagers.patch} (100%)
 rename patches/server/{0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0129-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (100%)
 rename patches/server/{0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0130-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (100%)
 rename patches/server/{0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch => 0131-Spread-out-and-optimise-player-list-ticksSpread-out-.patch} (100%)
 rename patches/server/{0136-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0132-Configurable-chance-for-wolves-to-spawn-rabid.patch} (100%)
 rename patches/server/{0137-Configurable-default-collar-color.patch => 0133-Configurable-default-collar-color.patch} (100%)
 rename patches/server/{0138-Phantom-flames-on-swoop.patch => 0134-Phantom-flames-on-swoop.patch} (100%)
 rename patches/server/{0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0135-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (100%)
 rename patches/server/{0140-Implement-TPSBar.patch => 0136-Implement-TPSBar.patch} (99%)
 rename patches/server/{0141-Striders-give-saddle-back.patch => 0137-Striders-give-saddle-back.patch} (100%)
 rename patches/server/{0142-PlayerBookTooLargeEvent.patch => 0138-PlayerBookTooLargeEvent.patch} (91%)
 rename patches/server/{0143-Full-netherite-armor-grants-fire-resistance.patch => 0139-Full-netherite-armor-grants-fire-resistance.patch} (95%)
 rename patches/server/{0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0140-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%)
 rename patches/server/{0145-Add-mobGriefing-bypass-to-everything-affected.patch => 0141-Add-mobGriefing-bypass-to-everything-affected.patch} (99%)
 rename patches/server/{0146-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0142-Config-to-allow-Note-Block-sounds-when-blocked.patch} (100%)
 rename patches/server/{0147-Add-EntityTeleportHinderedEvent.patch => 0143-Add-EntityTeleportHinderedEvent.patch} (100%)
 rename patches/server/{0148-Add-StructureGenerateEvent.patch => 0144-Add-StructureGenerateEvent.patch} (100%)
 rename patches/server/{0149-Farmland-trampling-changes.patch => 0145-Farmland-trampling-changes.patch} (100%)
 rename patches/server/{0150-Movement-options-for-armor-stands.patch => 0146-Movement-options-for-armor-stands.patch} (100%)
 rename patches/server/{0151-Fix-stuck-in-portals.patch => 0147-Fix-stuck-in-portals.patch} (100%)
 rename patches/server/{0152-Toggle-for-water-sensitive-mob-damage.patch => 0148-Toggle-for-water-sensitive-mob-damage.patch} (100%)
 rename patches/server/{0153-Config-to-always-tame-in-Creative.patch => 0149-Config-to-always-tame-in-Creative.patch} (100%)
 rename patches/server/{0154-End-crystal-explosion-options.patch => 0150-End-crystal-explosion-options.patch} (100%)
 rename patches/server/{0155-Add-unsafe-Entity-serialization-API.patch => 0151-Add-unsafe-Entity-serialization-API.patch} (98%)
 rename patches/server/{0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0152-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (100%)
 rename patches/server/{0157-Dont-run-with-scissors.patch => 0153-Dont-run-with-scissors.patch} (95%)
 rename patches/server/{0158-One-Punch-Man.patch => 0154-One-Punch-Man.patch} (96%)
 rename patches/server/{0159-Add-config-for-snow-on-blue-ice.patch => 0155-Add-config-for-snow-on-blue-ice.patch} (100%)
 rename patches/server/{0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0156-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (100%)
 rename patches/server/{0161-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0157-Config-to-ignore-nearby-mobs-when-sleeping.patch} (100%)
 rename patches/server/{0162-Add-back-player-spawned-endermite-API.patch => 0158-Add-back-player-spawned-endermite-API.patch} (100%)
 rename patches/server/{0163-Config-Enderman-aggressiveness-towards-Endermites.patch => 0159-Config-Enderman-aggressiveness-towards-Endermites.patch} (100%)
 rename patches/server/{0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0160-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (100%)
 rename patches/server/{0165-Tick-fluids-config.patch => 0161-Tick-fluids-config.patch} (100%)
 rename patches/server/{0166-Config-to-disable-Llama-caravans.patch => 0162-Config-to-disable-Llama-caravans.patch} (100%)
 rename patches/server/{0167-Config-to-make-Creepers-explode-on-death.patch => 0163-Config-to-make-Creepers-explode-on-death.patch} (100%)
 rename patches/server/{0168-Configurable-ravager-griefable-blocks-list.patch => 0164-Configurable-ravager-griefable-blocks-list.patch} (100%)
 rename patches/server/{0169-Sneak-to-bulk-process-composter.patch => 0165-Sneak-to-bulk-process-composter.patch} (100%)
 rename patches/server/{0170-Config-for-skipping-night.patch => 0166-Config-for-skipping-night.patch} (96%)
 rename patches/server/{0171-Add-config-for-villager-trading.patch => 0167-Add-config-for-villager-trading.patch} (100%)
 rename patches/server/{0172-Allow-infinity-on-crossbows.patch => 0168-Allow-infinity-on-crossbows.patch} (100%)
 rename patches/server/{0173-Drowning-Settings.patch => 0169-Drowning-Settings.patch} (97%)
 rename patches/server/{0174-Break-individual-slabs-when-sneaking.patch => 0170-Break-individual-slabs-when-sneaking.patch} (100%)
 rename patches/server/{0175-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0171-Config-to-disable-hostile-mob-spawn-on-ice.patch} (100%)
 rename patches/server/{0176-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0172-Config-to-show-Armor-Stand-arms-on-spawn.patch} (100%)
 rename patches/server/{0177-Option-to-make-doors-require-redstone.patch => 0173-Option-to-make-doors-require-redstone.patch} (100%)
 rename patches/server/{0178-Config-to-allow-for-unsafe-enchants.patch => 0174-Config-to-allow-for-unsafe-enchants.patch} (100%)
 rename patches/server/{0179-Configurable-sponge-absorption.patch => 0175-Configurable-sponge-absorption.patch} (100%)
 rename patches/server/{0180-Projectile-offset-config.patch => 0176-Projectile-offset-config.patch} (100%)
 rename patches/server/{0181-Config-for-powered-rail-activation-distance.patch => 0177-Config-for-powered-rail-activation-distance.patch} (100%)
 rename patches/server/{0182-Piglin-portal-spawn-modifier.patch => 0178-Piglin-portal-spawn-modifier.patch} (100%)
 rename patches/server/{0183-Config-to-change-max-number-of-bees.patch => 0179-Config-to-change-max-number-of-bees.patch} (100%)
 rename patches/server/{0184-Configurable-damage-settings-for-magma-blocks.patch => 0180-Configurable-damage-settings-for-magma-blocks.patch} (100%)
 rename patches/server/{0185-Config-for-wither-explosion-radius.patch => 0181-Config-for-wither-explosion-radius.patch} (100%)
 rename patches/server/{0186-Gamemode-extra-permissions.patch => 0182-Gamemode-extra-permissions.patch} (100%)
 rename patches/server/{0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0183-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (100%)
 rename patches/server/{0188-Configurable-piston-push-limit.patch => 0184-Configurable-piston-push-limit.patch} (100%)
 rename patches/server/{0189-Configurable-broadcast-settings.patch => 0185-Configurable-broadcast-settings.patch} (100%)
 rename patches/server/{0190-Fix-SPIGOT-6278.patch => 0186-Fix-SPIGOT-6278.patch} (100%)
 rename patches/server/{0191-Configurable-mob-blindness.patch => 0187-Configurable-mob-blindness.patch} (96%)
 rename patches/server/{0192-Hide-hidden-players-from-entity-selector.patch => 0188-Hide-hidden-players-from-entity-selector.patch} (100%)
 rename patches/server/{0193-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0189-Config-for-health-to-impact-Creeper-explosion-radius.patch} (100%)
 rename patches/server/{0194-Iron-golem-poppy-calms-anger.patch => 0190-Iron-golem-poppy-calms-anger.patch} (100%)
 rename patches/server/{0195-Breedable-parrots.patch => 0191-Breedable-parrots.patch} (100%)
 rename patches/server/{0196-Configurable-powered-rail-boost-modifier.patch => 0192-Configurable-powered-rail-boost-modifier.patch} (100%)
 rename patches/server/{0197-Add-config-change-multiplier-critical-damage-value.patch => 0193-Add-config-change-multiplier-critical-damage-value.patch} (89%)
 rename patches/server/{0198-Option-to-disable-dragon-egg-teleporting.patch => 0194-Option-to-disable-dragon-egg-teleporting.patch} (100%)
 rename patches/server/{0199-Config-for-unverified-username-message.patch => 0195-Config-for-unverified-username-message.patch} (100%)
 rename patches/server/{0200-Make-anvil-cumulative-cost-configurable.patch => 0196-Make-anvil-cumulative-cost-configurable.patch} (100%)
 rename patches/server/{0201-ShulkerBox-allow-oversized-stacks.patch => 0197-ShulkerBox-allow-oversized-stacks.patch} (100%)
 rename patches/server/{0202-Bee-can-work-when-raining-or-at-night.patch => 0198-Bee-can-work-when-raining-or-at-night.patch} (100%)
 rename patches/server/{0203-API-for-any-mob-to-burn-daylight.patch => 0199-API-for-any-mob-to-burn-daylight.patch} (99%)
 rename patches/server/{0204-Fix-advancement-triggers-on-entity-death.patch => 0200-Fix-advancement-triggers-on-entity-death.patch} (96%)
 rename patches/server/{0205-Config-MobEffect-by-world.patch => 0201-Config-MobEffect-by-world.patch} (100%)
 rename patches/server/{0206-Beacon-Activation-Range-Configurable.patch => 0202-Beacon-Activation-Range-Configurable.patch} (100%)
 rename patches/server/{0207-Add-toggle-for-sand-duping-fix.patch => 0203-Add-toggle-for-sand-duping-fix.patch} (100%)
 rename patches/server/{0208-Add-toggle-for-end-portal-safe-teleporting.patch => 0204-Add-toggle-for-end-portal-safe-teleporting.patch} (100%)
 rename patches/server/{0209-Flying-Fall-Damage-API.patch => 0205-Flying-Fall-Damage-API.patch} (87%)
 rename patches/server/{0210-Make-lightning-rod-range-configurable.patch => 0206-Make-lightning-rod-range-configurable.patch} (96%)
 rename patches/server/{0211-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0207-Burp-after-eating-food-fills-hunger-bar-completely.patch} (93%)
 rename patches/server/{0212-Allow-player-join-full-server-by-permission.patch => 0208-Allow-player-join-full-server-by-permission.patch} (93%)
 rename patches/server/{0213-Add-permission-bypass-for-portal-waiting.patch => 0209-Add-permission-bypass-for-portal-waiting.patch} (85%)
 rename patches/server/{0214-Shulker-spawn-from-bullet-options.patch => 0210-Shulker-spawn-from-bullet-options.patch} (100%)
 rename patches/server/{0215-Eating-glow-berries-adds-glow-effect.patch => 0211-Eating-glow-berries-adds-glow-effect.patch} (100%)
 rename patches/server/{0216-Option-to-make-drowned-break-doors.patch => 0212-Option-to-make-drowned-break-doors.patch} (100%)
 rename patches/server/{0217-Configurable-hunger-starvation-damage.patch => 0213-Configurable-hunger-starvation-damage.patch} (100%)
 rename patches/server/{0218-Redirect-System.out-calls-to-plugin-loggers.patch => 0214-Redirect-System.out-calls-to-plugin-loggers.patch} (98%)
 rename patches/server/{0219-Armor-click-equip-options.patch => 0215-Armor-click-equip-options.patch} (100%)
 rename patches/server/{0220-Add-uptime-command.patch => 0216-Add-uptime-command.patch} (98%)
 rename patches/server/{0221-Structure-seed-options.patch => 0217-Structure-seed-options.patch} (100%)
 rename patches/server/{0222-Tool-actionable-options.patch => 0218-Tool-actionable-options.patch} (100%)
 rename patches/server/{0223-Store-placer-on-Block-when-placed.patch => 0219-Store-placer-on-Block-when-placed.patch} (100%)
 rename patches/server/{0224-Summoner-API.patch => 0220-Summoner-API.patch} (100%)
 rename patches/server/{0225-Customizable-sleeping-actionbar-messages.patch => 0221-Customizable-sleeping-actionbar-messages.patch} (100%)
 rename patches/server/{0226-option-to-disable-shulker-box-items-from-dropping-co.patch => 0222-option-to-disable-shulker-box-items-from-dropping-co.patch} (100%)
 rename patches/server/{0227-Silk-touchable-budding-amethyst.patch => 0223-Silk-touchable-budding-amethyst.patch} (100%)
 rename patches/server/{0228-Big-dripleaf-tilt-delay.patch => 0224-Big-dripleaf-tilt-delay.patch} (100%)
 rename patches/server/{0229-Player-ridable-in-water-option.patch => 0225-Player-ridable-in-water-option.patch} (93%)
 rename patches/server/{0230-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0226-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (100%)
 rename patches/server/{0231-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch => 0227-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch} (100%)
 rename patches/server/{0232-Add-compass-command.patch => 0228-Add-compass-command.patch} (100%)
 rename patches/server/{0233-Config-to-prevent-horses-from-standing-with-riders.patch => 0229-Config-to-prevent-horses-from-standing-with-riders.patch} (96%)
 rename patches/server/{0234-Toggle-for-kinetic-damage.patch => 0230-Toggle-for-kinetic-damage.patch} (93%)
 rename patches/server/{0235-Add-Option-for-disable-observer-clocks.patch => 0231-Add-Option-for-disable-observer-clocks.patch} (100%)
 rename patches/server/{0236-Customizeable-Zombie-Villager-curing-times.patch => 0232-Customizeable-Zombie-Villager-curing-times.patch} (100%)
 rename patches/server/{0237-Option-for-sponges-to-work-on-lava.patch => 0233-Option-for-sponges-to-work-on-lava.patch} (100%)
 rename patches/server/{0238-Toggle-for-Wither-s-spawn-sound.patch => 0234-Toggle-for-Wither-s-spawn-sound.patch} (100%)
 rename patches/server/{0239-Cactus-breaks-from-solid-neighbors-config.patch => 0235-Cactus-breaks-from-solid-neighbors-config.patch} (100%)
 rename patches/server/{0240-Config-to-remove-curse-of-binding-with-weakness.patch => 0236-Config-to-remove-curse-of-binding-with-weakness.patch} (100%)
 rename patches/server/{0241-Conduit-behavior-configuration.patch => 0237-Conduit-behavior-configuration.patch} (100%)
 rename patches/server/{0242-Cauldron-fill-chances.patch => 0238-Cauldron-fill-chances.patch} (100%)
 rename patches/server/{0243-Config-to-allow-mobs-to-pathfind-over-rails.patch => 0239-Config-to-allow-mobs-to-pathfind-over-rails.patch} (100%)
 rename patches/server/{0244-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0240-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (100%)
 rename patches/server/{0245-Shulker-change-color-with-dye.patch => 0241-Shulker-change-color-with-dye.patch} (100%)
 rename patches/server/{0246-Extended-OfflinePlayer-API.patch => 0242-Extended-OfflinePlayer-API.patch} (100%)
 rename patches/server/{0247-Added-the-ability-to-add-combustible-items.patch => 0243-Added-the-ability-to-add-combustible-items.patch} (100%)
 rename patches/server/{0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch => 0244-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch} (100%)
 rename patches/server/{0249-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch => 0245-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch} (100%)
 rename patches/server/{0250-Shift-right-click-to-use-exp-for-mending.patch => 0246-Shift-right-click-to-use-exp-for-mending.patch} (96%)
 rename patches/server/{0251-Dolphins-naturally-aggressive-to-players-chance.patch => 0247-Dolphins-naturally-aggressive-to-players-chance.patch} (100%)
 rename patches/server/{0252-Cows-naturally-aggressive-to-players-chance.patch => 0248-Cows-naturally-aggressive-to-players-chance.patch} (100%)
 rename patches/server/{0253-Option-for-beds-to-explode-on-villager-sleep.patch => 0249-Option-for-beds-to-explode-on-villager-sleep.patch} (100%)
 rename patches/server/{0254-horses-tempted-by-gold-config.patch => 0250-horses-tempted-by-gold-config.patch} (95%)
 rename patches/server/{0255-llama-tempted-by-hay-config.patch => 0251-llama-tempted-by-hay-config.patch} (100%)
 rename patches/server/{0256-Halloween-options-and-optimizations.patch => 0252-Halloween-options-and-optimizations.patch} (100%)
 rename patches/server/{0257-Config-for-Grindstones-ignoring-curses.patch => 0253-Config-for-Grindstones-ignoring-curses.patch} (100%)
 rename patches/server/{0258-UPnP-Port-Forwarding.patch => 0254-UPnP-Port-Forwarding.patch} (97%)
 rename patches/server/{0259-Campfire-option-for-lit-when-placed.patch => 0255-Campfire-option-for-lit-when-placed.patch} (100%)
 rename patches/server/{0260-options-to-extinguish-fire-blocks-with-snowballs.patch => 0256-options-to-extinguish-fire-blocks-with-snowballs.patch} (100%)

diff --git a/gradle.properties b/gradle.properties
index 8b0da6150..4061c4c34 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = eaee7a2473baa4e8a51fea63b2dcf0ff7bda31b3
+paperCommit = 9472d38f3c05a9f833cac72368cf49eb419200a1
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0008-Advancement-API.patch b/patches/api/0008-Advancement-API.patch
deleted file mode 100644
index ac71201f6..000000000
--- a/patches/api/0008-Advancement-API.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 31 May 2019 21:24:21 -0500
-Subject: [PATCH] Advancement API
-
-
-diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
-index 7c5009974ac8d64d0e738e60cec45acb0d4ca89a..432caadba1b08bb94cdb4ccf552e42400e0db338 100644
---- a/src/main/java/org/bukkit/advancement/Advancement.java
-+++ b/src/main/java/org/bukkit/advancement/Advancement.java
-@@ -3,6 +3,7 @@ package org.bukkit.advancement;
- import java.util.Collection;
- import org.bukkit.Keyed;
- import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
- 
- /**
-  * Represents an advancement that may be awarded to a player. This class is not
-@@ -17,4 +18,12 @@ public interface Advancement extends Keyed {
-      */
-     @NotNull
-     Collection<String> getCriteria();
-+
-+    /**
-+     * Gets the display properties of this advancement
-+     *
-+     * @return The display properties
-+     */
-+    @Nullable
-+    AdvancementDisplay getDisplay();
- }
-diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c2e161e8e14d9949165055b6051708c048e68338
---- /dev/null
-+++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
-@@ -0,0 +1,53 @@
-+package org.bukkit.advancement;
-+
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface AdvancementDisplay {
-+    /**
-+     * Get the title of this advancement
-+     *
-+     * @return Title text
-+     */
-+    @NotNull
-+    String getTitle();
-+
-+    /**
-+     * Get the description of this advancement
-+     *
-+     * @return Description text
-+     */
-+    @NotNull
-+    String getDescription();
-+
-+    /**
-+     * Get the frame type of this advancement
-+     *
-+     * @return Frame type
-+     */
-+    @NotNull
-+    FrameType getFrameType();
-+
-+    /**
-+     * Get if this advancement should be announced in chat when completed
-+     *
-+     * @return True if should announce when completed
-+     */
-+    boolean shouldAnnounceChat();
-+
-+    /**
-+     * Set if this advancement should be announced in chat when completed
-+     *
-+     * @param announceChat True or false
-+     *
-+     */
-+    void shouldAnnounceChat(boolean announceChat);
-+
-+    /**
-+     * Get if this advancement (and all it's children) is hidden from the advancement screen until it has been completed
-+     * <p>
-+     * This has no effect on root advancements themselves, but will alter their children
-+     *
-+     * @return True if hidden until completed
-+     */
-+    boolean isHidden();
-+}
-diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d1757f3d456ff9efce26ce8baa1d16d896908cc2
---- /dev/null
-+++ b/src/main/java/org/bukkit/advancement/FrameType.java
-@@ -0,0 +1,27 @@
-+package org.bukkit.advancement;
-+
-+import org.bukkit.ChatColor;
-+import org.jetbrains.annotations.NotNull;
-+
-+public enum FrameType {
-+    TASK(ChatColor.GREEN),
-+    CHALLENGE(ChatColor.DARK_PURPLE),
-+    GOAL(ChatColor.GREEN);
-+
-+    private final ChatColor color;
-+
-+    FrameType(ChatColor color) {
-+        this.color = color;
-+    }
-+
-+    @NotNull
-+    public ChatColor getColor() {
-+        return color;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public String toString() {
-+        return "FrameType[name=" + name() + ",color=" + color + "]";
-+    }
-+}
diff --git a/patches/api/0009-Llama-API.patch b/patches/api/0008-Llama-API.patch
similarity index 100%
rename from patches/api/0009-Llama-API.patch
rename to patches/api/0008-Llama-API.patch
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0009-AFK-API.patch
similarity index 100%
rename from patches/api/0010-AFK-API.patch
rename to patches/api/0009-AFK-API.patch
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0010-Bring-back-server-name.patch
similarity index 100%
rename from patches/api/0011-Bring-back-server-name.patch
rename to patches/api/0010-Bring-back-server-name.patch
diff --git a/patches/api/0012-ExecuteCommandEvent.patch b/patches/api/0011-ExecuteCommandEvent.patch
similarity index 100%
rename from patches/api/0012-ExecuteCommandEvent.patch
rename to patches/api/0011-ExecuteCommandEvent.patch
diff --git a/patches/api/0013-LivingEntity-safeFallDistance.patch b/patches/api/0012-LivingEntity-safeFallDistance.patch
similarity index 100%
rename from patches/api/0013-LivingEntity-safeFallDistance.patch
rename to patches/api/0012-LivingEntity-safeFallDistance.patch
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0013-Lagging-threshold.patch
similarity index 100%
rename from patches/api/0014-Lagging-threshold.patch
rename to patches/api/0013-Lagging-threshold.patch
diff --git a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch b/patches/api/0015-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/api/0017-EMC-MonsterEggSpawnEvent.patch
rename to patches/api/0015-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/api/0015-ItemFactory-getMonsterEgg.patch b/patches/api/0015-ItemFactory-getMonsterEgg.patch
deleted file mode 100644
index fae6f4cf2..000000000
--- a/patches/api/0015-ItemFactory-getMonsterEgg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 5 Jul 2019 16:37:04 -0500
-Subject: [PATCH] ItemFactory#getMonsterEgg
-
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 0a4466c6ca519c3a5da76ff870fb2a4e3a06effd..858dd1a5df74f9b36966ad55b5b66d4424b00c62 100644
---- a/src/main/java/org/bukkit/inventory/ItemFactory.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -242,4 +242,15 @@ public interface ItemFactory {
-     @Deprecated
-     net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName);
-     // Paper end
-+
-+    // Purpur start
-+    /**
-+     * Get a monster egg ItemStack from an EntityType
-+     *
-+     * @param type EntityType
-+     * @return ItemStack spawner egg
-+     */
-+    @Nullable
-+    ItemStack getMonsterEgg(@Nullable org.bukkit.entity.EntityType type);
-+    // Purpur end
- }
diff --git a/patches/api/0018-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch
similarity index 100%
rename from patches/api/0018-Player-invulnerabilities.patch
rename to patches/api/0016-Player-invulnerabilities.patch
diff --git a/patches/api/0019-Anvil-API.patch b/patches/api/0017-Anvil-API.patch
similarity index 100%
rename from patches/api/0019-Anvil-API.patch
rename to patches/api/0017-Anvil-API.patch
diff --git a/patches/api/0020-ItemStack-convenience-methods.patch b/patches/api/0018-ItemStack-convenience-methods.patch
similarity index 100%
rename from patches/api/0020-ItemStack-convenience-methods.patch
rename to patches/api/0018-ItemStack-convenience-methods.patch
diff --git a/patches/api/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/api/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/api/0022-ChatColor-conveniences.patch b/patches/api/0020-ChatColor-conveniences.patch
similarity index 100%
rename from patches/api/0022-ChatColor-conveniences.patch
rename to patches/api/0020-ChatColor-conveniences.patch
diff --git a/patches/api/0023-LivingEntity-broadcastItemBreak.patch b/patches/api/0021-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/api/0023-LivingEntity-broadcastItemBreak.patch
rename to patches/api/0021-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/api/0024-Item-entity-immunities.patch b/patches/api/0022-Item-entity-immunities.patch
similarity index 100%
rename from patches/api/0024-Item-entity-immunities.patch
rename to patches/api/0022-Item-entity-immunities.patch
diff --git a/patches/api/0025-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0023-Spigot-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/api/0025-Spigot-Improve-output-of-plugins-command.patch
rename to patches/api/0023-Spigot-Improve-output-of-plugins-command.patch
diff --git a/patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/api/0030-Alphabetize-in-game-plugins-list.patch b/patches/api/0026-Alphabetize-in-game-plugins-list.patch
similarity index 100%
rename from patches/api/0030-Alphabetize-in-game-plugins-list.patch
rename to patches/api/0026-Alphabetize-in-game-plugins-list.patch
diff --git a/patches/api/0031-Rabid-Wolf-API.patch b/patches/api/0027-Rabid-Wolf-API.patch
similarity index 100%
rename from patches/api/0031-Rabid-Wolf-API.patch
rename to patches/api/0027-Rabid-Wolf-API.patch
diff --git a/patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
deleted file mode 100644
index 0a0b7c812..000000000
--- a/patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 24 Nov 2020 04:30:34 -0600
-Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
-index 869bad7405ec7fa67728e90d8b9f2e11b542611f..05fde759bbdf6068f140b4428bbcb355e22d6b28 100644
---- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
-@@ -10,15 +10,28 @@ import org.jetbrains.annotations.NotNull;
-  */
- public class EntityDamageByEntityEvent extends EntityDamageEvent {
-     private final Entity damager;
-+    private final boolean isCritical; // Purpur
- 
-     public EntityDamageByEntityEvent(@NotNull final Entity damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
-+        // Purpur start
-+        this(damager, damagee, cause, damage, false);
-+    }
-+    public EntityDamageByEntityEvent(@NotNull final Entity damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage, boolean isCritical) {
-+        // Purpur end
-         super(damagee, cause, damage);
-         this.damager = damager;
-+        this.isCritical = isCritical; // Purpur
-     }
- 
-     public EntityDamageByEntityEvent(@NotNull final Entity damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions) {
-+        // Purpur start
-+        this(damager, damagee, cause, modifiers, modifierFunctions, false);
-+    }
-+    public EntityDamageByEntityEvent(@NotNull final Entity damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions, boolean isCritical) {
-+        // Purpur end
-         super(damagee, cause, modifiers, modifierFunctions);
-         this.damager = damager;
-+        this.isCritical = isCritical; // Purpur
-     }
- 
-     /**
-@@ -30,4 +43,16 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent {
-     public Entity getDamager() {
-         return damager;
-     }
-+
-+    // Purpur start
-+
-+    /**
-+     * Whether this damage was done by a critical hit
-+     *
-+     * @return True if critical hit
-+     */
-+    public boolean isCritical() {
-+        return this.isCritical;
-+    }
-+    // Purpur end
- }
diff --git a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0028-Fix-javadoc-warnings-missing-param-and-return.patch
similarity index 97%
rename from patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
rename to patches/api/0028-Fix-javadoc-warnings-missing-param-and-return.patch
index 97716e539..e336c22d3 100644
--- a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0028-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -489,7 +489,7 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f1b351610185332e9c1e32d4cb7182783d33cc0b..ed67b960689d7b1a686f64f5c77393be56a17ef4 100644
+index c6b478fe41dcd6017571c68f3114442f3c9f6415..cc82fdb614110d32b8efb1d3d8a337776dfbf0fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1688,6 +1688,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -503,7 +503,7 @@ index f1b351610185332e9c1e32d4cb7182783d33cc0b..ed67b960689d7b1a686f64f5c77393be
  
          @NotNull
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 379acee1b5f2d06e6a96f3444783f4a29ca24095..ef3011d74ce9acf02d0ee857033816854134ec0e 100644
+index 0b15fe8b5da29bf691c394098f0203a49504242e..919c76a2d95d77571572855b5688914d0f387846 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -87,6 +87,8 @@ public interface UnsafeValues {
@@ -587,34 +587,6 @@ index 14986911b4d0099ea2c91ab2196a771b7dee4c50..d1eed20ea3b27f0800a08b42b62aac40
       */
      @NotNull
      public static WorldCreator ofKey(@NotNull NamespacedKey worldKey) {
-diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
-index c2e161e8e14d9949165055b6051708c048e68338..2bb3b525a3974b6ccd223b2ba272933c1617ceac 100644
---- a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
-+++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
-@@ -2,6 +2,9 @@ package org.bukkit.advancement;
- 
- import org.jetbrains.annotations.NotNull;
- 
-+/**
-+ * Represents an advancement's display
-+ */
- public interface AdvancementDisplay {
-     /**
-      * Get the title of this advancement
-diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java
-index d1757f3d456ff9efce26ce8baa1d16d896908cc2..a5db52386e11e4b5511ae417a0e7ac92e001de71 100644
---- a/src/main/java/org/bukkit/advancement/FrameType.java
-+++ b/src/main/java/org/bukkit/advancement/FrameType.java
-@@ -3,6 +3,9 @@ package org.bukkit.advancement;
- import org.bukkit.ChatColor;
- import org.jetbrains.annotations.NotNull;
- 
-+/**
-+ * Represents an advancement's display's frame type
-+ */
- public enum FrameType {
-     TASK(ChatColor.GREEN),
-     CHALLENGE(ChatColor.DARK_PURPLE),
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
 index 0006a5a53dfa9fc81c608423e8740a9c820659a3..1eac84f8abf71029e9e0626a9fa93446f9d0df02 100644
 --- a/src/main/java/org/bukkit/block/Block.java
@@ -880,7 +852,7 @@ index a8feed523e4fbf56679166c71e3576b2e978df8c..6fbfddf950e0db559fc804f27ba4a976
      public boolean isTicking();
      // Paper end
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index d36d314383713bac3b11f18d95b0809dce3cd6e0..6a340d660d75968a52005502e6b410e2408140af 100644
+index 48aa290dbcf93715ce58d56d6cf3216948f2f3f2..cf5e2f8cfe425172f5c194689e2d923b109c6929 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
 @@ -20,6 +20,9 @@ import org.jetbrains.annotations.Contract;
@@ -1356,7 +1328,7 @@ index c7b17eabf07b829a02afe7c1f27a5127b6bfea70..d4e2bcf8ce8fc2af851b471490147f00
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 858dd1a5df74f9b36966ad55b5b66d4424b00c62..e7dd844f2359fdaf903632bb3761382ee9dc38b5 100644
+index 8677e273641a46aae7107361f23f6ded59a50dc0..fc6bbe662b1da5ca7f4e98c6cc4457bf00529fd4 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -148,6 +148,7 @@ public interface ItemFactory {
diff --git a/patches/api/0029-Left-handed-API.patch b/patches/api/0029-Left-handed-API.patch
deleted file mode 100644
index a258881fb..000000000
--- a/patches/api/0029-Left-handed-API.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 30 Nov 2020 06:02:54 -0600
-Subject: [PATCH] Left handed API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 07bedbc15ba2463d3c629ae68d229286d4033f79..3e03e97daa8959430cf45ed30c0e21a5943bcfed 100644
---- a/src/main/java/org/bukkit/entity/Mob.java
-+++ b/src/main/java/org/bukkit/entity/Mob.java
-@@ -148,4 +148,20 @@ public interface Mob extends LivingEntity, Lootable {
-      * @return whether the mob is aware
-      */
-     public boolean isAware();
-+
-+    // Purpur start
-+    /**
-+     * Check if Mob is left-handed
-+     *
-+     * @return True if left-handed
-+     */
-+    public boolean isLeftHanded();
-+
-+    /**
-+     * Set if Mob is left-handed
-+     *
-+     * @param leftHanded True if left-handed
-+     */
-+    public void setLeftHanded(boolean leftHanded);
-+    // Purpur end
- }
diff --git a/patches/api/0033-PlayerBookTooLargeEvent.patch b/patches/api/0029-PlayerBookTooLargeEvent.patch
similarity index 100%
rename from patches/api/0033-PlayerBookTooLargeEvent.patch
rename to patches/api/0029-PlayerBookTooLargeEvent.patch
diff --git a/patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0030-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/api/0030-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/api/0035-Add-EntityTeleportHinderedEvent.patch b/patches/api/0031-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/api/0035-Add-EntityTeleportHinderedEvent.patch
rename to patches/api/0031-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/api/0036-Add-StructureGenerateEvent.patch b/patches/api/0032-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/api/0036-Add-StructureGenerateEvent.patch
rename to patches/api/0032-Add-StructureGenerateEvent.patch
diff --git a/patches/api/0037-Add-unsafe-Entity-serialization-API.patch b/patches/api/0033-Add-unsafe-Entity-serialization-API.patch
similarity index 91%
rename from patches/api/0037-Add-unsafe-Entity-serialization-API.patch
rename to patches/api/0033-Add-unsafe-Entity-serialization-API.patch
index a42978cf3..f8b412a1f 100644
--- a/patches/api/0037-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/api/0033-Add-unsafe-Entity-serialization-API.patch
@@ -17,12 +17,12 @@ 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/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index ef3011d74ce9acf02d0ee857033816854134ec0e..b2502aaab690b1414a1adffdf64e5a5456feb99c 100644
+index 919c76a2d95d77571572855b5688914d0f387846..df8469f5a8e4262652e04bdd2eddf5fabe5277f2 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -194,4 +194,28 @@ public interface UnsafeValues {
+@@ -211,4 +211,28 @@ public interface UnsafeValues {
       */
-     int getProtocolVersion();
+     @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
      // Paper end
 +
 +    // Purpur start
diff --git a/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0034-Conflict-on-change-for-adventure-deprecations.patch
similarity index 99%
rename from patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
rename to patches/api/0034-Conflict-on-change-for-adventure-deprecations.patch
index 0aa68c0f7..b2554e8fc 100644
--- a/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api/0034-Conflict-on-change-for-adventure-deprecations.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fa3b34c9e79e57d9385c9160ac654cd5d5f54dc7..f4e35cd1a398cc07842c359ec560eed4596732b4 100644
+index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033f292a28e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -347,7 +347,7 @@ public final class Bukkit {
@@ -72,7 +72,7 @@ index fa3b34c9e79e57d9385c9160ac654cd5d5f54dc7..f4e35cd1a398cc07842c359ec560eed4
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ed67b960689d7b1a686f64f5c77393be56a17ef4..e89d80128b2944efb7e105b92f8f825afe80affb 100644
+index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25a077e531 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -271,7 +271,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0035-Add-enchantment-target-for-bows-and-crossbows.patch
similarity index 100%
rename from patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch
rename to patches/api/0035-Add-enchantment-target-for-bows-and-crossbows.patch
diff --git a/patches/api/0040-Iron-golem-poppy-calms-anger.patch b/patches/api/0036-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/api/0040-Iron-golem-poppy-calms-anger.patch
rename to patches/api/0036-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/api/0041-API-for-any-mob-to-burn-daylight.patch b/patches/api/0037-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from patches/api/0041-API-for-any-mob-to-burn-daylight.patch
rename to patches/api/0037-API-for-any-mob-to-burn-daylight.patch
diff --git a/patches/api/0042-Flying-Fall-Damage-API.patch b/patches/api/0038-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/api/0042-Flying-Fall-Damage-API.patch
rename to patches/api/0038-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0043-Add-back-player-spawned-endermite-API.patch b/patches/api/0039-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/api/0043-Add-back-player-spawned-endermite-API.patch
rename to patches/api/0039-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/api/0044-Fix-default-permission-system.patch b/patches/api/0040-Fix-default-permission-system.patch
similarity index 100%
rename from patches/api/0044-Fix-default-permission-system.patch
rename to patches/api/0040-Fix-default-permission-system.patch
diff --git a/patches/api/0045-Summoner-API.patch b/patches/api/0041-Summoner-API.patch
similarity index 100%
rename from patches/api/0045-Summoner-API.patch
rename to patches/api/0041-Summoner-API.patch
diff --git a/patches/api/0046-Clean-up-version-command-output-for-console.patch b/patches/api/0042-Clean-up-version-command-output-for-console.patch
similarity index 100%
rename from patches/api/0046-Clean-up-version-command-output-for-console.patch
rename to patches/api/0042-Clean-up-version-command-output-for-console.patch
diff --git a/patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/api/0043-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/api/0043-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/api/0048-Extended-OfflinePlayer-API.patch b/patches/api/0044-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/api/0048-Extended-OfflinePlayer-API.patch
rename to patches/api/0044-Extended-OfflinePlayer-API.patch
diff --git a/patches/api/0049-Added-the-ability-to-add-combustible-items.patch b/patches/api/0045-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/api/0049-Added-the-ability-to-add-combustible-items.patch
rename to patches/api/0045-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch
index 22909b27e..59faccb7e 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -147,7 +147,7 @@ index 0277627e97b51e20470ccf578cee48470e06a34b..6a30338648214c98b05feb5a628dbdc6
          int timingHistoryLength = getInt("timings.history-length", 3600);
          timingsServerName = getString("timings.server-name", "Unknown Server");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 416ecbdf244716c2fb1277d7d1df697fe6f77756..86edf7ddd025b54b2fc1907a306168bd56dd5396 100644
+index c2d8294ffeff017a6ec9e7725b50eaef8eb75dfd..6b7006829dde81840bd305ee775d26c9f1ef24f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -268,6 +268,9 @@ public class PaperWorldConfig {
@@ -2683,7 +2683,7 @@ index 1c446dba5de89698397041ee38a2e1a00bec8a56..03371c99c34ba4b2ffde3f6da36f171b
      public final String id;
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1018f4640bab5876c5e0afb5b88f71437fb79662..5905f02cb695ca619ebcd13cad2fc6dff564f5d9 100644
+index cbdff14b26f67b5040c13659f9d64d9ec4c7eaed..71fefe3956c1e4458dd4b441f90902a3ed0cdf24 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2715,7 +2715,7 @@ index 1018f4640bab5876c5e0afb5b88f71437fb79662..5905f02cb695ca619ebcd13cad2fc6df
      public boolean onClimbable() {
          if (this.isSpectator()) {
              return false;
-@@ -3432,7 +3445,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3444,7 +3457,10 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -3977,7 +3977,7 @@ index 3b13f6ea36a3bfecabe09221eb5c48dddab119db..c02b9104c0cc1a7319cca29d5e32a5c2
      @Override
      public T get(int id) {
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index 1ed6573e0ca6b353d1de3b4486e199a5db9aa447..125a067ac989ba05e796c1aa5c28206dbe08eb50 100644
+index 9681e397588a8abc4150b991e546fa79b5635c87..646385d0bef31f43a7273fa78ec696dfc761093c 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -606,6 +606,12 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
@@ -4279,7 +4279,7 @@ index 909b2c98e7a9117d2f737245e4661792ffafb744..9da898c6f44832b4421b8c2745e3121b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 408863b137b7bda3f3e654ac3665ddeefb6d9e7b..efbe385b3a78f4bd0dee6b63d78999513433b79b 100644
+index dcaa189c17dd928d7a19e820ec2ff521e7243b7a..25bb190bf7e08539a3590ee35a01f1d816e48d83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -394,7 +394,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -4317,7 +4317,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..1788d79ea489e446d3d9f541693d4ba3
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b5da2f39ff6e2e7cb519c5d22be6ae4d77dc60ab..79c9f8e81f6592e6d922f6fdfe088a4dd54d44f8 100644
+index 9c456cce42ef9d1654df9047d6fc1e0da13dc1c9..3cc2cf10efbe05cf91876f760c786ab4d2217858 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -37,6 +37,10 @@ import co.aikar.timings.MinecraftTimings;
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch
index 187e17023..15f9bf94a 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cd4ccb208baebd74780443fc575f0ce5b745fdc8..aaf2d1a0197b38f3945b140b83b201147422f544 100644
+index 11f46c1b8f4c8414e0667d1873542c17d6e01f2a..54dc872b1d448c8895313b216d6cd1c9836a5160 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -258,6 +258,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index cd4ccb208baebd74780443fc575f0ce5b745fdc8..aaf2d1a0197b38f3945b140b83b20114
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab 100644
+index 029c21d9416520469548293f9a2ec0c056507d05..f6f12392e119a4742591d8043a0a51fc35a719c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3114,6 +3114,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3119,6 +3119,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
      private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..d75bb089ee91bba87aba51ea95fcfe54
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
-@@ -3138,6 +3139,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3143,6 +3144,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
@@ -43,7 +43,7 @@ index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..d75bb089ee91bba87aba51ea95fcfe54
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2b8e31ae00e786dfbfbf5bb5228b846752cd2543..97bb9b65b14dcd85197717f4d8dce6f52c648ef9 100644
+index c64911651f3d736c83cc83996de04920b091cc57..f497d54966a985d6877b3cd6e0ad5f86e20a345d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2585,4 +2585,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 3382deff0..4df45173d 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -73,10 +73,10 @@ index c1091ab7069fa3dd934409da23d404a7747b1a11..0cd8e3b3af0dc9c8445672ea86cf5113
 +
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab..0f86e3896805e2f6a0e30c421522f031bd5219be 100644
+index f6f12392e119a4742591d8043a0a51fc35a719c5..94fa47af7f3fe98cac637190e533102c94499268 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2421,6 +2421,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2426,6 +2426,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                          ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
  
@@ -201,7 +201,7 @@ index 94f7f8238c01d203d28640c56e35deab2bf17bbc..f0c30ab5e32e78850d402aa4bc7d4266
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5905f02cb695ca619ebcd13cad2fc6dff564f5d9..12ed24bf13079be5dcf5adb95c7cc0f6afc9f332 100644
+index 71fefe3956c1e4458dd4b441f90902a3ed0cdf24..15421740e66f61a818348f57f0d68db69d3577ce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity {
@@ -217,16 +217,16 @@ index 5905f02cb695ca619ebcd13cad2fc6dff564f5d9..12ed24bf13079be5dcf5adb95c7cc0f6
      protected int lerpSteps;
      protected double lerpX;
      protected double lerpY;
-@@ -2584,7 +2584,7 @@ public abstract class LivingEntity extends Entity {
-         return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
+@@ -2585,7 +2585,7 @@ public abstract class LivingEntity extends Entity {
      }
  
+     protected long lastJumpTime = 0L; // Paper - add critical damage API
 -    protected void jumpFromGround() {
 +    public void jumpFromGround() { // Purpur - protected -> public
          double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
          Vec3 vec3d = this.getDeltaMovement();
- 
-@@ -3238,8 +3238,10 @@ public abstract class LivingEntity extends Entity {
+         // Paper start - add critical damage API
+@@ -3250,8 +3250,10 @@ public abstract class LivingEntity extends Entity {
          this.pushEntities();
          this.level.getProfiler().pop();
          // Paper start
@@ -239,7 +239,7 @@ index 5905f02cb695ca619ebcd13cad2fc6dff564f5d9..12ed24bf13079be5dcf5adb95c7cc0f6
                  Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                  Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3249,6 +3251,21 @@ public abstract class LivingEntity extends Entity {
+@@ -3261,6 +3263,21 @@ public abstract class LivingEntity extends Entity {
                      absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                  }
              }
@@ -2106,7 +2106,7 @@ index 82a363c5141cd00eec9b7e03e7ac6522b9b3c527..86e022ef4e3f198e3d36c24ed7179cfe
          this.getBrain().tick((ServerLevel) this.level, this); // CraftBukkit - decompile error
          this.level.getProfiler().pop();
 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 630b6491ee186e1e3f17489311a91681e52b7ff5..3bf85cb1ffcd0179d0048b1bf46def5dc837b87c 100644
+index bf610ede1232d18239f210d32db88466350c5aca..63875471d3c4455955028594dded33293bcf8b81 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
 @@ -113,12 +113,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -4471,7 +4471,7 @@ index 642279bb7e15db9f662094ffd6ded2e3c7af3fd6..ab648e7dafd78f414646cef96b422e87
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ce713e1857121ca52467ad561c4fbb30ae054d87..cb626e4427dd54289660cfa01e48091ca530b752 100644
+index 94e76e295dbd0f3bac4b30a3e7338cd56a971207..218ad12db29d2201667dc252b0ee55b6d94b89f7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -193,6 +193,19 @@ public abstract class Player extends LivingEntity {
@@ -5749,7 +5749,7 @@ index 2712aa554383a3b2b742c945e2f0be7ee96eea69..f8811514c155f743f6e93c9a88721903
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..950d8351881cd0ede3b32e1d07d3e68e06cd8e83 100644
+index c0b46ff81994e037e734b75afadcce372c2ddd7f..f69c762c94f67abb9358c61457bdb0bbba0d9cee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -542,6 +542,15 @@ public class CraftEventFactory {
@@ -5771,7 +5771,7 @@ index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..950d8351881cd0ede3b32e1d07d3e68e
 @@ -965,6 +974,7 @@ public class CraftEventFactory {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
-                 event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
+                 event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
 +                damager.processClick(InteractionHand.MAIN_HAND); // Purpur
              }
              event.setCancelled(cancelled);
@@ -5784,10 +5784,10 @@ index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..950d8351881cd0ede3b32e1d07d3e68e
              return event;
          }
  
-@@ -1101,6 +1112,7 @@ public class CraftEventFactory {
+@@ -1109,6 +1120,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
-             event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
+             event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API
 +            damager.processClick(InteractionHand.MAIN_HAND); // Purpur
          } else {
              event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
diff --git a/patches/server/0008-Configurable-entity-base-attributes.patch b/patches/server/0008-Configurable-entity-base-attributes.patch
index eb52acf2c..b821152ec 100644
--- a/patches/server/0008-Configurable-entity-base-attributes.patch
+++ b/patches/server/0008-Configurable-entity-base-attributes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537764438aa 100644
+index 643f0c878352fd205f928aaa083cde59c911f926..1ab4456b67b1b439b3b0e96f85de0fe104a5b2f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
@@ -18,7 +18,7 @@ index 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537
      private static final int CURRENT_LEVEL = 2;
      public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a791660ed 100644
+index f0c30ab5e32e78850d402aa4bc7d42667610dbf0..8c76074289954aae933dd41184f1f0d346bc6c8b 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -29,6 +29,11 @@ public class GlowSquid extends Squid {
@@ -34,7 +34,7 @@ index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 69acb18fb715c751e3c3c412dae151fb6a8239b6..a7e0126d1fed75bfa810f405a4dd5b70668bf08e 100644
+index 15421740e66f61a818348f57f0d68db69d3577ce..633d8d5cdbd757e56fe5e40937887a027280b08f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity {
@@ -55,7 +55,7 @@ index 69acb18fb715c751e3c3c412dae151fb6a8239b6..a7e0126d1fed75bfa810f405a4dd5b70
          return this.brain;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index e0a55fdff847180d08db0bc6bc7e19281c594a0c..e749f0f3a35783cada224e4b0c12f294c3245210 100644
+index 02eb039e4c17d21649610b0d475bbecfc8574809..1894b630673d399b0f5b65d534fb4ac0bd72b751 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -83,6 +83,18 @@ public class Bat extends AmbientCreature {
@@ -78,7 +78,7 @@ index e0a55fdff847180d08db0bc6bc7e19281c594a0c..e749f0f3a35783cada224e4b0c12f294
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 8632a4047776723088b9b9fa27c6e8093fb17801..56f55c4520bec4b4baaa606e47ecf6c0288a104f 100644
+index 55ab3d403d3b01ea923923ab985c730726754e8a..a52c34dd52198d1d1af991596f84b0b9aa5f1e64 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -209,6 +209,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -94,7 +94,7 @@ index 8632a4047776723088b9b9fa27c6e8093fb17801..56f55c4520bec4b4baaa606e47ecf6c0
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 14822b20971b63290a7022f8efe65693c41664d2..1cbbc29ef19c8f1b8f96882213b662cfcb193033 100644
+index 48e85481372d8e6edf0460423ae488fae21ecdbf..fa2099c98ae60102ad4e555af78ab26aca587dbf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -139,6 +139,11 @@ public class Cat extends TamableAnimal {
@@ -110,7 +110,7 @@ index 14822b20971b63290a7022f8efe65693c41664d2..1cbbc29ef19c8f1b8f96882213b662cf
  
      public ResourceLocation getResourceLocation() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 7a5119e007d69adc9a77fbd167a8d19a9c71c6ff..9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e 100644
+index 0b6cbbb6117bcd61081e3b136cc432058e0c5102..63790e717f11f8cc28f734f81998542164461ee2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -62,6 +62,11 @@ public class Chicken extends Animal {
@@ -126,7 +126,7 @@ index 7a5119e007d69adc9a77fbd167a8d19a9c71c6ff..9fe68301b9a6efd703fb9d2215a9cd3b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
-index 5275e4ed3d552d1e164ef580caf6c247ec5fd8c2..b84aa3aa391aab6c7bcb804ec3cad67264a1e3d5 100644
+index ea7227ade90a713242290cadb13692f33effa5c0..f772c60ab5b4ac5468483d9765386b9b72ad8d0f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
 @@ -23,6 +23,11 @@ public class Cod extends AbstractSchoolingFish {
@@ -142,7 +142,7 @@ index 5275e4ed3d552d1e164ef580caf6c247ec5fd8c2..b84aa3aa391aab6c7bcb804ec3cad672
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 1cb5342d63011605b567a4fe16d07de831f04216..bee82d5bf600cbeacfcede600e5606529af1435e 100644
+index 5939cb25e5ce5fa5c18eb9feddf30816aac6d4c6..205b740eeb3ad2c63a3524948bdfb43a3a7c373e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -50,6 +50,11 @@ public class Cow extends Animal {
@@ -158,7 +158,7 @@ index 1cb5342d63011605b567a4fe16d07de831f04216..bee82d5bf600cbeacfcede600e560652
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 2300abc4e80449e6b92992f6fb8cfe8e99dea351..c372d47a929e06c8cfb0df86cf4e9bfee4d4b300 100644
+index 87e128e67a147b1ff772f12317eee1ebfc91d83e..855ab63797baf825eeaddb4892cbe8430d47da0f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
@@ -174,7 +174,7 @@ index 2300abc4e80449e6b92992f6fb8cfe8e99dea351..c372d47a929e06c8cfb0df86cf4e9bfe
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index ee9dfc609cc9e4a94dca7803e51bb456c1e63389..80749df5d00df415a1b9e7c0e8586625b6453ffb 100644
+index 56395fc555d05a2ff9bf551affa62521bad4893e..c8198d49ca0e159a2d87e21cf73fc901ea79310c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -169,6 +169,11 @@ public class Fox extends Animal {
@@ -190,7 +190,7 @@ index ee9dfc609cc9e4a94dca7803e51bb456c1e63389..80749df5d00df415a1b9e7c0e8586625
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 63b739c86d2ea22aa9a610796ad2f208b0db289e..f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb 100644
+index a5e19967b4488fb662ee2767cef5a1851da96468..8026f2a7bb5fab1762c2fb473bb8a33079df2f87 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 @@ -80,6 +80,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -222,7 +222,7 @@ index 81a393f29643a0cf3478ca8ff640c21153d1514b..b9aeb196f61582801416dab21c12d50e
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc8a58b590 100644
+index 20797bc9e53d5061396ddb6a89e46b46dd2081ae..708b6fb7982dc39ee090ae9a652d48046b833323 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -78,6 +78,11 @@ public class Ocelot extends Animal {
@@ -238,7 +238,7 @@ index 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc
  
      public boolean isTrusting() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index fa9dbb22dd13c650ef08af6030d60c5fc8ee8044..d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e 100644
+index 7ab0b39091910c492a4f860237a33996dbb08b97..68039d84c62005c7b2decde410c0578c6327b043 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -127,6 +127,12 @@ public class Panda extends Animal {
@@ -267,7 +267,7 @@ index fa9dbb22dd13c650ef08af6030d60c5fc8ee8044..d0c10a6d465e2ac9a1bec04080a23dfb
  
          if (this.isLazy()) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index b881f6e948b21ba851913d9f244d74d886f2cc3a..1e38578a9a1531433866e2de7aa0ce5237da3b6b 100644
+index 3950dd170edee24f4a2effc1946e17b3b5f0c792..19caa59e11879b1269196fb0997b899e9e67b586 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -176,6 +176,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
@@ -283,7 +283,7 @@ index b881f6e948b21ba851913d9f244d74d886f2cc3a..1e38578a9a1531433866e2de7aa0ce52
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 80c8ceda47bf8b3ff370f89a61aa01869d606ee6..f4a099e691dce3c57069e76d67859161b459098e 100644
+index 2afacf7a5d15f821e42d98f542dae41c025386d3..ebfeeab7b8aceeb7f0de09200c13647eae5bc32f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -75,6 +75,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -299,7 +299,7 @@ index 80c8ceda47bf8b3ff370f89a61aa01869d606ee6..f4a099e691dce3c57069e76d67859161
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index dc6bc8f10d147cb1d0e5c69b6f6df63b0e8d4531..18780fb268cabb47bb0deb84c44520831c1a762b 100644
+index d91852b85fc6ca7ea85886db5cad7f8d62de7174..62c76aace42a948a117aee3d209fbaac72661740 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -88,6 +88,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -315,7 +315,7 @@ index dc6bc8f10d147cb1d0e5c69b6f6df63b0e8d4531..18780fb268cabb47bb0deb84c4452083
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 42446fd8ba1d78cd5992bc6c2e5259da361eb716..bb1a2d79e0034ca3d8b18cb578049deecd234a05 100644
+index bc1cf0e63c9a1df534017246687f6a13cf976ff8..654ad8cd11bc11432811ed7408c0ce9b473a3245 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -55,6 +55,11 @@ public class Pufferfish extends AbstractFish {
@@ -331,7 +331,7 @@ index 42446fd8ba1d78cd5992bc6c2e5259da361eb716..bb1a2d79e0034ca3d8b18cb578049dee
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 29551a3b87f06c5876de5fda80615acf6c1f4764..587feda351efae19407cb9f23c6c1d42d5ed0cc9 100644
+index 49dd8633267f7cd40cfd671ac00e627d305be32d..fd81c6ad5b7e36e013fd36d72f8db716ad9cae20 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -128,6 +128,11 @@ public class Rabbit extends Animal {
@@ -347,7 +347,7 @@ index 29551a3b87f06c5876de5fda80615acf6c1f4764..587feda351efae19407cb9f23c6c1d42
  
      // CraftBukkit start - code from constructor
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-index 02a9ce0b98bab47d57b51cdfb2194f0e72a9f705..002564221cc53b872001bdb8a76d9ca059212401 100644
+index cf88c1d95a866853568d4fa5f67850bc54127d11..e42bdde7947e532a3a5517c874411a39132bb73e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 @@ -23,6 +23,11 @@ public class Salmon extends AbstractSchoolingFish {
@@ -363,7 +363,7 @@ index 02a9ce0b98bab47d57b51cdfb2194f0e72a9f705..002564221cc53b872001bdb8a76d9ca0
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 5890bf8aa714dc219059bca4950a1b5b1882dd3a..497be3182c72b5a0f3bc42088c4168702119b527 100644
+index db547922585bc8e2aae2d7dc1bbe45a61e8da12c..e142d90d62c80c5e8b888521e4654e2b64b80990 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -126,6 +126,11 @@ public class Sheep extends Animal implements Shearable {
@@ -379,7 +379,7 @@ index 5890bf8aa714dc219059bca4950a1b5b1882dd3a..497be3182c72b5a0f3bc42088c416870
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a..fcf3092ef1863f62d9e76a77c0299ce1495ca1b7 100644
+index 02efae0969dadc85cdeeea7bcfbd5dd15c8b7f89..dac6b75f6b489c880fa2093594102778b675d8ac 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -63,6 +63,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -395,7 +395,7 @@ index 229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a..fcf3092ef1863f62d9e76a77c0299ce1
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 151bb142c553d733367a92b39b430b536e569480..f96def2ebdf114823c322c2d4318d039e20eab97 100644
+index 09066b7e46a414b44f051ad8fdb4c734cc556db5..8f0583a32156b5dcfe0eb6351ce6a0ce341d1e13 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -74,6 +74,11 @@ public class Squid extends WaterAnimal {
@@ -411,7 +411,7 @@ index 151bb142c553d733367a92b39b430b536e569480..f96def2ebdf114823c322c2d4318d039
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 5f61fcffebf4d853711a38d1f315f3def25e31a7..fcd3166a7c818ef089ccf2a687596bef51ad14a6 100644
+index 0ddc45c8dd098b88f12a5a3af8aaa1f7dd928735..2cb3d5d7dc31ff1f23dc2ac5c189172b900c7bf1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -53,6 +53,11 @@ public class TropicalFish extends AbstractSchoolingFish {
@@ -427,7 +427,7 @@ index 5f61fcffebf4d853711a38d1f315f3def25e31a7..fcd3166a7c818ef089ccf2a687596bef
  
      public static String getPredefinedName(int variant) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274c69fcc9a 100644
+index 9395787aa7e406fe9585308d17437bce95f8a5a1..f2b55ebd460fbb95d3d7774cb5ea5bf2d38443b5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -100,6 +100,11 @@ public class Turtle extends Animal {
@@ -443,7 +443,7 @@ index 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274
  
      public void setHomePos(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index bca3300e06d6eb0c6acdfb11d715a1e8447c9198..ae416b70109c959980b3115da6e97df1610996ca 100644
+index e66c2339633f5230ad992d19bad4f12df970d405..2c5fe1e2f4eab38e26ca8ef198f2e6bb2ab20e3c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -108,6 +108,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -459,7 +459,7 @@ index bca3300e06d6eb0c6acdfb11d715a1e8447c9198..ae416b70109c959980b3115da6e97df1
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index f0f1a286011bded016897cc8a0783a8a49a43b33..2542ed327e03c37a3225fac10d4a6659c35512ca 100644
+index a2e0d4653d1a1905d58c684368edf6cedea0b55f..f1c8005c39ead1e61f7d8542711d6ac22be96682 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -105,6 +105,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -475,7 +475,7 @@ index f0f1a286011bded016897cc8a0783a8a49a43b33..2542ed327e03c37a3225fac10d4a6659
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index cb3b6c1866a4c5c05bc6c7f0d4ac03cd747271fe..0ee42f45a9877ffd6df80e602c3cb5affd43d285 100644
+index 86e022ef4e3f198e3d36c24ed7179cfe3d9e79a0..f006b5c508b9ad2b0bc6d489323bab0322f96241 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -82,6 +82,11 @@ public class Goat extends Animal {
@@ -491,7 +491,7 @@ index cb3b6c1866a4c5c05bc6c7f0d4ac03cd747271fe..0ee42f45a9877ffd6df80e602c3cb5af
  
      @Override
 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 fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb8481007c7af88 100644
+index 63875471d3c4455955028594dded33293bcf8b81..44d5f629da36a88e5245e9a2cff39dd946be4ea1 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
 @@ -124,6 +124,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -527,7 +527,7 @@ index fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb84810
      // Purpur end
  
      @Override
-@@ -1134,7 +1160,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -1147,7 +1173,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
              entityData = new AgeableMob.AgeableMobGroupData(0.2F);
          }
  
@@ -537,7 +537,7 @@ index fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb84810
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index e5b13558f45966bf70593931922ca73f4a66c66a..b4944ab2191241dc604ad21670360e5204bc111b 100644
+index db4d5d5e38a44f85c343b632c914f2252c30a3c3..f0da5d107ddb2987ccc89f880ddba5e79fadf0c5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -20,6 +20,21 @@ public class Donkey extends AbstractChestedHorse {
@@ -563,7 +563,7 @@ index e5b13558f45966bf70593931922ca73f4a66c66a..b4944ab2191241dc604ad21670360e52
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index c7b0d6a987644e0b589c143b0b6b68053be04f37..6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c 100644
+index a91152df3d443d70b1aa9aff97b3746e0331c0a6..9f7203608e15fdce1bfbaf419838768763d61378 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -44,6 +44,21 @@ public class Horse extends AbstractHorse {
@@ -589,7 +589,7 @@ index c7b0d6a987644e0b589c143b0b6b68053be04f37..6c6d2ac7551ae24dec88bd9e6bce7aea
  
      @Override
 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 d336e2c63b39b22f9f3a7a84ee059c2d9d71239c..d664be25c2c2c527a44fa939e68e84d60effc144 100644
+index f5616cfbc9bc39a7d8bac37a92110e58ae82b2a2..6ee84f21e5dc64cbd5bdf51acd69fff09494f056 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
 @@ -107,6 +107,21 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -615,7 +615,7 @@ index d336e2c63b39b22f9f3a7a84ee059c2d9d71239c..d664be25c2c2c527a44fa939e68e84d6
  
      public boolean isTraderLlama() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index 40cc7e20913938d6e30e6bca9f4ad70fb5e9435b..da3d0b431c14f1a0794b9445236af1f548139013 100644
+index a67061b875468777ee6256c0b28894c62ebb926c..1ba32a3ba56974425762026026d1e5ba21540b3b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -19,6 +19,21 @@ public class Mule extends AbstractChestedHorse {
@@ -641,7 +641,7 @@ index 40cc7e20913938d6e30e6bca9f4ad70fb5e9435b..da3d0b431c14f1a0794b9445236af1f5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index d4057c300d39eca4ff2e11791ce5ba7993d9b66e..ffc36728e0fc90c4e37051adc643a2b8af8077ff 100644
+index a693f5ff830662e3a958af28503bd55a52130952..8bc2c6a3ee0eec08900b96eea3d0d545616bc513 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -34,6 +34,21 @@ public class SkeletonHorse extends AbstractHorse {
@@ -693,7 +693,7 @@ index ff252d9ca75b90ab7606f63aa5f89b6230e33a36..c4eb99466c00c6cf1d60c7fa387f8b65
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index d328e36015b6b7d6a9e093fbe232eb5ecda46d96..6ca7b168a1ea26102922d9377e52662f16c1e725 100644
+index 77d05979331af91a1fbe619d1c26fa883146add8..48b72eb4051d612648a1978b38299c0c37a3a289 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -32,6 +32,21 @@ public class ZombieHorse extends AbstractHorse {
@@ -735,7 +735,7 @@ index 5df112f87fba042f13f615a22a5c6f850b779bf7..d3caa18f5de2d96eae691655dd13e83f
  
      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 fdc9068de403e98e18af11d4d6c5b708d2cc3c52..f52420f27f51d9dbf214f96a0530c0f17f2bc5fc 100644
+index 9e9b9996293acd721e183fa752b3742ffc54910f..8a4440f766ea39857c1f1ededeed18313e0f38cb 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
 @@ -196,6 +196,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -760,7 +760,7 @@ index fdc9068de403e98e18af11d4d6c5b708d2cc3c52..f52420f27f51d9dbf214f96a0530c0f1
  
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index a5294012d432d5d1fce570a1eb1b1716a24522de..83f9a1139a501135a89a758993c7ff209b5b92d5 100644
+index 5b3eb1ef97b2c0979e28592e0572231e3d92256d..476bcac41d569a9734aa4e97fc11e4776b454ffc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -67,6 +67,11 @@ public class Blaze extends Monster {
@@ -792,7 +792,7 @@ index dd05c5f35d78d1385f793f4e34333ff242d136e1..45b53f11b52cc161775fcaa18567e4a7
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index b9d23fb187541d734b56bfa48ccc18ee4f6d7e88..3a14f975e26530e1c4887844ec0c3967bd15a05b 100644
+index 9f3c6d6a33fa59cad7ffa40d63b140014b92deb2..20d9da3ddd2bc85954b9bcdab238d902238ba518 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -133,6 +133,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -808,7 +808,7 @@ index b9d23fb187541d734b56bfa48ccc18ee4f6d7e88..3a14f975e26530e1c4887844ec0c3967
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index ace909fab2334105eabe0593aba47736e3f67451..591dfcd091c1c4611aeb17dfc5ee493be8131b50 100644
+index 071c77039371688180a189f7715f3d0b62f2287a..a01ee7e62519a3d9f26a4f96360fc9c23ab7e751 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -79,6 +79,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -829,7 +829,7 @@ index ace909fab2334105eabe0593aba47736e3f67451..591dfcd091c1c4611aeb17dfc5ee493b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index 5f8233c1be6f92bcf58c5c5db360b2660c9439ad..55f67061aa4a63105059bfecfb153a579472adc0 100644
+index 1f789b1d481234cafaa6e75c36a272bbd064482e..e25374b06e3babd93cd5bbdd58ea401a92dbb001 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -40,6 +40,11 @@ public class ElderGuardian extends Guardian {
@@ -845,7 +845,7 @@ index 5f8233c1be6f92bcf58c5c5db360b2660c9439ad..55f67061aa4a63105059bfecfb153a57
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index f505cc4fc7945b2b462bc24ee3ecc76995072e14..b92a83cfd15cedf7cd68c26193e65c5f24d9a621 100644
+index b9d8e6d0b7e4d139dada63f0014ef90dd7ca85fc..b0908c864592095a30dc56e010bde02418e2f037 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -93,6 +93,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -861,7 +861,7 @@ index f505cc4fc7945b2b462bc24ee3ecc76995072e14..b92a83cfd15cedf7cd68c26193e65c5f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 1f315cc57f6365a782ca4e645b0dcfbe5485138a..d9e2bc9d37968430910c8de33390004ba5db22a6 100644
+index a7eb3bdb45cfefbe290fdb26bc1444eb46ee8ae6..d5c8cba1c443681e8bf81db1298ea24c954b1136 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -46,6 +46,11 @@ public class Endermite extends Monster {
@@ -877,7 +877,7 @@ index 1f315cc57f6365a782ca4e645b0dcfbe5485138a..d9e2bc9d37968430910c8de33390004b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 053374baf3ec7730bcddf072ddf98e3176656435..0ae0a49da681c6603d6f1504ee58f99b8f345e44 100644
+index 349670deed65a83e4a09e8f71edbb66bd63ff53c..9e50cf5d5b48718b1f8ff74c4de891172970ac12 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -56,6 +56,11 @@ public class Evoker extends SpellcasterIllager {
@@ -893,7 +893,7 @@ index 053374baf3ec7730bcddf072ddf98e3176656435..0ae0a49da681c6603d6f1504ee58f99b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index bb1a6f6847d0e459eb26a029d8a1f5646168a422..e3f479bcc3bd9e28fc4a6ef2f390f79a8e361a3f 100644
+index 8f738130b33b49af84a76f89e1a6b9586adfb420..748eea45acb62cb6180bcf3409c608db2471d164 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 @@ -71,6 +71,11 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -927,7 +927,7 @@ index d95b110a025d48e7ab18f172e455593740e45252..c67f33f2e2e0ff5c2a85782185103325
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index 20b7104b7fd38b3c6c05a68a1472c6006814cb81..2a25dbf9449ebc63587f24346ee92bd3115ad4d6 100644
+index e825e974c8586928dbc18c5d69071e17ccfe01c5..add17a3a1766172cfbcec9651c93cb89e020c31d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 @@ -87,6 +87,11 @@ public class Guardian extends Monster {
@@ -943,7 +943,7 @@ index 20b7104b7fd38b3c6c05a68a1472c6006814cb81..2a25dbf9449ebc63587f24346ee92bd3
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 75397a8e1ae8d48bf07f5c0409536acd54851c48..464e062bba03a17c9281b3dfb8fa9193c1b81150 100644
+index 82a14d717e8f2ee005c2c410625b811cd016cdc3..81a3f6c1774b187be96b412dae44be623ce7f6cb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
 @@ -32,6 +32,16 @@ public class Husk extends Zombie {
@@ -964,7 +964,7 @@ index 75397a8e1ae8d48bf07f5c0409536acd54851c48..464e062bba03a17c9281b3dfb8fa9193
  
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 5f57c14a7ba03af9432a839e6caed47286638b2c..c4c239ab51c48a2b9c12e547dc7e125955911794 100644
+index c03e5836a313876d856c6318b288946c4ebd1af9..23074f7dd2e670e884ac5f6386c16e853bb0144f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 @@ -69,6 +69,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
@@ -982,7 +982,7 @@ index 5f57c14a7ba03af9432a839e6caed47286638b2c..c4c239ab51c48a2b9c12e547dc7e1259
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 7d39f25734f2c52b11931e141524acd2c244c2c5..87aae8fa18704e58f2b1fc0abd1a98987715123f 100644
+index 95741b63d68bdf815212d718c3cc0fc689c0e4de..68abf045f0510abc45bdc2fd8c147f27c2fa784d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -42,6 +42,16 @@ public class MagmaCube extends Slime {
@@ -1003,7 +1003,7 @@ index 7d39f25734f2c52b11931e141524acd2c244c2c5..87aae8fa18704e58f2b1fc0abd1a9898
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 61aff98a7b56eab6a43ddc9f07618cbbedb6b77d..5e069ac0c57d2a3a23f6e4483d12ce298d172691 100644
+index fda285444538ae09cef15ecc0f68836902f3c474..5e71b3d5126d30626fbc9bd4b9eefebd20916e60 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -112,6 +112,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -1019,7 +1019,7 @@ index 61aff98a7b56eab6a43ddc9f07618cbbedb6b77d..5e069ac0c57d2a3a23f6e4483d12ce29
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index 84bd5e7df663f315fd099742195e85508ea25adf..48a1bd4c9c7e36e42797937ea1af3d213f418da4 100644
+index 2137f8133f03467667296f94a26a285288e8c352..4276c33261995dba3fb71c7b700e550824fcd123 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 @@ -76,6 +76,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -1035,7 +1035,7 @@ index 84bd5e7df663f315fd099742195e85508ea25adf..48a1bd4c9c7e36e42797937ea1af3d21
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b..b8c753a574487cdc045ea334229aafd257d6e223 100644
+index 23b0fe96aab0234e17c43423817c4f34c694751a..13f4b6d17312dd7379875eb56049c87c10deae88 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -86,6 +86,11 @@ public class Ravager extends Raider {
@@ -1051,7 +1051,7 @@ index 32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b..b8c753a574487cdc045ea334229aafd2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 42635be6183d86978df3f174c74a71691f2bfcdd..d6fdaa9f9033d8b1e8aa9ef0aace387e286ebce9 100644
+index ec41c07f2f7d7c4c24b54a2fbf5cd2b73d8d1247..6a0a82498360d1721f8cdb5801552379943a76b6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -102,6 +102,11 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -1067,7 +1067,7 @@ index 42635be6183d86978df3f174c74a71691f2bfcdd..d6fdaa9f9033d8b1e8aa9ef0aace387e
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index e66cc79dc61721b31ffb743f68f4388cc499a92d..0d60d6352294fadc1a26579a712b01cf0da681af 100644
+index 44d8ef55d47ff63589e6b47210f460a04a146291..1c523c384668b483ba0211c413ade7b87c7ca16a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -49,6 +49,11 @@ public class Silverfish extends Monster {
@@ -1083,7 +1083,7 @@ index e66cc79dc61721b31ffb743f68f4388cc499a92d..0d60d6352294fadc1a26579a712b01cf
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 059a62da29b7ec11e2ff9baf18dde788bec4923c..5a2759e636717920a6b34ddbda34a1106a88714b 100644
+index 8bfcfbae5046e3089b85194cfb1fe1a57d285647..2e7cf694805927e251f9208b377a807a60ac13cf 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -35,6 +35,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -1099,7 +1099,7 @@ index 059a62da29b7ec11e2ff9baf18dde788bec4923c..5a2759e636717920a6b34ddbda34a110
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 342c6158f6fc145a779ed60b48698e14a944726b..01d04bf183743bf892be25fe839f3f5cf7ccff42 100644
+index cf5e780a1708c7d72bb07da2565792fa09a87c77..7f3b89aa8bd92f821baa31b3fe47a02c43b6a3ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy {
@@ -1143,7 +1143,7 @@ index 342c6158f6fc145a779ed60b48698e14a944726b..01d04bf183743bf892be25fe839f3f5c
          this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue((double) j);
          if (heal) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 5874d86ca34200e9ce7d41cf7a80eb0f1f13410c..7ed31ccc9fbb3960f9de24d5893f7fa1f86ab4b8 100644
+index 62760822ef8837d20dfa7ed92a64e14574098c23..20100770115430c100ab73a341ae7f613e50f4f0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -61,6 +61,11 @@ public class Spider extends Monster {
@@ -1159,7 +1159,7 @@ index 5874d86ca34200e9ce7d41cf7a80eb0f1f13410c..7ed31ccc9fbb3960f9de24d5893f7fa1
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 6a8a0cd09e0bf17c7ecb6e55342b645f111dac22..d2eb323c8957ac4ccdf2ab73d83dbbdeefd6ae53 100644
+index 8480687e452b7cad0d3e434cebe17e15c59bdc40..86b1c7a1ddd33249ce3d1ff25030d4218058af2c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -31,6 +31,11 @@ public class Stray extends AbstractSkeleton {
@@ -1175,7 +1175,7 @@ index 6a8a0cd09e0bf17c7ecb6e55342b645f111dac22..d2eb323c8957ac4ccdf2ab73d83dbbde
  
      public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 6c0af80f47c53e4573efb0c50412d289c0bb5540..2d7b83ce2e0e26ef3976514ec8921a718ccc28bd 100644
+index dcf31bc288e8371c17574a3dd4b495ea2c7a8dac..0f7383849399db1218acda986fe29ac14a36d768 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -107,6 +107,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -1191,7 +1191,7 @@ index 6c0af80f47c53e4573efb0c50412d289c0bb5540..2d7b83ce2e0e26ef3976514ec8921a71
  
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index c914cfc75cc0426c0333a6bb30aab7b9e4c52971..18d650befe5f257b9e8f269e605de70d4201dd5c 100644
+index 589a6f8db279c52cc7f19d7c14d08bf46ebffd7c..620b1692bda9c69ba39547b0bdcfd408a62bc5e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -94,6 +94,11 @@ public class Vex extends Monster {
@@ -1207,7 +1207,7 @@ index c914cfc75cc0426c0333a6bb30aab7b9e4c52971..18d650befe5f257b9e8f269e605de70d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index a3b1332a92824255b807adc9a5a1d29569e7073b..76e6ea34db3942e9dd7646ad7ca1259f4387a4d8 100644
+index cbd170cec638dfcd19c2d597e2b39bbcf38c570d..9b4a20a78f24d4b05fefbf2a7d05686ef9cc8adb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -67,6 +67,11 @@ public class Vindicator extends AbstractIllager {
@@ -1223,7 +1223,7 @@ index a3b1332a92824255b807adc9a5a1d29569e7073b..76e6ea34db3942e9dd7646ad7ca1259f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index e70fb661c62add74cdbe9fc9ef1e3143e96333b2..0876224d15b7b08954ab4348f942d2aaf91aa078 100644
+index 0eb8010cc701014d5dd9b6c1ec167e0befcedeb9..9e0f91d4aa1c52d865e9f27ff876590740d6f650 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -70,6 +70,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -1239,7 +1239,7 @@ index e70fb661c62add74cdbe9fc9ef1e3143e96333b2..0876224d15b7b08954ab4348f942d2aa
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 4cea4ba127dc036ce5d585323a25bbcf06bd46a6..16d7266c32f5aa5cb980bf07d9d92c41c6405a2f 100644
+index 570a7f7c63cae90563129dc04aeb76a0d97ffcc3..5f01beb931546a8bfc714754a65c1c9dbd2ebf8b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -44,6 +44,11 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -1255,7 +1255,7 @@ index 4cea4ba127dc036ce5d585323a25bbcf06bd46a6..16d7266c32f5aa5cb980bf07d9d92c41
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 8fd4e26ebe0527fd8a69b15095dd4091fcdde206..7afc9b83e385d711096db5ea9c6c259fd2387075 100644
+index 175ff8a67b4ac28efef112bd75508a059d6c1f50..1d5726b5ae153cb51fb0e4d343ed999335098869 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -77,6 +77,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -1271,7 +1271,7 @@ index 8fd4e26ebe0527fd8a69b15095dd4091fcdde206..7afc9b83e385d711096db5ea9c6c259f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 6dee348b4e1faec208e5144527ca3df0dab4f96e..c3288e6a5be2c0805067fe14496315afd6156110 100644
+index 9d911c5e217207e3030f9dec2daef64ae5d09e7f..dd9a7494184f36b64ea8461750a1cff4178e13aa 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -117,6 +117,11 @@ public class Zombie extends Monster {
@@ -1317,7 +1317,7 @@ index d487b4cb2da18eac12ec3dc71997cdc1217a85f6..9c60e3b3e62a29d6898c82a4110ffd4d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 708ba2c64a0736a30e477017b46dc711948cfc3d..8464026df1b46ad30301fed4944aa1d3cd39bd9e 100644
+index 8e5fb46d3c56a71788d02eb1865b597553c7de8e..cc5bd132bbd40aba8c910695f25a896c5f4fe635 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -68,6 +68,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -1342,7 +1342,7 @@ index 708ba2c64a0736a30e477017b46dc711948cfc3d..8464026df1b46ad30301fed4944aa1d3
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 060676e094c425ab11889ee221808e5814d34f43..fb0aa2854f8be22682ee65298080b668c722f447 100644
+index aabaf7feef222515bf59a5c3e33ee624168f46a8..2cd4f8b34611f20aaee1eba89ac831bb00c3470f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -77,6 +77,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1358,7 +1358,7 @@ index 060676e094c425ab11889ee221808e5814d34f43..fb0aa2854f8be22682ee65298080b668
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index ace6891fd0e14af5268249b60e14a99c17a2f435..79f075e7d7e5d8312f5a9ed47bea2a558b9491d5 100644
+index 34fbe1853742dcbd6d0abd45bebcb3a21422d0b0..e395f540590b9a820fb445e31ab48b79493bd2ff 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -107,6 +107,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1374,7 +1374,7 @@ index ace6891fd0e14af5268249b60e14a99c17a2f435..79f075e7d7e5d8312f5a9ed47bea2a55
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca273759efa6eb 100644
+index 5025d4571a34fe9e0e58ada6b81b064716b8f672..f6734f2eb44af7b2389de5079831e0e4f8a1c742 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -50,6 +50,11 @@ public class PiglinBrute extends AbstractPiglin {
@@ -1390,7 +1390,7 @@ index d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca2737
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 8a37e6b42a50da4822389004123e3b72b33f50b4..682feb6f3c109b0b3034f3942f7dfa73721d359b 100644
+index 7d10225fd52c4291f13eb644716aa3949c6037e6..209028dd99690d1cc8589581aac47b3603d526d5 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -172,6 +172,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1406,7 +1406,7 @@ index 8a37e6b42a50da4822389004123e3b72b33f50b4..682feb6f3c109b0b3034f3942f7dfa73
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index d6c31596e21041a124a263054ccb6447829eccdd..d2588a91b55aebdecf8e1644498111ccf84a9dc9 100644
+index ab648e7dafd78f414646cef96b422e87da5c1982..0bcfece84ac11f04671ed38a99b31da9f8b03858 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -77,6 +77,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0011-Advancement-API.patch b/patches/server/0011-Advancement-API.patch
deleted file mode 100644
index 6f1fd1b39..000000000
--- a/patches/server/0011-Advancement-API.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 31 May 2019 21:24:33 -0500
-Subject: [PATCH] Advancement API
-
-
-diff --git a/src/main/java/net/minecraft/advancements/DisplayInfo.java b/src/main/java/net/minecraft/advancements/DisplayInfo.java
-index dea17bc7a6e4db470afaaad3c98940297a50e4e4..fcce31f9d575cc7388d8ec4bc2e088c9f4781833 100644
---- a/src/main/java/net/minecraft/advancements/DisplayInfo.java
-+++ b/src/main/java/net/minecraft/advancements/DisplayInfo.java
-@@ -23,10 +23,11 @@ public class DisplayInfo {
-     private final ResourceLocation background;
-     private final FrameType frame;
-     private final boolean showToast;
--    private final boolean announceChat;
--    private final boolean hidden;
-+    private boolean announceChat; // Purpur - un-finalize
-+    private boolean hidden; // Purpur - un-finalize
-     private float x;
-     private float y;
-+    public final org.bukkit.advancement.AdvancementDisplay bukkit = new org.bukkit.craftbukkit.advancement.CraftAdvancementDisplay(this); // Purpur
- 
-     public DisplayInfo(ItemStack icon, Component title, Component description, @Nullable ResourceLocation background, FrameType frame, boolean showToast, boolean announceToChat, boolean hidden) {
-         this.title = title;
-@@ -85,6 +86,16 @@ public class DisplayInfo {
-         return this.hidden;
-     }
- 
-+    // Purpur start
-+    public final void shouldAnnounceChat(boolean announceChat) {
-+        this.announceChat = announceChat;
-+    }
-+
-+    public final void hidden(boolean hidden) {
-+        this.hidden = hidden;
-+    }
-+    // Purpur end
-+
-     public static DisplayInfo fromJson(JsonObject obj) {
-         Component component = Component.Serializer.fromJson(obj.get("title"));
-         Component component2 = Component.Serializer.fromJson(obj.get("description"));
-diff --git a/src/main/java/net/minecraft/advancements/FrameType.java b/src/main/java/net/minecraft/advancements/FrameType.java
-index 2f90574158e0c742548ef2930a787821bb0ffcd3..28803f5d14e266f7cde3385e3782a7f0646eaadc 100644
---- a/src/main/java/net/minecraft/advancements/FrameType.java
-+++ b/src/main/java/net/minecraft/advancements/FrameType.java
-@@ -5,16 +5,23 @@ import net.minecraft.network.chat.Component;
- import net.minecraft.network.chat.TranslatableComponent;
- 
- public enum FrameType {
--    TASK("task", 0, ChatFormatting.GREEN),
--    CHALLENGE("challenge", 26, ChatFormatting.DARK_PURPLE),
--    GOAL("goal", 52, ChatFormatting.GREEN);
-+    // Purpur start
-+    TASK("task", 0, ChatFormatting.GREEN, org.bukkit.advancement.FrameType.TASK),
-+    CHALLENGE("challenge", 26, ChatFormatting.DARK_PURPLE, org.bukkit.advancement.FrameType.CHALLENGE),
-+    GOAL("goal", 52, ChatFormatting.GREEN, org.bukkit.advancement.FrameType.GOAL);
-+    // Purpur end
- 
-     private final String name;
-     private final int texture;
-     private final ChatFormatting chatColor;
-     private final Component displayName;
- 
--    private FrameType(String id, int texV, ChatFormatting titleFormat) {
-+    // Purpur start
-+    public final org.bukkit.advancement.FrameType bukkit;
-+
-+    FrameType(String id, int texV, ChatFormatting titleFormat, org.bukkit.advancement.FrameType bukkit) {
-+        this.bukkit = bukkit;
-+        // Purpur end
-         this.name = id;
-         this.texture = texV;
-         this.chatColor = titleFormat;
-diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-index 20d51358b4b47cbf43c3d172765243e96aa1966c..5ab7896621911f56ab857e81e11816e1f36d3817 100644
---- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-@@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
-     public Collection<String> getCriteria() {
-         return Collections.unmodifiableCollection(this.handle.getCriteria().keySet());
-     }
-+
-+    // Purpur start
-+    @Override
-+    public org.bukkit.advancement.AdvancementDisplay getDisplay() {
-+        return getHandle().getDisplay() == null ? null : getHandle().getDisplay().bukkit;
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..504c815759c8a515b68b8ddbe9ba5a7941830202
---- /dev/null
-+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
-@@ -0,0 +1,47 @@
-+package org.bukkit.craftbukkit.advancement;
-+
-+import net.minecraft.advancements.DisplayInfo;
-+import org.bukkit.advancement.FrameType;
-+import org.bukkit.craftbukkit.util.CraftChatMessage;
-+
-+public class CraftAdvancementDisplay implements org.bukkit.advancement.AdvancementDisplay {
-+    private final DisplayInfo handle;
-+
-+    public CraftAdvancementDisplay(DisplayInfo handle) {
-+        this.handle = handle;
-+    }
-+
-+    public DisplayInfo getHandle() {
-+        return handle;
-+    }
-+
-+    @Override
-+    public String getTitle() {
-+        return CraftChatMessage.fromComponent(handle.getTitle());
-+    }
-+
-+    @Override
-+    public String getDescription() {
-+        return CraftChatMessage.fromComponent(handle.getDescription());
-+    }
-+
-+    @Override
-+    public FrameType getFrameType() {
-+        return handle.getFrame().bukkit;
-+    }
-+
-+    @Override
-+    public boolean shouldAnnounceChat() {
-+        return handle.shouldAnnounceChat();
-+    }
-+
-+    @Override
-+    public void shouldAnnounceChat(boolean announceChat) {
-+        handle.shouldAnnounceChat(announceChat);
-+    }
-+
-+    @Override
-+    public boolean isHidden() {
-+        return handle.isHidden();
-+    }
-+}
diff --git a/patches/server/0012-Llama-API.patch b/patches/server/0011-Llama-API.patch
similarity index 98%
rename from patches/server/0012-Llama-API.patch
rename to patches/server/0011-Llama-API.patch
index 5f347ee25..c34e08aee 100644
--- a/patches/server/0012-Llama-API.patch
+++ b/patches/server/0011-Llama-API.patch
@@ -25,7 +25,7 @@ index e037d618955de9a213a9cd90752b29d189faace4..34dec0a94840a8865f1d80857ec54a10
              double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
              if (d > 676.0D) {
 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 d664be25c2c2c527a44fa939e68e84d60effc144..5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d 100644
+index 6ee84f21e5dc64cbd5bdf51acd69fff09494f056..98da60e297f08dc77bf1cd754458cb138ca9d219 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
 @@ -65,6 +65,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0012-AFK-API.patch
similarity index 96%
rename from patches/server/0013-AFK-API.patch
rename to patches/server/0012-AFK-API.patch
index 5fb80663d..046e60a27 100644
--- a/patches/server/0013-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ba8dfbf213bc060eaafe2ea35603a38965d3ff3..20f62a092eb4d37c2502125002fe61d768a65b8a 100644
+index 0cd8e3b3af0dc9c8445672ea86cf5113dd51d3e8..a414d11f9bdf1d3432bcbecb6574f8fafd4478bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1953,8 +1953,58 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 6ba8dfbf213bc060eaafe2ea35603a38965d3ff3..20f62a092eb4d37c2502125002fe61d7
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0f86e3896805e2f6a0e30c421522f031bd5219be..86d77f244e0abd97480048e28f7bfa5293994086 100644
+index 94fa47af7f3fe98cac637190e533102c94499268..d12d2db33d26dc9ea582f0eaa9930f25f8c2744b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -294,6 +294,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -114,7 +114,7 @@ index 0f86e3896805e2f6a0e30c421522f031bd5219be..86d77f244e0abd97480048e28f7bfa52
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1420,7 +1442,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1425,7 +1447,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                              if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
                                  flag1 = true; // Paper - diff on change, this should be moved wrongly
@@ -123,7 +123,7 @@ index 0f86e3896805e2f6a0e30c421522f031bd5219be..86d77f244e0abd97480048e28f7bfa52
                              }
  
                              this.player.absMoveTo(d0, d1, d2, f, f1);
-@@ -1470,6 +1492,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1475,6 +1497,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  
@@ -182,7 +182,7 @@ index 8a0aea6b28295e03aaac1768336b1bc36d9ad9e9..30fef94aa85d7caa4c785ef0a7de4f3c
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d7850a9bc7cf78e2b17d9d171302ce07596f9735..9ffe8832ef9b74ed3794243965d0cc3d3fbc4ef5 100644
+index 218ad12db29d2201667dc252b0ee55b6d94b89f7..3d66d2e86cef17bcd8813d4c2b29078beebf23fe 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -196,6 +196,13 @@ public abstract class Player extends LivingEntity {
@@ -263,7 +263,7 @@ index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf5
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 97bb9b65b14dcd85197717f4d8dce6f52c648ef9..34f93861d296fd66758286129be0fb7eebb59011 100644
+index f497d54966a985d6877b3cd6e0ad5f86e20a345d..e28ad069f6f4aef78810171ef56448497849c6bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -305,7 +305,7 @@ index 97bb9b65b14dcd85197717f4d8dce6f52c648ef9..34f93861d296fd66758286129be0fb7e
      // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 79c9f8e81f6592e6d922f6fdfe088a4dd54d44f8..1f70281055634f06cfe7e8026c552aff525e973a 100644
+index 3cc2cf10efbe05cf91876f760c786ab4d2217858..ff33287dabcc9724920e747d53efb4dada006cb2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -198,6 +198,7 @@ public class ActivationRange
diff --git a/patches/server/0014-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch
similarity index 100%
rename from patches/server/0014-Bring-back-server-name.patch
rename to patches/server/0013-Bring-back-server-name.patch
diff --git a/patches/server/0015-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch
similarity index 100%
rename from patches/server/0015-Configurable-server-mod-name.patch
rename to patches/server/0014-Configurable-server-mod-name.patch
diff --git a/patches/server/0016-LivingEntity-safeFallDistance.patch b/patches/server/0015-LivingEntity-safeFallDistance.patch
similarity index 95%
rename from patches/server/0016-LivingEntity-safeFallDistance.patch
rename to patches/server/0015-LivingEntity-safeFallDistance.patch
index 6f32840c6..5b8cf5493 100644
--- a/patches/server/0016-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0015-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d7282784d894e178a352819343ce5af173343bb5..be604faf54b061494df022e4af1b6ac0d6ff4b1f 100644
+index 633d8d5cdbd757e56fe5e40937887a027280b08f..bdab5361e6fb42a30380ad76a08dd4d1fda92520 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -254,6 +254,7 @@ public abstract class LivingEntity extends Entity {
@@ -37,7 +37,7 @@ index d7282784d894e178a352819343ce5af173343bb5..be604faf54b061494df022e4af1b6ac0
  
      protected void playBlockFallSound() {
 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 ace7f09ab3a3c1d32635679cbfa479afd9d3b1cb..41bd09ca3cfc722f03d6bf8361f56f8fe0721b87 100644
+index 44d5f629da36a88e5245e9a2cff39dd946be4ea1..dbd34f589a146b9b408318c3810321ab6bce57f6 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
 @@ -321,7 +321,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
diff --git a/patches/server/0017-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch
similarity index 100%
rename from patches/server/0017-Lagging-threshold.patch
rename to patches/server/0016-Lagging-threshold.patch
diff --git a/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 97%
rename from patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
index 08578abed..96bd0ecaf 100644
--- a/patches/server/0019-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -43,7 +43,7 @@ index 03371c99c34ba4b2ffde3f6da36f171b582e3c3f..d354b44ecabdd2ce245c224c6e22bfd5
          if (this.descriptionId == null) {
              this.descriptionId = Util.makeDescriptionId("entity", Registry.ENTITY_TYPE.getKey(this));
 diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index 6afba641943717cc9c75420d9f3af1048543a17e..45e964a15a8afb85dd91638e800beaf0a6efdde9 100644
+index 6cb0be998757d3ec89cc1064480c3a3ddc3cc381..deb02b8263dd9fe4196cb1db3d73ed9db533f41d 100644
 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 @@ -68,6 +68,15 @@ public class SpawnEggItem extends Item {
diff --git a/patches/server/0020-EMC-MonsterEggSpawnEvent.patch b/patches/server/0018-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/server/0020-EMC-MonsterEggSpawnEvent.patch
rename to patches/server/0018-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/server/0018-ItemFactory-getMonsterEgg.patch b/patches/server/0018-ItemFactory-getMonsterEgg.patch
deleted file mode 100644
index e00881e8e..000000000
--- a/patches/server/0018-ItemFactory-getMonsterEgg.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 5 Jul 2019 16:36:55 -0500
-Subject: [PATCH] ItemFactory#getMonsterEgg
-
-
-diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index b16f338a001254c700fe4e10a5cec0d6dc7bd127..6afba641943717cc9c75420d9f3af1048543a17e 100644
---- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-@@ -36,7 +36,7 @@ import net.minecraft.world.phys.Vec3;
- 
- public class SpawnEggItem extends Item {
- 
--    private static final Map<EntityType<? extends Mob>, SpawnEggItem> BY_ID = Maps.newIdentityHashMap();
-+    public static final Map<EntityType<? extends Mob>, SpawnEggItem> BY_ID = Maps.newIdentityHashMap(); // Purpur - private -> public
-     private final int backgroundColor;
-     private final int highlightColor;
-     private final EntityType<?> defaultType;
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index aa7fd5c80712fecca1110341a234f60e8607b809..6cae01e0f66b3c88a4e0c241dd6e68f0bb96a1f9 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -410,4 +410,18 @@ public final class CraftItemFactory implements ItemFactory {
-             new net.md_5.bungee.api.chat.TextComponent(customName));
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public ItemStack getMonsterEgg(org.bukkit.entity.EntityType type) {
-+        if (type == null) {
-+            return null;
-+        }
-+        String name = type.getKey().toString();
-+        net.minecraft.resources.ResourceLocation key = new net.minecraft.resources.ResourceLocation(name);
-+        net.minecraft.world.entity.EntityType<?> types = net.minecraft.world.entity.EntityType.getFromKey(key);
-+        net.minecraft.world.item.SpawnEggItem egg = net.minecraft.world.item.SpawnEggItem.BY_ID.get(types);
-+        return new net.minecraft.world.item.ItemStack(egg).asBukkitMirror();
-+    }
-+    // Purpur end
- }
diff --git a/patches/server/0021-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch
similarity index 98%
rename from patches/server/0021-Player-invulnerabilities.patch
rename to patches/server/0019-Player-invulnerabilities.patch
index 49e727d78..24f87362f 100644
--- a/patches/server/0021-Player-invulnerabilities.patch
+++ b/patches/server/0019-Player-invulnerabilities.patch
@@ -82,10 +82,10 @@ index a414d11f9bdf1d3432bcbecb6574f8fafd4478bb..724e5975758f3055b210f96fcc208c81
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86d77f244e0abd97480048e28f7bfa5293994086..89b64a54cb05e341db415c95aaeecf2e1d956419 100644
+index d12d2db33d26dc9ea582f0eaa9930f25f8c2744b..c0a1e171c882b4adc8b1fa180d4fb3ad9d6959a5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1935,12 +1935,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1940,12 +1940,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      @Override
      public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
diff --git a/patches/server/0022-Anvil-API.patch b/patches/server/0020-Anvil-API.patch
similarity index 100%
rename from patches/server/0022-Anvil-API.patch
rename to patches/server/0020-Anvil-API.patch
diff --git a/patches/server/0023-Configurable-villager-brain-ticks.patch b/patches/server/0021-Configurable-villager-brain-ticks.patch
similarity index 97%
rename from patches/server/0023-Configurable-villager-brain-ticks.patch
rename to patches/server/0021-Configurable-villager-brain-ticks.patch
index 3e949a9d6..fe4c47745 100644
--- a/patches/server/0023-Configurable-villager-brain-ticks.patch
+++ b/patches/server/0021-Configurable-villager-brain-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 682feb6f3c109b0b3034f3942f7dfa73721d359b..14b27c84624467615ad7cc4d5df94cd60fccb8f0 100644
+index 209028dd99690d1cc8589581aac47b3603d526d5..698276aaa1f5bef4dcdd7a64009737086326c9ad 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -141,6 +141,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0024-Alternative-Keepalive-Handling.patch b/patches/server/0022-Alternative-Keepalive-Handling.patch
similarity index 96%
rename from patches/server/0024-Alternative-Keepalive-Handling.patch
rename to patches/server/0022-Alternative-Keepalive-Handling.patch
index d99965808..4d9aac887 100644
--- a/patches/server/0024-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0022-Alternative-Keepalive-Handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c69c663d9f569cf15381ed63031a34a5e2ffac7d..94d526fd0c1e8c68638fdeadf088b70889452d5f 100644
+index c0a1e171c882b4adc8b1fa180d4fb3ad9d6959a5..b692c3160c430277dc571207e73e6db44aee314b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index c69c663d9f569cf15381ed63031a34a5e2ffac7d..94d526fd0c1e8c68638fdeadf088b708
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3106,6 +3122,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3111,6 +3127,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
diff --git a/patches/server/0025-Silk-touch-spawners.patch b/patches/server/0023-Silk-touch-spawners.patch
similarity index 100%
rename from patches/server/0025-Silk-touch-spawners.patch
rename to patches/server/0023-Silk-touch-spawners.patch
diff --git a/patches/server/0026-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 100%
rename from patches/server/0026-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch
diff --git a/patches/server/0027-Fix-vanilla-command-permission-handler.patch b/patches/server/0025-Fix-vanilla-command-permission-handler.patch
similarity index 100%
rename from patches/server/0027-Fix-vanilla-command-permission-handler.patch
rename to patches/server/0025-Fix-vanilla-command-permission-handler.patch
diff --git a/patches/server/0028-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
similarity index 97%
rename from patches/server/0028-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
index 1837d4af8..28aee707d 100644
--- a/patches/server/0028-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
@@ -29,7 +29,7 @@ index 63a4fa2408edf84b490ca39e824977135d78eff0..461796c9c559f43bd2e0126b12a46bfc
                  } else {
                      handler.accept((Recipe) optional.get());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index db286d3c0d37603e5f06cfff4642b321e879e6b4..62396ba628de428c05d4e803e489503607391e9b 100644
+index 4b6bb477db0af506508e73dd42155429777b49d0..7f08a6a0e92300825ca90aeb55379a07474b76e5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -232,4 +232,13 @@ public class PurpurConfig {
diff --git a/patches/server/0029-Disable-outdated-build-check.patch b/patches/server/0027-Disable-outdated-build-check.patch
similarity index 100%
rename from patches/server/0029-Disable-outdated-build-check.patch
rename to patches/server/0027-Disable-outdated-build-check.patch
diff --git a/patches/server/0030-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch
similarity index 100%
rename from patches/server/0030-Giants-AI-settings.patch
rename to patches/server/0028-Giants-AI-settings.patch
diff --git a/patches/server/0031-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch
similarity index 97%
rename from patches/server/0031-Zombie-horse-naturally-spawn.patch
rename to patches/server/0029-Zombie-horse-naturally-spawn.patch
index ea5ff6088..a4995a635 100644
--- a/patches/server/0031-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0029-Zombie-horse-naturally-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 372eea42755cad6bf957fa94b816db25751d707b..9d238d4bf3151dd0c37d0b908c9fe3886975c4d2 100644
+index 1f10746e79373c269a904d23046003af6c3f6352..740b8243b95e46af5ba920f588357c78f4168dbb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -866,9 +866,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0032-Charged-creeper-naturally-spawn.patch b/patches/server/0030-Charged-creeper-naturally-spawn.patch
similarity index 96%
rename from patches/server/0032-Charged-creeper-naturally-spawn.patch
rename to patches/server/0030-Charged-creeper-naturally-spawn.patch
index 7fe3f7c11..5f730e967 100644
--- a/patches/server/0032-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0030-Charged-creeper-naturally-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Charged creeper naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 3a14f975e26530e1c4887844ec0c3967bd15a05b..9e05eadd09df031bac8321748f0e89c2701b74a1 100644
+index 20d9da3ddd2bc85954b9bcdab238d902238ba518..7fbe8fb2b59fe2f578beed8b13cbbbe96011719f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -138,6 +138,14 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0033-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 96%
rename from patches/server/0033-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
index b1ad9e56d..bf517e366 100644
--- a/patches/server/0033-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 587feda351efae19407cb9f23c6c1d42d5ed0cc9..e0ba1ef404c9f8ba1eae563b733d10d94b1442e4 100644
+index fd81c6ad5b7e36e013fd36d72f8db716ad9cae20..a046bcf35717b156141dfa041a44d32b1512d708 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -426,7 +426,11 @@ public class Rabbit extends Animal {
diff --git a/patches/server/0034-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0034-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0035-Dont-send-useless-entity-packets.patch b/patches/server/0033-Dont-send-useless-entity-packets.patch
similarity index 97%
rename from patches/server/0035-Dont-send-useless-entity-packets.patch
rename to patches/server/0033-Dont-send-useless-entity-packets.patch
index 4fb42ba93..c5373564d 100644
--- a/patches/server/0035-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0033-Dont-send-useless-entity-packets.patch
@@ -40,7 +40,7 @@ index c71bc00973899feec0ec5530bf3d237928810cf4..c85ca046acbb976f32a671c18ee4efde
          this.entity.stopSeenByPlayer(player);
          player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a91f51f80e8c19cfca75086ff7a1a9f71abc4647..bfe334678aef01738a834b4b281bed34d8e71a23 100644
+index 7f08a6a0e92300825ca90aeb55379a07474b76e5..504e8d2f9c0a2c8c8f6a710c0ad1d438f53d1439 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -233,6 +233,11 @@ public class PurpurConfig {
diff --git a/patches/server/0036-Tulips-change-fox-type.patch b/patches/server/0034-Tulips-change-fox-type.patch
similarity index 97%
rename from patches/server/0036-Tulips-change-fox-type.patch
rename to patches/server/0034-Tulips-change-fox-type.patch
index 8e3a03b7c..e93525feb 100644
--- a/patches/server/0036-Tulips-change-fox-type.patch
+++ b/patches/server/0034-Tulips-change-fox-type.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Tulips change fox type
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 80749df5d00df415a1b9e7c0e8586625b6453ffb..406b6ed8084c18da1062d8e8049bdfff65101565 100644
+index c8198d49ca0e159a2d87e21cf73fc901ea79310c..04fddf897c52f041324bcef19c84bff3aa675d8a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -34,6 +34,7 @@ import net.minecraft.tags.Tag;
diff --git a/patches/server/0037-Breedable-Polar-Bears.patch b/patches/server/0035-Breedable-Polar-Bears.patch
similarity index 97%
rename from patches/server/0037-Breedable-Polar-Bears.patch
rename to patches/server/0035-Breedable-Polar-Bears.patch
index 082e297dc..149d57d5f 100644
--- a/patches/server/0037-Breedable-Polar-Bears.patch
+++ b/patches/server/0035-Breedable-Polar-Bears.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Breedable Polar Bears
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 18780fb268cabb47bb0deb84c44520831c1a762b..d39c88af3882a09ff1a06f9052d7b9b8afdddda4 100644
+index 62c76aace42a948a117aee3d209fbaac72661740..6b09e8adcd38acb92072838bb2869458dae1cb50 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -93,6 +93,27 @@ public class PolarBear extends Animal implements NeutralMob {
diff --git a/patches/server/0038-Chickens-can-retaliate.patch b/patches/server/0036-Chickens-can-retaliate.patch
similarity index 97%
rename from patches/server/0038-Chickens-can-retaliate.patch
rename to patches/server/0036-Chickens-can-retaliate.patch
index 2a81c1765..0fecc4321 100644
--- a/patches/server/0038-Chickens-can-retaliate.patch
+++ b/patches/server/0036-Chickens-can-retaliate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Chickens can retaliate
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e..35cf6b9fb4d72df905d93bf52c02846b21b04007 100644
+index 63790e717f11f8cc28f734f81998542164461ee2..b3a6da8b1a221281d9f4d31cfb00ff525a8fdc65 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -66,6 +66,9 @@ public class Chicken extends Animal {
diff --git a/patches/server/0039-Add-option-to-set-armorstand-step-height.patch b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
similarity index 94%
rename from patches/server/0039-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0037-Add-option-to-set-armorstand-step-height.patch
index 65b69c526..d7f410735 100644
--- a/patches/server/0039-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 5fc66d7096afcfe63eba774e1dc330ac3263e4b0..7a3a364f5e3b025cc0a5694401cb9298c80cb733 100644
+index 02bce120fc93caa9e1e92b61e74c28209a1b2385..fee2bd03d007e6d69706f8cb953a2f6ae59cac35 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -669,6 +669,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0040-Cat-spawning-options.patch b/patches/server/0038-Cat-spawning-options.patch
similarity index 100%
rename from patches/server/0040-Cat-spawning-options.patch
rename to patches/server/0038-Cat-spawning-options.patch
diff --git a/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
similarity index 100%
rename from patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
rename to patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
diff --git a/patches/server/0042-Cows-eat-mushrooms.patch b/patches/server/0040-Cows-eat-mushrooms.patch
similarity index 98%
rename from patches/server/0042-Cows-eat-mushrooms.patch
rename to patches/server/0040-Cows-eat-mushrooms.patch
index 031d6dfc0..e800729cc 100644
--- a/patches/server/0042-Cows-eat-mushrooms.patch
+++ b/patches/server/0040-Cows-eat-mushrooms.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index bee82d5bf600cbeacfcede600e5606529af1435e..9da76357da891a70e20ad80f50873b3b487dc84c 100644
+index 205b740eeb3ad2c63a3524948bdfb43a3a7c373e..35c1de1cb74a38b414b4bf0516fa89c1c1a22a9f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -1,6 +1,7 @@
diff --git a/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0044-Pigs-give-saddle-back.patch b/patches/server/0042-Pigs-give-saddle-back.patch
similarity index 96%
rename from patches/server/0044-Pigs-give-saddle-back.patch
rename to patches/server/0042-Pigs-give-saddle-back.patch
index a53c848fd..e2cd69880 100644
--- a/patches/server/0044-Pigs-give-saddle-back.patch
+++ b/patches/server/0042-Pigs-give-saddle-back.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pigs give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index f4a099e691dce3c57069e76d67859161b459098e..518d28dc0b5b8c04263c93a4347e4c971a1318d8 100644
+index ebfeeab7b8aceeb7f0de09200c13647eae5bc32f..7e2f102180ebe76a9fd52914bab844b9de25441f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -173,6 +173,18 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
diff --git a/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
similarity index 96%
rename from patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
index bd130a99e..e898404e4 100644
--- a/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index fcf3092ef1863f62d9e76a77c0299ce1495ca1b7..ee64f4084b25d77f1c25b76a5b7d90cd2547bffb 100644
+index dac6b75f6b489c880fa2093594102778b675d8ac..9ea7682c7cb4c4be1c44d3dd12dc6954d44d659e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -184,6 +184,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
diff --git a/patches/server/0046-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch
similarity index 100%
rename from patches/server/0046-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0044-Ender-dragon-always-drop-full-exp.patch
diff --git a/patches/server/0047-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch
similarity index 100%
rename from patches/server/0047-Signs-editable-on-right-click.patch
rename to patches/server/0045-Signs-editable-on-right-click.patch
diff --git a/patches/server/0048-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch
similarity index 95%
rename from patches/server/0048-Signs-allow-color-codes.patch
rename to patches/server/0046-Signs-allow-color-codes.patch
index 9ded6e527..9185a2d3d 100644
--- a/patches/server/0048-Signs-allow-color-codes.patch
+++ b/patches/server/0046-Signs-allow-color-codes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 70c45cc80f1a884edcccf5a104988b196bf35a8c..9ce1f0bf0962eb7622d8034f325056311d8e6906 100644
+index 724e5975758f3055b210f96fcc208c81b7ff24a4..809bcdf0883d56f3a4b0f7d0be5403ec088b3959 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1462,6 +1462,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index 70c45cc80f1a884edcccf5a104988b196bf35a8c..9ce1f0bf0962eb7622d8034f32505631
          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 b20b64e217556868dfee0908c2be30bfefe86923..d447030ac544019f34e9f66f7094653d6612bebc 100644
+index b692c3160c430277dc571207e73e6db44aee314b..175ab7ebcd50f94ae523badb520adb08c52a0fb3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3096,11 +3096,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3101,11 +3101,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      }
                  }
                  // Paper end
diff --git a/patches/server/0049-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 100%
rename from patches/server/0049-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
diff --git a/patches/server/0050-Minecart-settings-and-WASD-controls.patch b/patches/server/0048-Minecart-settings-and-WASD-controls.patch
similarity index 99%
rename from patches/server/0050-Minecart-settings-and-WASD-controls.patch
rename to patches/server/0048-Minecart-settings-and-WASD-controls.patch
index 41bc930f2..6d5a89100 100644
--- a/patches/server/0050-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0048-Minecart-settings-and-WASD-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9ce1f0bf0962eb7622d8034f325056311d8e6906..ad21ea22867b77608e245469438fef9454cd57b5 100644
+index 809bcdf0883d56f3a4b0f7d0be5403ec088b3959..dd59ff2d627a316a77f1dd33bf0fe32904dd0310 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -989,6 +989,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
similarity index 95%
rename from patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
index 7277c2d16..a5798e76b 100644
--- a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f7446fdf4c18399a3b3ac5182f1a8fc5bde08919..56c4319ba36b3bec71f5fc5548ec2022ac49331e 100644
+index bdab5361e6fb42a30380ad76a08dd4d1fda92520..7b93c9799ea16f1ae91819e1c7c76fea7d9f0fe2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1708,8 +1708,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0052-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 100%
rename from patches/server/0052-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
diff --git a/patches/server/0053-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 91%
rename from patches/server/0053-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
index ce3f12779..28af6213b 100644
--- a/patches/server/0053-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] End gateway should check if entity can use portal
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 782becb96b6300f14deee360b653dc99c57fdc12..09cbce5aec6eabfa220f7de81b492a180cb8ca1e 100644
+index 0b238666a506816b8948d1db7397c26ca50b89d3..b2c098a02008b860b2fb17323831ab8af27751ae 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -178,6 +178,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0054-Fix-the-dead-lagging-the-server.patch b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
similarity index 90%
rename from patches/server/0054-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0052-Fix-the-dead-lagging-the-server.patch
index 503126bda..227d7b13c 100644
--- a/patches/server/0054-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
@@ -17,10 +17,10 @@ index 1ab4456b67b1b439b3b0e96f85de0fe104a5b2f8..082f8ede1d1839da7682a9cbb1ce1654
  
      public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d723b4331203aee5c33f19b0b64e69cb577e51a8..2bed70446b3316b48214b3ed1b43542d699dede8 100644
+index 7b93c9799ea16f1ae91819e1c7c76fea7d9f0fe2..e60c2fe4f81c3660e009e3156e9ad3b5f3581dd0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2897,7 +2897,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2909,7 +2909,7 @@ public abstract class LivingEntity extends Entity {
              }
          }
  
diff --git a/patches/server/0055-Skip-events-if-there-s-no-listeners.patch b/patches/server/0053-Skip-events-if-there-s-no-listeners.patch
similarity index 93%
rename from patches/server/0055-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0053-Skip-events-if-there-s-no-listeners.patch
index 996db0ab2..6c0ad5a55 100644
--- a/patches/server/0055-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0053-Skip-events-if-there-s-no-listeners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 6fec6a47538da4c0c5a4505e9bedf492bb3376dd..8c019cede209c1c022a843146f16db36ca292012 100644
+index b7c24a7ff4dc50d03f74b21a0b353d0ce559b4d4..dc0d785432b8e511a738bebb5c7335432b69427f 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -382,6 +382,7 @@ public class Commands {
diff --git a/patches/server/0056-Add-permission-for-F3-N-debug.patch b/patches/server/0054-Add-permission-for-F3-N-debug.patch
similarity index 100%
rename from patches/server/0056-Add-permission-for-F3-N-debug.patch
rename to patches/server/0054-Add-permission-for-F3-N-debug.patch
diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0055-Configurable-TPS-Catchup.patch
similarity index 100%
rename from patches/server/0057-Configurable-TPS-Catchup.patch
rename to patches/server/0055-Configurable-TPS-Catchup.patch
diff --git a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 100%
rename from patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
diff --git a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
similarity index 95%
rename from patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
index 6820570af..be70785b1 100644
--- a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 9e05eadd09df031bac8321748f0e89c2701b74a1..cda677a5cb5b9993764be24140bc9b27cc3298af 100644
+index 7fbe8fb2b59fe2f578beed8b13cbbbe96011719f..96858c10ad219a47187d3008387355f1bcfdc789 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -344,7 +344,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -18,7 +18,7 @@ index 9e05eadd09df031bac8321748f0e89c2701b74a1..cda677a5cb5b9993764be24140bc9b27
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index b92a83cfd15cedf7cd68c26193e65c5f24d9a621..a36313c321f9057350a9edb8b0959fd49a8e21a3 100644
+index b0908c864592095a30dc56e010bde02418e2f037..ae78b7c172c5b308f798930ff897a2fb6ecab8d9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -480,6 +480,7 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0060-Villagers-follow-emerald-blocks.patch b/patches/server/0058-Villagers-follow-emerald-blocks.patch
similarity index 95%
rename from patches/server/0060-Villagers-follow-emerald-blocks.patch
rename to patches/server/0058-Villagers-follow-emerald-blocks.patch
index cf61d29e4..3894bb626 100644
--- a/patches/server/0060-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0058-Villagers-follow-emerald-blocks.patch
@@ -18,7 +18,7 @@ index 30ef9d0a431b393b7238e497d16e8013f90036ef..90f8434100893d577544f7f5fbbc4503
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index e59a77c80a1bbe62aaa61bd4792d21b12c895a5c..44e9d6d0b80203b152957efef953c2fa1c9f3146 100644
+index c75fa3274dedfafa11b94704695a2313f11c22cc..f22ec35a7960bbc2f205d972dbe78d87eb9a7e25 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -43,6 +43,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -30,7 +30,7 @@ index e59a77c80a1bbe62aaa61bd4792d21b12c895a5c..44e9d6d0b80203b152957efef953c2fa
      // CraftBukkit start
      private CraftMerchant craftMerchant;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 14b27c84624467615ad7cc4d5df94cd60fccb8f0..9c983882e045b43e7466e1181bce7bbe875a77c3 100644
+index 698276aaa1f5bef4dcdd7a64009737086326c9ad..a85834190f25b6b5cecb4524e2e05898980811d2 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -173,6 +173,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -42,7 +42,7 @@ index 14b27c84624467615ad7cc4d5df94cd60fccb8f0..9c983882e045b43e7466e1181bce7bbe
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83ffa15fa3 100644
+index 0bcfece84ac11f04671ed38a99b31da9f8b03858..2f0bcf917af26fb7628bda134b650a8b296091ea 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -104,6 +104,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0061-Allow-leashing-villagers.patch b/patches/server/0059-Allow-leashing-villagers.patch
similarity index 94%
rename from patches/server/0061-Allow-leashing-villagers.patch
rename to patches/server/0059-Allow-leashing-villagers.patch
index d76a560a9..0ae816b9b 100644
--- a/patches/server/0061-Allow-leashing-villagers.patch
+++ b/patches/server/0059-Allow-leashing-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 4cf2bc22e1b6452d056b7bc85f84b6177d1091dc..20862d2c4a10f24f76b627f66af292813b1d0264 100644
+index 6106274009fcd8b43373e2fa9080183d6f6e36b3..a4886431b3b96d57e865757b288927b93e6547cb 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1221,6 +1221,7 @@ public abstract class Mob extends LivingEntity {
@@ -17,7 +17,7 @@ index 4cf2bc22e1b6452d056b7bc85f84b6177d1091dc..20862d2c4a10f24f76b627f66af29281
              // Paper start - drop leash variable
              org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 9c983882e045b43e7466e1181bce7bbe875a77c3..481595bb478ebbf2e76948cfdfa531d703f22b6d 100644
+index a85834190f25b6b5cecb4524e2e05898980811d2..7372e99b7f22e89d3d2637764f23be32c25460f7 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -180,6 +180,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -33,7 +33,7 @@ index 9c983882e045b43e7466e1181bce7bbe875a77c3..481595bb478ebbf2e76948cfdfa531d7
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d5994fd317a2 100644
+index 2f0bcf917af26fb7628bda134b650a8b296091ea..c5dbb1c8210b71f7d9d91089cb139f65605573a8 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -82,6 +82,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 96%
rename from patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
index 2db79aa88..4ee98b97d 100644
--- a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 481595bb478ebbf2e76948cfdfa531d703f22b6d..69465bc31cff3e96904fa2fabbe31061e9f5ba4b 100644
+index 7372e99b7f22e89d3d2637764f23be32c25460f7..7cb6428c4693e2984be636c3b58aefcbe6241041 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1037,6 +1037,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0063-Implement-infinite-liquids.patch b/patches/server/0061-Implement-infinite-liquids.patch
similarity index 100%
rename from patches/server/0063-Implement-infinite-liquids.patch
rename to patches/server/0061-Implement-infinite-liquids.patch
diff --git a/patches/server/0064-Make-lava-flow-speed-configurable.patch b/patches/server/0062-Make-lava-flow-speed-configurable.patch
similarity index 100%
rename from patches/server/0064-Make-lava-flow-speed-configurable.patch
rename to patches/server/0062-Make-lava-flow-speed-configurable.patch
diff --git a/patches/server/0065-Add-player-death-exp-control-options.patch b/patches/server/0063-Add-player-death-exp-control-options.patch
similarity index 94%
rename from patches/server/0065-Add-player-death-exp-control-options.patch
rename to patches/server/0063-Add-player-death-exp-control-options.patch
index 1e324254d..df8220a61 100644
--- a/patches/server/0065-Add-player-death-exp-control-options.patch
+++ b/patches/server/0063-Add-player-death-exp-control-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9ffe8832ef9b74ed3794243965d0cc3d3fbc4ef5..c557bee52a3f136696bb55853622b03220735109 100644
+index 3d66d2e86cef17bcd8813d4c2b29078beebf23fe..f991ed65d27d15a6eb32533f32da0bb9b69f331d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1907,9 +1907,18 @@ public abstract class Player extends LivingEntity {
@@ -31,7 +31,7 @@ index 9ffe8832ef9b74ed3794243965d0cc3d3fbc4ef5..c557bee52a3f136696bb55853622b032
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 23d5d959e40b496fe54d0fe6b7434a090afdc0fb..54f802449b8be8913c6d357ba7f6cfe50c09fb03 100644
+index 41550ce0b5577ae80761732144e908325bb04695..61e417c7c3113ce2515da09761d977a4fc766e64 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -168,6 +168,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0066-Configurable-void-damage-height-and-damage.patch b/patches/server/0064-Configurable-void-damage-height-and-damage.patch
similarity index 97%
rename from patches/server/0066-Configurable-void-damage-height-and-damage.patch
rename to patches/server/0064-Configurable-void-damage-height-and-damage.patch
index b78c85484..c7a50386c 100644
--- a/patches/server/0066-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0064-Configurable-void-damage-height-and-damage.patch
@@ -18,7 +18,7 @@ index 082f8ede1d1839da7682a9cbb1ce16540f06b8ad..9b33986d0b163597e9475b2ebe225780
              && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2bed70446b3316b48214b3ed1b43542d699dede8..73ec77c08900f6f49ac0e1e07322bec36c7df9f0 100644
+index e60c2fe4f81c3660e009e3156e9ad3b5f3581dd0..e0b6d755aef99bb20d934ba5dcb0cc81efe2ac55 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2402,7 +2402,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server/0065-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0067-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0065-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0068-Dispenser-curse-of-binding-protection.patch b/patches/server/0066-Dispenser-curse-of-binding-protection.patch
similarity index 91%
rename from patches/server/0068-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0066-Dispenser-curse-of-binding-protection.patch
index d0017cc0e..4ed33c24e 100644
--- a/patches/server/0068-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0066-Dispenser-curse-of-binding-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 20862d2c4a10f24f76b627f66af292813b1d0264..e985f795747e25c5456658df3e1d65a520d8a2cc 100644
+index a4886431b3b96d57e865757b288927b93e6547cb..83a2ae28358c9941d7d97b0472487264bc7007e9 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -62,6 +62,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
@@ -30,7 +30,7 @@ index 20862d2c4a10f24f76b627f66af292813b1d0264..e985f795747e25c5456658df3e1d65a5
      public static Item getEquipmentForSlot(EquipmentSlot equipmentSlot, int equipmentLevel) {
          switch (equipmentSlot) {
 diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
-index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e245740e7e 100644
+index e566a6ee8eda9d6e9bc7b0ce153d016ddc0b2797..043ea496bd04bbf4571ec9d16e5362257b3658c8 100644
 --- a/src/main/java/net/minecraft/world/item/ArmorItem.java
 +++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
 @@ -56,7 +56,7 @@ public class ArmorItem extends Item implements Wearable {
@@ -43,7 +43,7 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e2
              // CraftBukkit start
              Level world = pointer.getLevel();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b1722d945ce43e296e603b8c4eec43df39cc3bed..c5ced15da2a371dde1dbcc18266119bef2ceb035 100644
+index c86f1d00b7ae613f2575a98ce6824c72c60c0f47..573904ac2403496c31af399b3f3bbb61d43e7a08 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -232,6 +232,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 95%
rename from patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
index 0e3237177..5ae783c04 100644
--- a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch
@@ -17,7 +17,7 @@ index 391454a58d18d7373b974e094fd62514ca0d0b6b..6acd2dc6ec9c3761fa330c74df8c7e7b
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c5ced15da2a371dde1dbcc18266119bef2ceb035..270ce40a4e81037196a9df8fe21790682b917ce4 100644
+index 573904ac2403496c31af399b3f3bbb61d43e7a08..4894b0654a81950ec926e448757a2fb379f70daa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -219,12 +219,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch b/patches/server/0068-Mending-mends-most-damages-equipment-first.patch
similarity index 100%
rename from patches/server/0070-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0068-Mending-mends-most-damages-equipment-first.patch
diff --git a/patches/server/0071-Add-5-second-tps-average-in-tps.patch b/patches/server/0069-Add-5-second-tps-average-in-tps.patch
similarity index 100%
rename from patches/server/0071-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0069-Add-5-second-tps-average-in-tps.patch
diff --git a/patches/server/0072-Implement-elytra-settings.patch b/patches/server/0070-Implement-elytra-settings.patch
similarity index 98%
rename from patches/server/0072-Implement-elytra-settings.patch
rename to patches/server/0070-Implement-elytra-settings.patch
index 08e78783d..933422093 100644
--- a/patches/server/0072-Implement-elytra-settings.patch
+++ b/patches/server/0070-Implement-elytra-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 73ec77c08900f6f49ac0e1e07322bec36c7df9f0..5557fdfad5a393b465035da9a863ad85bbd49af0 100644
+index e0b6d755aef99bb20d934ba5dcb0cc81efe2ac55..f46a79cade3a69d3100ca6bf135cb304b8064dee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3298,7 +3298,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3310,7 +3310,16 @@ public abstract class LivingEntity extends Entity {
                      int j = i / 10;
  
                      if (j % 2 == 0) {
diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0071-Item-entity-immunities.patch
similarity index 100%
rename from patches/server/0073-Item-entity-immunities.patch
rename to patches/server/0071-Item-entity-immunities.patch
diff --git a/patches/server/0074-Add-ping-command.patch b/patches/server/0072-Add-ping-command.patch
similarity index 95%
rename from patches/server/0074-Add-ping-command.patch
rename to patches/server/0072-Add-ping-command.patch
index f1f00dd16..57b29daab 100644
--- a/patches/server/0074-Add-ping-command.patch
+++ b/patches/server/0072-Add-ping-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 8c019cede209c1c022a843146f16db36ca292012..688835cb5116c245e1e25449d41999a944da54cf 100644
+index dc0d785432b8e511a738bebb5c7335432b69427f..47ee3e70021ce17beea4ee6ac967c3180045b804 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -198,6 +198,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 8c019cede209c1c022a843146f16db36ca292012..688835cb5116c245e1e25449d41999a9
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6226e04e34f88579e4cd8b9fae5fddfcc0d01912..bd0078f2859384c4cfddf897ee86fd1c0617a0d0 100644
+index c27088998dca02124c0381dd4166d63e75a634f6..10a3bcd31f6cd2ec27c79c622fecc4a24fda9f17 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,12 +162,14 @@ public class PurpurConfig {
diff --git a/patches/server/0075-Add-demo-command.patch b/patches/server/0073-Add-demo-command.patch
similarity index 95%
rename from patches/server/0075-Add-demo-command.patch
rename to patches/server/0073-Add-demo-command.patch
index d2887aa50..d3d04d2d8 100644
--- a/patches/server/0075-Add-demo-command.patch
+++ b/patches/server/0073-Add-demo-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 688835cb5116c245e1e25449d41999a944da54cf..98392e818d1f2df9f82af630206d0cd2bdbddb50 100644
+index 47ee3e70021ce17beea4ee6ac967c3180045b804..376768b272f70d1eb45d483c51dec22d91c9d325 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -198,6 +198,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 688835cb5116c245e1e25449d41999a944da54cf..98392e818d1f2df9f82af630206d0cd2
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bd0078f2859384c4cfddf897ee86fd1c0617a0d0..f9401fb20fa152ce88c7b7ccbfd812992c500930 100644
+index 10a3bcd31f6cd2ec27c79c622fecc4a24fda9f17..196f57d3c7f1b9e57122c42c73de7157da477246 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,6 +162,7 @@ public class PurpurConfig {
diff --git a/patches/server/0076-Add-credits-command.patch b/patches/server/0074-Add-credits-command.patch
similarity index 95%
rename from patches/server/0076-Add-credits-command.patch
rename to patches/server/0074-Add-credits-command.patch
index 54f45f05e..a3720f899 100644
--- a/patches/server/0076-Add-credits-command.patch
+++ b/patches/server/0074-Add-credits-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 98392e818d1f2df9f82af630206d0cd2bdbddb50..42deff516bd363d0882b441fa6928ac7eecbfccc 100644
+index 376768b272f70d1eb45d483c51dec22d91c9d325..4308cf798c7f97532ee56369a11afe4dbf7a898f 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -198,6 +198,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 98392e818d1f2df9f82af630206d0cd2bdbddb50..42deff516bd363d0882b441fa6928ac7
              net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f9401fb20fa152ce88c7b7ccbfd812992c500930..53051c4d193cdc5ac7e624a4c7def0ea10e3285e 100644
+index 196f57d3c7f1b9e57122c42c73de7157da477246..c202cb7e325b8ace1ed3aa3ba86419d7571d0f0e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,6 +162,7 @@ public class PurpurConfig {
diff --git a/patches/server/0077-Configurable-jockey-options.patch b/patches/server/0075-Configurable-jockey-options.patch
similarity index 97%
rename from patches/server/0077-Configurable-jockey-options.patch
rename to patches/server/0075-Configurable-jockey-options.patch
index b4d728902..98f3369bd 100644
--- a/patches/server/0077-Configurable-jockey-options.patch
+++ b/patches/server/0075-Configurable-jockey-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 591dfcd091c1c4611aeb17dfc5ee493be8131b50..7d28a410ae18594b5db4559640b4eb30762f5a69 100644
+index a01ee7e62519a3d9f26a4f96360fc9c23ab7e751..dba50a7fb7ef93e4040ddcf90ed6a5825c471363 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -89,6 +89,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -31,7 +31,7 @@ index 591dfcd091c1c4611aeb17dfc5ee493be8131b50..7d28a410ae18594b5db4559640b4eb30
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 464e062bba03a17c9281b3dfb8fa9193c1b81150..6c89eabddda16f9b72e6062c31bb4be6beae442d 100644
+index 81a3f6c1774b187be96b412dae44be623ce7f6cb..7bb8ef0bb2de9a0b0d5048f8a4089835c41de568 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
 @@ -42,6 +42,21 @@ public class Husk extends Zombie {
@@ -57,7 +57,7 @@ index 464e062bba03a17c9281b3dfb8fa9193c1b81150..6c89eabddda16f9b72e6062c31bb4be6
  
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c3288e6a5be2c0805067fe14496315afd6156110..1f9a233799be988748f6146ced2a4489899079f8 100644
+index dd9a7494184f36b64ea8461750a1cff4178e13aa..f39ad6c90aeb62102f240dc13f2aa0a5d1747ade 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -122,6 +122,18 @@ public class Zombie extends Monster {
@@ -141,7 +141,7 @@ index 9c60e3b3e62a29d6898c82a4110ffd4d1c7cb5f2..7fda07f5fa756077dab59de95f15b919
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e57faa1948 100644
+index cc5bd132bbd40aba8c910695f25a896c5f4fe635..96e727cd703a1da5f60ab07e47b6bc5265b309e4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -73,6 +73,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
diff --git a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 99%
rename from patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 159b4341f..d5fa833b5 100644
--- a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -73,7 +73,7 @@ index b643a2449e329560c936c0a06fb4cc494d0737a7..92e65f3fbc8f5d77bb8cc31e7a7780c2
      @Override
      protected void addAdditionalSaveData(CompoundTag nbt) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc173677b01081 100644
+index 5e71b3d5126d30626fbc9bd4b9eefebd20916e60..c314cb61f2e643de7eb12478d265f0664858f935 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0079-Add-phantom-spawning-options.patch b/patches/server/0077-Add-phantom-spawning-options.patch
similarity index 100%
rename from patches/server/0079-Add-phantom-spawning-options.patch
rename to patches/server/0077-Add-phantom-spawning-options.patch
diff --git a/patches/server/0080-Implement-bed-explosion-options.patch b/patches/server/0078-Implement-bed-explosion-options.patch
similarity index 97%
rename from patches/server/0080-Implement-bed-explosion-options.patch
rename to patches/server/0078-Implement-bed-explosion-options.patch
index 637e5496c..42cf74485 100644
--- a/patches/server/0080-Implement-bed-explosion-options.patch
+++ b/patches/server/0078-Implement-bed-explosion-options.patch
@@ -27,7 +27,7 @@ index e3ff04fe21761db65fb03c5e58ecd5823f0507c6..6362c9dcfbc980a0591ac6dfebe45e47
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 295999b5269de11b5384fea831470e5b0c909343..f2e4511bae29a6df5d50e75e3a72e49d152ae38a 100644
+index e92c0c732af5581c266b146f360bce05364d8a28..4405108543e36b74be2678d6e5b1de9363db5151 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -292,6 +292,22 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0081-Implement-respawn-anchor-explosion-options.patch b/patches/server/0079-Implement-respawn-anchor-explosion-options.patch
similarity index 100%
rename from patches/server/0081-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0079-Implement-respawn-anchor-explosion-options.patch
diff --git a/patches/server/0082-Add-allow-water-in-end-world-option.patch b/patches/server/0080-Add-allow-water-in-end-world-option.patch
similarity index 100%
rename from patches/server/0082-Add-allow-water-in-end-world-option.patch
rename to patches/server/0080-Add-allow-water-in-end-world-option.patch
diff --git a/patches/server/0083-Allow-color-codes-in-books.patch b/patches/server/0081-Allow-color-codes-in-books.patch
similarity index 87%
rename from patches/server/0083-Allow-color-codes-in-books.patch
rename to patches/server/0081-Allow-color-codes-in-books.patch
index 29935edd1..e7f7f4625 100644
--- a/patches/server/0083-Allow-color-codes-in-books.patch
+++ b/patches/server/0081-Allow-color-codes-in-books.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 26da5b619dd06f1713da172b6545af289f79cdd9..5835d6f1603bbe1ba2490c9393e90908e31812f9 100644
+index 175ab7ebcd50f94ae523badb520adb08c52a0fb3..3f2990b869f14c6c7be234d103f1e6f4c8fbf7da 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1214,13 +1214,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1219,13 +1219,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  itemstack1.setTag(nbttagcompound.copy());
              }
  
@@ -26,10 +26,10 @@ index 26da5b619dd06f1713da172b6545af289f79cdd9..5835d6f1603bbe1ba2490c9393e90908
              }
 +            // Purpur end
  
-             this.a(pages, (s) -> {
+             this.updateBookPages(pages, (s) -> {
                  return Component.Serializer.toJson((Component) (new TextComponent(s)));
-@@ -1232,10 +1235,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-     private void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
+@@ -1237,10 +1240,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+     private void updateBookPages(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
          ListTag nbttaglist = new ListTag();
  
 +        // Purpur start
@@ -44,7 +44,7 @@ index 26da5b619dd06f1713da172b6545af289f79cdd9..5835d6f1603bbe1ba2490c9393e90908
  
              Objects.requireNonNull(nbttaglist);
              stream.forEach(nbttaglist::add);
-@@ -1245,10 +1251,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1250,10 +1256,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              for (int j = list.size(); i < j; ++i) {
                  TextFilter.FilteredText itextfilter_a = (TextFilter.FilteredText) list.get(i);
@@ -57,7 +57,7 @@ index 26da5b619dd06f1713da172b6545af289f79cdd9..5835d6f1603bbe1ba2490c9393e90908
  
                  if (!s.equals(s1)) {
                      nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply(s1));
-@@ -1264,6 +1270,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1269,6 +1275,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
      }
  
diff --git a/patches/server/0084-Entity-lifespan.patch b/patches/server/0082-Entity-lifespan.patch
similarity index 95%
rename from patches/server/0084-Entity-lifespan.patch
rename to patches/server/0082-Entity-lifespan.patch
index 354066569..88742493f 100644
--- a/patches/server/0084-Entity-lifespan.patch
+++ b/patches/server/0082-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e985f795747e25c5456658df3e1d65a520d8a2cc..437015eef7404362cb564dec72e3e87c79b4ff0b 100644
+index 83a2ae28358c9941d7d97b0472487264bc7007e9..acc72884197076beee290c0a8091305b11fe51dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -126,6 +126,7 @@ public abstract class Mob extends LivingEntity {
@@ -89,7 +89,7 @@ index e985f795747e25c5456658df3e1d65a520d8a2cc..437015eef7404362cb564dec72e3e87c
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4a03ec9088c2f1e52ac7a81e901cc32352879c02..e13159745e1c03df859f9ad93c828925d6e399d1 100644
+index 45e2c201f4d6768e029d075dfcb3716c92d394a4..a16797934b4c803828996c7a7f1b18f6b4925250 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 93%
rename from patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index fd91b1ba1..7a0f1751a 100644
--- a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ad21ea22867b77608e245469438fef9454cd57b5..f5a532d4c9773b46e436fb1341bf404b3919f6ee 100644
+index dd59ff2d627a316a77f1dd33bf0fe32904dd0310..856f5e85d0367834d90e473fd9add868f91f2360 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2519,5 +2519,25 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index ad21ea22867b77608e245469438fef9454cd57b5..f5a532d4c9773b46e436fb1341bf404b
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a0e9c17662682394168ffbaf8111121c0211e679..2107c20a6bd7eeac17ac0ca41721f60acbbed701 100644
+index f46a79cade3a69d3100ca6bf135cb304b8064dee..accca4f004d3c019be4de40e725bb6a7982c8770 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -55,7 +55,7 @@ index a0e9c17662682394168ffbaf8111121c0211e679..2107c20a6bd7eeac17ac0ca41721f60a
                      }
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e13159745e1c03df859f9ad93c828925d6e399d1..1e35ef6c93ee5aa2791defed112459e6ece50495 100644
+index a16797934b4c803828996c7a7f1b18f6b4925250..213950f1d36c504824d0053843c3fe869f9eed84 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -231,6 +231,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0086-Squid-EAR-immunity.patch b/patches/server/0084-Squid-EAR-immunity.patch
similarity index 95%
rename from patches/server/0086-Squid-EAR-immunity.patch
rename to patches/server/0084-Squid-EAR-immunity.patch
index ad0bc8bf1..9279fed0f 100644
--- a/patches/server/0086-Squid-EAR-immunity.patch
+++ b/patches/server/0084-Squid-EAR-immunity.patch
@@ -25,7 +25,7 @@ index 213950f1d36c504824d0053843c3fe869f9eed84..1c1a1ed14a1e2a80b3a26cb990b25779
  
      public boolean spiderRidable = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1f70281055634f06cfe7e8026c552aff525e973a..bb9050a31d7eb482b8c5446c356bd74c3a842f87 100644
+index ff33287dabcc9724920e747d53efb4dada006cb2..d1c78ca9d6eddf293dc81ee056275727c218a679 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -14,6 +14,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
diff --git a/patches/server/0087-Phantoms-burn-in-light.patch b/patches/server/0085-Phantoms-burn-in-light.patch
similarity index 98%
rename from patches/server/0087-Phantoms-burn-in-light.patch
rename to patches/server/0085-Phantoms-burn-in-light.patch
index 3e2d71c45..489c32796 100644
--- a/patches/server/0087-Phantoms-burn-in-light.patch
+++ b/patches/server/0085-Phantoms-burn-in-light.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 916c29d08fbcf245ad6f50f8e8cc173677b01081..59033a5c28f672089fe3ad846775753ae90f9ad9 100644
+index c314cb61f2e643de7eb12478d265f0664858f935..789224c6285cde2009e000d98e190c36459f04e8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -51,6 +51,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0088-Configurable-villager-breeding.patch b/patches/server/0086-Configurable-villager-breeding.patch
similarity index 95%
rename from patches/server/0088-Configurable-villager-breeding.patch
rename to patches/server/0086-Configurable-villager-breeding.patch
index abe432502..732b9b0cb 100644
--- a/patches/server/0088-Configurable-villager-breeding.patch
+++ b/patches/server/0086-Configurable-villager-breeding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 69465bc31cff3e96904fa2fabbe31061e9f5ba4b..a1725ccc7b194c26c4f94561a228da9f56e24cfc 100644
+index 7cb6428c4693e2984be636c3b58aefcbe6241041..9f6c50391b85863f38a9dfc48aec894f74428373 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -759,7 +759,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0089-Redstone-deactivates-spawners.patch b/patches/server/0087-Redstone-deactivates-spawners.patch
similarity index 100%
rename from patches/server/0089-Redstone-deactivates-spawners.patch
rename to patches/server/0087-Redstone-deactivates-spawners.patch
diff --git a/patches/server/0090-Totems-work-in-inventory.patch b/patches/server/0088-Totems-work-in-inventory.patch
similarity index 93%
rename from patches/server/0090-Totems-work-in-inventory.patch
rename to patches/server/0088-Totems-work-in-inventory.patch
index d0aa2d64e..73f284909 100644
--- a/patches/server/0090-Totems-work-in-inventory.patch
+++ b/patches/server/0088-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8896f8aa3f21dba3fe78b5cf6f3ee1adfac2bac3..7339ec31aba03974991fdb247beefc747fa003a5 100644
+index accca4f004d3c019be4de40e725bb6a7982c8770..44255a8cc6736bac90522480d0a164287785d9d6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1516,6 +1516,19 @@ public abstract class LivingEntity extends Entity {
@@ -29,7 +29,7 @@ index 8896f8aa3f21dba3fe78b5cf6f3ee1adfac2bac3..7339ec31aba03974991fdb247beefc74
              event.setCancelled(itemstack == null);
              this.level.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a75f4c2fe76bb653e88604a9b026f0c3e38c5706..ce01456bfd0aba630476972bda0f85df8fdaf0d6 100644
+index 932dc1b97ae84244f1c8fd8e9c49b655a0c8b62c..88cb60050442a757fb94fa050c4d9a073f197e85 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -232,6 +232,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0089-Add-vindicator-johnny-spawn-chance.patch
similarity index 96%
rename from patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0089-Add-vindicator-johnny-spawn-chance.patch
index bfbfceb99..a18f005b4 100644
--- a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0089-Add-vindicator-johnny-spawn-chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add vindicator johnny spawn chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1f60c0692 100644
+index 9b4a20a78f24d4b05fefbf2a7d05686ef9cc8adb..f65a997db7ee0d8e06dfe7cf41dd2231e67b1a2f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -7,6 +7,7 @@ import java.util.function.Predicate;
diff --git a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch b/patches/server/0090-Add-option-to-disable-certain-block-updates.patch
similarity index 99%
rename from patches/server/0092-Add-option-to-disable-certain-block-updates.patch
rename to patches/server/0090-Add-option-to-disable-certain-block-updates.patch
index ea8e99632..e5603a382 100644
--- a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/server/0090-Add-option-to-disable-certain-block-updates.patch
@@ -125,7 +125,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..59ae3bb34678cdb5241f691915c96d65
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9783c7c36bb5534d960e7ba310412e4ecf78c479..00d3288cde9ce69835de937aa548f2f880d9365b 100644
+index b2b7d0a89a6a0d3482caea8fcad1d46de7e4b8ee..c55f0be5437f36d42dacb2e61efcecac3cf379ee 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -249,6 +249,15 @@ public class PurpurConfig {
diff --git a/patches/server/0093-Dispensers-place-anvils-option.patch b/patches/server/0091-Dispensers-place-anvils-option.patch
similarity index 100%
rename from patches/server/0093-Dispensers-place-anvils-option.patch
rename to patches/server/0091-Dispensers-place-anvils-option.patch
diff --git a/patches/server/0094-Allow-anvil-colors.patch b/patches/server/0092-Allow-anvil-colors.patch
similarity index 96%
rename from patches/server/0094-Allow-anvil-colors.patch
rename to patches/server/0092-Allow-anvil-colors.patch
index 9598ed0c3..20695ebbb 100644
--- a/patches/server/0094-Allow-anvil-colors.patch
+++ b/patches/server/0092-Allow-anvil-colors.patch
@@ -37,7 +37,7 @@ index 3ce51ff7af5b907cc044c9dd5894be1a03dc2719..81ffe2c1597487188cfcce09c5e160d8
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e63e1a52c4513c27e9dc5ce9b3bb6fce165f7b8d..a5d97a8f2f1c28cbd10ce0e8dbb54404566c8ea1 100644
+index 3b56a3668d417890c5233c04f15dda9499e8265d..730abc3bc780ccbd22b9e8c33a2ea894f53f13ee 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -301,6 +301,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0095-Add-no-random-tick-block-list.patch b/patches/server/0093-Add-no-random-tick-block-list.patch
similarity index 95%
rename from patches/server/0095-Add-no-random-tick-block-list.patch
rename to patches/server/0093-Add-no-random-tick-block-list.patch
index e8f5fed79..43908fa44 100644
--- a/patches/server/0095-Add-no-random-tick-block-list.patch
+++ b/patches/server/0093-Add-no-random-tick-block-list.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-random-tick block list
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9d238d4bf3151dd0c37d0b908c9fe3886975c4d2..38f4c77355f3a63bf1da1ced5df49512b10a424d 100644
+index 740b8243b95e46af5ba920f588357c78f4168dbb..d4d6ab96468ba08f6d43b6d07c921118fc150332 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -482,7 +482,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -35,7 +35,7 @@ index 3d677fe25ed015e30634bf2fccde29f332e3dd87..e1aba175a74e73db0a8a11e8d2df35c4
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a5d97a8f2f1c28cbd10ce0e8dbb54404566c8ea1..0ec33bc04f5c08142309c43e05872b4149c8ad95 100644
+index 730abc3bc780ccbd22b9e8c33a2ea894f53f13ee..56b5ddbab362d2c6bd9402211d30e01b94b2e891 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -301,6 +301,28 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0094-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 95%
rename from patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0094-Add-option-to-disable-dolphin-treasure-searching.patch
index 1ad8479c0..61ee98b36 100644
--- a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0094-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20b9abf4b9 100644
+index 855ab63797baf825eeaddb4892cbe8430d47da0f..cc20ed6e1746f47351eb9b40f7b3c1a11daebd4f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -497,6 +497,7 @@ public class Dolphin extends WaterAnimal {
diff --git a/patches/server/0097-Short-enderman-height.patch b/patches/server/0095-Short-enderman-height.patch
similarity index 91%
rename from patches/server/0097-Short-enderman-height.patch
rename to patches/server/0095-Short-enderman-height.patch
index 08374a087..cd7f5ec02 100644
--- a/patches/server/0097-Short-enderman-height.patch
+++ b/patches/server/0095-Short-enderman-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 20094345f90dba666902a8694035b47e0606e02c..88fcd673e36336b99e3cef27e290532f49acbca3 100644
+index 88e556fc543c3143bffc62edf868c9dc44ab2597..818e620a83f005c5942f0c531095b6c131bdd094 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -280,7 +280,8 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -19,7 +19,7 @@ index 20094345f90dba666902a8694035b47e0606e02c..88fcd673e36336b99e3cef27e290532f
      private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
          return (EntityType) Registry.register((Registry) Registry.ENTITY_TYPE, id, (Object) type.build(id));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index a36313c321f9057350a9edb8b0959fd49a8e21a3..10c3a0c49579fbd9f1fe7ec82eebd42be3412b69 100644
+index ae78b7c172c5b308f798930ff897a2fb6ecab8d9..7f205fc0b39294626c809fc69ada5adda59e2ed2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -399,6 +399,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -31,7 +31,7 @@ index a36313c321f9057350a9edb8b0959fd49a8e21a3..10c3a0c49579fbd9f1fe7ec82eebd42b
              if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 41e78e5229f225665733308490e1d23bfd37ce61..4c950f90963b80acc6956008f7636248f09f6c7a 100644
+index c55f0be5437f36d42dacb2e61efcecac3cf379ee..ee78e74edb95f29c42ae94e733fd44043191206e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -239,6 +239,12 @@ public class PurpurConfig {
diff --git a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch b/patches/server/0096-Stop-squids-floating-on-top-of-water.patch
similarity index 100%
rename from patches/server/0098-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0096-Stop-squids-floating-on-top-of-water.patch
diff --git a/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0097-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server/0099-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0097-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0098-Crying-obsidian-valid-for-portal-frames.patch
similarity index 96%
rename from patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0098-Crying-obsidian-valid-for-portal-frames.patch
index 46be81f9e..d02667447 100644
--- a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0098-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,7 +18,7 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
      private final LevelAccessor level;
      private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4c950f90963b80acc6956008f7636248f09f6c7a..eee9f3091b2fa5368655db232670a84ed2703193 100644
+index ee78e74edb95f29c42ae94e733fd44043191206e..0af482784c7d9337b16c52ba52962f0380ae43e0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -207,6 +207,7 @@ public class PurpurConfig {
diff --git a/patches/server/0101-Entities-can-use-portals-configuration.patch b/patches/server/0099-Entities-can-use-portals-configuration.patch
similarity index 100%
rename from patches/server/0101-Entities-can-use-portals-configuration.patch
rename to patches/server/0099-Entities-can-use-portals-configuration.patch
diff --git a/patches/server/0102-LivingEntity-broadcastItemBreak.patch b/patches/server/0100-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0102-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0100-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0103-Customizable-wither-health-and-healing.patch b/patches/server/0101-Customizable-wither-health-and-healing.patch
similarity index 96%
rename from patches/server/0103-Customizable-wither-health-and-healing.patch
rename to patches/server/0101-Customizable-wither-health-and-healing.patch
index 0020d9b0b..13dd5c1ef 100644
--- a/patches/server/0103-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0101-Customizable-wither-health-and-healing.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
 
 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 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e 100644
+index 43de1fa753e54ae09d43a9aef8dda22c27c67b81..ff71f78497681805246d7b3e4ac59288db9af997 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
 @@ -504,8 +504,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0102-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 97%
rename from patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0102-Allow-toggling-special-MobSpawners-per-world.patch
index cc75f192d..4a12bf222 100644
--- a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0102-Allow-toggling-special-MobSpawners-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 38f4c77355f3a63bf1da1ced5df49512b10a424d..1ea18770c65583e2ed604eb15d15067a638a33a2 100644
+index d4d6ab96468ba08f6d43b6d07c921118fc150332..e830ea65511b36620000b55c567d4d760027de59 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
              if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c8670b283bb9bccfa8b585cf29aabb140c81414..ef2e3ad602815b0f40d0e8f99376258f556757f6 100644
+index 0f3c9233fb4761a394b301a634373b95949d5c48..18ccb5cfc298975581416c5ee5e6f4b4befaaf04 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -73,6 +73,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0105-Raid-cooldown-setting.patch b/patches/server/0103-Raid-cooldown-setting.patch
similarity index 97%
rename from patches/server/0105-Raid-cooldown-setting.patch
rename to patches/server/0103-Raid-cooldown-setting.patch
index fcdadde35..c40259ebd 100644
--- a/patches/server/0105-Raid-cooldown-setting.patch
+++ b/patches/server/0103-Raid-cooldown-setting.patch
@@ -52,7 +52,7 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
                      if (!this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef2e3ad602815b0f40d0e8f99376258f556757f6..73c2312de3140bb95f5b71817b970b4dbfa79307 100644
+index 18ccb5cfc298975581416c5ee5e6f4b4befaaf04..62d404aed69465556a7e03938a23d9b3040be265 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -313,6 +313,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0104-Despawn-rate-config-options-per-projectile-type.patch
similarity index 98%
rename from patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0104-Despawn-rate-config-options-per-projectile-type.patch
index d1c0f0a4d..63e17cba5 100644
--- a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0104-Despawn-rate-config-options-per-projectile-type.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
 Default values of -1 respect vanilla behaviour.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 6636845ea044c3810e1880aad8b679134cd33668..f6fc98ffe49d5af9a69f57f2e53e6010f71d55d9 100644
+index 52e4948fd1657fa1776ac6b0142e8c21e7567976..da76e07b3caced3172ecade96a67aca81958a4dc 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -62,7 +62,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -79,7 +79,7 @@ index 3ac0d0419cbdacabf647a530a82ddf67ddaa13b7..78111e7c26f5237e9954791cf17037eb
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 852a4edde291bf368b2396e3c94ab402e3c66622..83b733efa3a4e135870806589ca9733ca6d8775b 100644
+index 5c16566f59535ce61fb3f747a745255cfaa439e8..dc7968c3bcf72af22fffbc85b058ac5820f06453 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -664,4 +664,11 @@ public class FishingHook extends Projectile {
@@ -289,7 +289,7 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 73c2312de3140bb95f5b71817b970b4dbfa79307..ec8d6caa531d53d5f7899c135fc067c3f892286c 100644
+index 62d404aed69465556a7e03938a23d9b3040be265..33896adae8835dbeb53683c8d689c87024284e4d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -273,6 +273,35 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0105-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 97%
rename from patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0105-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index ac3bb4b08..161cb17d8 100644
--- a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0105-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -21,7 +21,7 @@ index 181abe014baba9ac51064c003381281a8fa43fe4..cfd1dcec3efcd4caf2431cbda99bc9f1
          ignored.add("goal_selector_1");
          ignored.add("goal_selector_2");
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 7d28a410ae18594b5db4559640b4eb30762f5a69..8d3ce6c97a8734c0d13844cafca251a3f4dce8a4 100644
+index dba50a7fb7ef93e4040ddcf90ed6a5825c471363..5c9565b115709c3cb6108202769abf3d1eaf455c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -116,7 +116,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -46,7 +46,7 @@ index 7d28a410ae18594b5db4559640b4eb30762f5a69..8d3ce6c97a8734c0d13844cafca251a3
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false));
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 1f9a233799be988748f6146ced2a4489899079f8..1f90c40c5e92232c38a33097903fd6e2f6f2ff02 100644
+index f39ad6c90aeb62102f240dc13f2aa0a5d1747ade..9e4f6bf67301d62f431254a6863d7739e8c6b370 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -152,7 +152,19 @@ public class Zombie extends Monster {
diff --git a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0106-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 99%
rename from patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0106-Persistent-TileEntity-Lore-and-DisplayName.patch
index 60aa4ecfa..78d03ac99 100644
--- a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0106-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -123,7 +123,7 @@ index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..577f38fcff55ef23fcacce1b05b6d0de
          float f = EntityType.ITEM.getHeight() / 2.0F;
          // Paper start - don't convert potentially massive numbers to floats
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 38c4dac82793930777eaf0189c5534234a9162ed..b01be8b1e8702442611fd49fab338f61423f2ff9 100644
+index 9b4a464fe820effa906af486cf71a74e283ccd4e..473ab1d7be8a2b8507ecfb7a653a5b0abf5c4f2e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -5,6 +5,8 @@ import net.minecraft.CrashReportCategory;
diff --git a/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0107-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0107-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0110-Flying-squids-Oh-my.patch b/patches/server/0108-Flying-squids-Oh-my.patch
similarity index 95%
rename from patches/server/0110-Flying-squids-Oh-my.patch
rename to patches/server/0108-Flying-squids-Oh-my.patch
index 54e80ca3d..5f4ac9031 100644
--- a/patches/server/0110-Flying-squids-Oh-my.patch
+++ b/patches/server/0108-Flying-squids-Oh-my.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying squids! Oh my!
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 87d01bebbb179eec53323e9e23db011a791660ed..02b79aa6f4c472a9450549b1730f026d6d93b87b 100644
+index 8c76074289954aae933dd41184f1f0d346bc6c8b..a2343002ec47df867537d42dcf374df448b591aa 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -34,6 +34,11 @@ public class GlowSquid extends Squid {
@@ -21,7 +21,7 @@ index 87d01bebbb179eec53323e9e23db011a791660ed..02b79aa6f4c472a9450549b1730f026d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 8b3dfce6c890a44f9bc485bec016c922375fadfb..3c3a5d7ac95916e066c4ec78c0d3849cd0a9f3e0 100644
+index af13adb96a083c83b7b847770a85e32bd0eafa4b..bde5ee9f4a307608db5f58f24a0c8da736e96d20 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -85,6 +85,15 @@ public class Squid extends WaterAnimal {
diff --git a/patches/server/0111-Infinity-bow-settings.patch b/patches/server/0109-Infinity-bow-settings.patch
similarity index 97%
rename from patches/server/0111-Infinity-bow-settings.patch
rename to patches/server/0109-Infinity-bow-settings.patch
index 24842f0a2..04552956e 100644
--- a/patches/server/0111-Infinity-bow-settings.patch
+++ b/patches/server/0109-Infinity-bow-settings.patch
@@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
          } else {
              user.startUsingItem(hand);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 27b8310766566e17a46b880f6d2636bf62ae9cab..7dd7e464e1b463e47a41eb94d933edffbf39f280 100644
+index f4bae9da725ac4cbafe81d45035b5fcd176f1702..69b6b3f5646caa55e07fb9b581853f066c85a455 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -123,6 +123,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0112-Stonecutter-damage.patch b/patches/server/0110-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0112-Stonecutter-damage.patch
rename to patches/server/0110-Stonecutter-damage.patch
diff --git a/patches/server/0113-Configurable-daylight-cycle.patch b/patches/server/0111-Configurable-daylight-cycle.patch
similarity index 96%
rename from patches/server/0113-Configurable-daylight-cycle.patch
rename to patches/server/0111-Configurable-daylight-cycle.patch
index 7e5d89c30..aea61996e 100644
--- a/patches/server/0113-Configurable-daylight-cycle.patch
+++ b/patches/server/0111-Configurable-daylight-cycle.patch
@@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time % 192000; // Paper - fix guardian beam
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1ea18770c65583e2ed604eb15d15067a638a33a2..85b3ffb58b06ff6342abdd8948c1607079c4ee8f 100644
+index e830ea65511b36620000b55c567d4d760027de59..54481445beb1f409e4ad8c5a83d210cb5119abcb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -195,6 +195,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -70,7 +70,7 @@ index 1ea18770c65583e2ed604eb15d15067a638a33a2..85b3ffb58b06ff6342abdd8948c16070
  
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1a278a78caaa79cfed13bdd243e212d573a9af77..683d0e5699b8152b45fed8d1b3d1de7700b4705e 100644
+index b2abdc1589a466835d74672f54cfd2be4cb3ebd7..51fde7f245c5fb3378b8417cfbb3ee45132705ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -105,6 +105,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0112-Allow-infinite-and-mending-enchantments-together.patch
similarity index 95%
rename from patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0112-Allow-infinite-and-mending-enchantments-together.patch
index 198947116..7ffd05e00 100644
--- a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0112-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,7 +17,7 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index eee9f3091b2fa5368655db232670a84ed2703193..af299caa01193a6fa76656814164b0c5fbeec350 100644
+index 0af482784c7d9337b16c52ba52962f0380ae43e0..adcb7b6df1027fefc90f1affc9e6ab93b713e98e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -241,6 +241,16 @@ public class PurpurConfig {
diff --git a/patches/server/0115-Furnace-uses-lava-from-underneath.patch b/patches/server/0113-Furnace-uses-lava-from-underneath.patch
similarity index 95%
rename from patches/server/0115-Furnace-uses-lava-from-underneath.patch
rename to patches/server/0113-Furnace-uses-lava-from-underneath.patch
index 5316a0362..8787eb875 100644
--- a/patches/server/0115-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0113-Furnace-uses-lava-from-underneath.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Furnace uses lava from underneath
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b633bf9042 100644
+index dc78ade94d547b317be9858a92509cb463e5326b..c5a6d8da56cb62cb96e2c9975abd32a93441859f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -40,6 +40,7 @@ import net.minecraft.world.level.Level;
@@ -48,7 +48,7 @@ index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b6
  
      private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 683d0e5699b8152b45fed8d1b3d1de7700b4705e..be99ae32fd8279f00068743f9d9e365cc220a462 100644
+index 51fde7f245c5fb3378b8417cfbb3ee45132705ec..18ef612556f4a26a4eb58436d7d573631b1c0329 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -430,6 +430,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0114-Arrows-should-not-reset-despawn-counter.patch
similarity index 91%
rename from patches/server/0116-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0114-Arrows-should-not-reset-despawn-counter.patch
index 7c3aee370..9a24a096e 100644
--- a/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0114-Arrows-should-not-reset-despawn-counter.patch
@@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index f6fc98ffe49d5af9a69f57f2e53e6010f71d55d9..9f35f72a0bacf3847adedbfbd327ab55c483e85c 100644
+index da76e07b3caced3172ecade96a67aca81958a4dc..0d87f56b0c2c452547bae7415c3ad4d34fed1bba 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -308,7 +308,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0115-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 95%
rename from patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0115-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index b5280695c..a53650b95 100644
--- a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0115-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -24,7 +24,7 @@ index f638c7b27a846bf9db73e98ce9eb5d579bc25cac..e0ef42c2613374bedc8eb114aef7dd2a
                  return;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index be99ae32fd8279f00068743f9d9e365cc220a462..b285a01ab3dd34aefc5e082a60d762de454ac046 100644
+index 18ef612556f4a26a4eb58436d7d573631b1c0329..837197a340063bc8e3fb793e211828938e07b533 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -426,8 +426,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0116-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 100%
rename from patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0116-Add-adjustable-breeding-cooldown-to-config.patch
diff --git a/patches/server/0119-Make-entity-breeding-times-configurable.patch b/patches/server/0117-Make-entity-breeding-times-configurable.patch
similarity index 94%
rename from patches/server/0119-Make-entity-breeding-times-configurable.patch
rename to patches/server/0117-Make-entity-breeding-times-configurable.patch
index 67b4c8623..68622db5f 100644
--- a/patches/server/0119-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0117-Make-entity-breeding-times-configurable.patch
@@ -45,7 +45,7 @@ index d5d9f8e9c7119ae159a085aa414fc7f303be72a5..ff67d13f646551d7d4d2a169be656c98
              other.resetLove();
              world.addAllEntities(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 56f55c4520bec4b4baaa606e47ecf6c0288a104f..f9262c1fca1a1318fb5f6f607e8e71c1019c5c95 100644
+index a52c34dd52198d1d1af991596f84b0b9aa5f1e64..c21f67dac92bb6143d301f3a2cb250b2144cb27c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -214,6 +214,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -61,7 +61,7 @@ index 56f55c4520bec4b4baaa606e47ecf6c0288a104f..f9262c1fca1a1318fb5f6f607e8e71c1
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 1cbbc29ef19c8f1b8f96882213b662cfcb193033..052d1e51a891ee17bed0043f6f3fd162c15b16b2 100644
+index fa2099c98ae60102ad4e555af78ab26aca587dbf..bad5b47f3df186c77e578d5953cf1798179639d3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -144,6 +144,11 @@ public class Cat extends TamableAnimal {
@@ -77,7 +77,7 @@ index 1cbbc29ef19c8f1b8f96882213b662cfcb193033..052d1e51a891ee17bed0043f6f3fd162
  
      public ResourceLocation getResourceLocation() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 35cf6b9fb4d72df905d93bf52c02846b21b04007..50bd7f218ed5c85f52e8e53f027623a5ec12078b 100644
+index b3a6da8b1a221281d9f4d31cfb00ff525a8fdc65..c1a5650bd2df0fd89d0799346bddb8f15a587d10 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -70,6 +70,11 @@ public class Chicken extends Animal {
@@ -93,7 +93,7 @@ index 35cf6b9fb4d72df905d93bf52c02846b21b04007..50bd7f218ed5c85f52e8e53f027623a5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 9da76357da891a70e20ad80f50873b3b487dc84c..c718697a9511ccf761467644967397b777446db9 100644
+index 35c1de1cb74a38b414b4bf0516fa89c1c1a22a9f..c98ac7f1a3476b159299eb1e26505f1dcaec51b4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -57,6 +57,11 @@ public class Cow extends Animal {
@@ -109,7 +109,7 @@ index 9da76357da891a70e20ad80f50873b3b487dc84c..c718697a9511ccf761467644967397b7
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 406b6ed8084c18da1062d8e8049bdfff65101565..ba1bfad397d62dd6feccdbbe3288997cfe16ce84 100644
+index 04fddf897c52f041324bcef19c84bff3aa675d8a..03e75add762b19170e95d1b280f92e79f2f8f9bf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -176,6 +176,11 @@ public class Fox extends Animal {
@@ -154,7 +154,7 @@ index 9dde33111658b2b80dfe9609114067332ec7df27..417640879f17081591b1ed23c6704a8b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index de0247899f0bf785a94e39e170c8e2fc8a58b590..3b8c3aaa7f8249dafea44b306583cf7f7dbbed5e 100644
+index 708b6fb7982dc39ee090ae9a652d48046b833323..8b8dbc97ff069356ff471a6edc05cd3ddb21dca5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -83,6 +83,11 @@ public class Ocelot extends Animal {
@@ -170,7 +170,7 @@ index de0247899f0bf785a94e39e170c8e2fc8a58b590..3b8c3aaa7f8249dafea44b306583cf7f
  
      public boolean isTrusting() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e..a1538e9b97745dd775b48d38f14cff1b3fb1dd2e 100644
+index 68039d84c62005c7b2decde410c0578c6327b043..785f2b3deb32f0f7eb5c5a78313ba92710659868 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -133,6 +133,11 @@ public class Panda extends Animal {
@@ -186,7 +186,7 @@ index d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e..a1538e9b97745dd775b48d38f14cff1b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 1e38578a9a1531433866e2de7aa0ce5237da3b6b..2cc91c255e0f77b214b8ec54429c11bb1d6fe8e0 100644
+index 19caa59e11879b1269196fb0997b899e9e67b586..749f8bf4719923fe0cb4b09e1673c42709660da3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -181,6 +181,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
@@ -202,7 +202,7 @@ index 1e38578a9a1531433866e2de7aa0ce5237da3b6b..2cc91c255e0f77b214b8ec54429c11bb
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 518d28dc0b5b8c04263c93a4347e4c971a1318d8..98cf2268304f3a092dba45bb4297d14fe81cc057 100644
+index 7e2f102180ebe76a9fd52914bab844b9de25441f..284c355784f4714ab098b986c323e25f827a544e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -80,6 +80,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -218,7 +218,7 @@ index 518d28dc0b5b8c04263c93a4347e4c971a1318d8..98cf2268304f3a092dba45bb4297d14f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index d39c88af3882a09ff1a06f9052d7b9b8afdddda4..45934499067bb323413e73c99fe01bb223df7990 100644
+index 6b09e8adcd38acb92072838bb2869458dae1cb50..d9d8d1085c4ab1d000110b227807631b6849a4ce 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -114,6 +114,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -234,7 +234,7 @@ index d39c88af3882a09ff1a06f9052d7b9b8afdddda4..45934499067bb323413e73c99fe01bb2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index e0ba1ef404c9f8ba1eae563b733d10d94b1442e4..8d15e7ec0ae4bcdfd5628f41c0fc236eaa85d548 100644
+index a046bcf35717b156141dfa041a44d32b1512d708..e7adecb2324efaedd6aad3aa1213d53765b09b7e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -133,6 +133,11 @@ public class Rabbit extends Animal {
@@ -250,7 +250,7 @@ index e0ba1ef404c9f8ba1eae563b733d10d94b1442e4..8d15e7ec0ae4bcdfd5628f41c0fc236e
  
      // CraftBukkit start - code from constructor
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 497be3182c72b5a0f3bc42088c4168702119b527..607823661ba942ec03b1f61dac5a786b6f72ff7b 100644
+index e142d90d62c80c5e8b888521e4654e2b64b80990..af800fb4b789e28c112a6f351d128719a8a767e9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -131,6 +131,11 @@ public class Sheep extends Animal implements Shearable {
@@ -266,7 +266,7 @@ index 497be3182c72b5a0f3bc42088c4168702119b527..607823661ba942ec03b1f61dac5a786b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 66c01b8300bc09ace27e4d1a30ee9274c69fcc9a..3e8c90c2d44d906fae3dfc068a30c81a494a3268 100644
+index f2b55ebd460fbb95d3d7774cb5ea5bf2d38443b5..1d1157c9a9af89df653bc4f85fa4e6f80ca3a638 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -105,6 +105,11 @@ public class Turtle extends Animal {
@@ -282,7 +282,7 @@ index 66c01b8300bc09ace27e4d1a30ee9274c69fcc9a..3e8c90c2d44d906fae3dfc068a30c81a
  
      public void setHomePos(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index ae416b70109c959980b3115da6e97df1610996ca..ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9 100644
+index 2c5fe1e2f4eab38e26ca8ef198f2e6bb2ab20e3c..9ad96fec6110e26c0074c07fd8e2453e1d4271bb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -113,6 +113,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -298,7 +298,7 @@ index ae416b70109c959980b3115da6e97df1610996ca..ef4abaf68de01b0879f7d0b330d2d57c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 908c03736204a7dd84182b747bfaef34a1739700..75b9371d86c7954a9d6fbb150448ea2d68c73b99 100644
+index f1c8005c39ead1e61f7d8542711d6ac22be96682..10cbe9c872e368b93bcf2c46e2e3db894573479e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -110,6 +110,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -314,7 +314,7 @@ index 908c03736204a7dd84182b747bfaef34a1739700..75b9371d86c7954a9d6fbb150448ea2d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 0ee42f45a9877ffd6df80e602c3cb5affd43d285..ce2896c609d16a9b9a733930a3c4c3bd32ebec90 100644
+index f006b5c508b9ad2b0bc6d489323bab0322f96241..a924d85d16eec9e39ab917b166eebe5229b37c46 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -87,6 +87,11 @@ public class Goat extends Animal {
@@ -330,7 +330,7 @@ index 0ee42f45a9877ffd6df80e602c3cb5affd43d285..ce2896c609d16a9b9a733930a3c4c3bd
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index b4944ab2191241dc604ad21670360e5204bc111b..63378addd3de1a3e882f72bc6e1da74405bd79ed 100644
+index f0da5d107ddb2987ccc89f880ddba5e79fadf0c5..113b6d80885717d59c8fefab07afe68779f0051d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -35,6 +35,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -346,7 +346,7 @@ index b4944ab2191241dc604ad21670360e5204bc111b..63378addd3de1a3e882f72bc6e1da744
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c..b077b3d389e3439cf1115009a0edb4ed9f66bf02 100644
+index 9f7203608e15fdce1bfbaf419838768763d61378..2c5cb1b759a0b6e0233345da5a968288ec338837 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -59,6 +59,11 @@ public class Horse extends AbstractHorse {
@@ -362,7 +362,7 @@ index 6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c..b077b3d389e3439cf1115009a0edb4ed
  
      @Override
 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 5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d..93a05b945ac248df0ea7a0b9d7264a9c129c3bcf 100644
+index 98da60e297f08dc77bf1cd754458cb138ca9d219..8c615c5955ff3bd9e08cb629dc3732e04fc76394 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
 @@ -123,6 +123,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -378,7 +378,7 @@ index 5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d..93a05b945ac248df0ea7a0b9d7264a9c
  
      public boolean isTraderLlama() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index da3d0b431c14f1a0794b9445236af1f548139013..6bdf1727ae241538dc391431a55e5b089431bd7b 100644
+index 1ba32a3ba56974425762026026d1e5ba21540b3b..88e61572f5dd8d05fadab131046f74bd8131f42b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -34,6 +34,11 @@ public class Mule extends AbstractChestedHorse {
@@ -394,7 +394,7 @@ index da3d0b431c14f1a0794b9445236af1f548139013..6bdf1727ae241538dc391431a55e5b08
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index ffc36728e0fc90c4e37051adc643a2b8af8077ff..6d595941aa2dd36fda8bf7efea06b6d52c17647d 100644
+index 8bc2c6a3ee0eec08900b96eea3d0d545616bc513..9c6c7d3bdf6dad329bca4a64dc6ea1cf8db345c6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -49,6 +49,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -426,7 +426,7 @@ index c4eb99466c00c6cf1d60c7fa387f8b65efdac912..dbeed04103ee42bd16e7b785d7024214
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 6ca7b168a1ea26102922d9377e52662f16c1e725..74321ed51b25617bac25e3497ba908cd1751db09 100644
+index 48b72eb4051d612648a1978b38299c0c37a3a289..b6d9ba8dd5694952ca2eba54726ac5e587175250 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -47,6 +47,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -442,7 +442,7 @@ index 6ca7b168a1ea26102922d9377e52662f16c1e725..74321ed51b25617bac25e3497ba908cd
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 2d7b83ce2e0e26ef3976514ec8921a718ccc28bd..9d314470361b2e17afdadc355c084254e5b03aff 100644
+index 0f7383849399db1218acda986fe29ac14a36d768..22ce93fd265d3fa9967e6467301e8128635f2391 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -112,6 +112,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -458,7 +458,7 @@ index 2d7b83ce2e0e26ef3976514ec8921a718ccc28bd..9d314470361b2e17afdadc355c084254
  
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index fb0aa2854f8be22682ee65298080b668c722f447..975e15a501f01c1f87b80ee20d57f4d26051f326 100644
+index 2cd4f8b34611f20aaee1eba89ac831bb00c3470f..ff3b2904a843c1f4c1734f3e2a5bdc827dfdec3d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -82,6 +82,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
diff --git a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0118-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 98%
rename from patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0118-Apply-display-names-from-item-forms-of-entities-to-e.patch
index 625801135..befa51ebc 100644
--- a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0118-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 7a3a364f5e3b025cc0a5694401cb9298c80cb733..796ab61f4513c02b0d55d34044d2f7084c447796 100644
+index fee2bd03d007e6d69706f8cb953a2f6ae59cac35..bb710e62477df3048d5219f1edfa9ffdefacb41d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -597,7 +597,13 @@ public class ArmorStand extends LivingEntity {
@@ -142,7 +142,7 @@ index e5b042f2445eb06fb8075ba539c836595814fa14..8cdede6a9698d6c99b4f08edc2a3403f
  
              if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index be85b0687e46c3ee00709fef7396070fbbb717c2..64d6764348b0b394519ef554fd41ff07ca243308 100644
+index ad100c889c43bfb702819028862ca49a68695032..4a567fcc95561bbd40cbbb9533cfe81149fb1874 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -101,8 +101,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0119-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 95%
rename from patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0119-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
index 0f5833f08..bf7682ecc 100644
--- a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0119-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
                      ((Mob) newEntityLiving).setPersistenceRequired();
                  // Paper end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 64d6764348b0b394519ef554fd41ff07ca243308..0535ff98b429f796340f3f402313f558a2aca806 100644
+index 4a567fcc95561bbd40cbbb9533cfe81149fb1874..467c17a4b35d53da80d9eaa6d7fc5f0944413f5c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -102,9 +102,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0120-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 100%
rename from patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server/0120-Add-twisting-and-weeping-vines-growth-rates.patch
diff --git a/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0121-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 100%
rename from patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0121-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
diff --git a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0122-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 96%
rename from patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0122-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
index 496c419a5..8e359510f 100644
--- a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0122-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -8,7 +8,7 @@ This should help to reduce the amount of dirt, gravel, grass, and etc.
 that Endermen like to randomly place all over the world.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 10c3a0c49579fbd9f1fe7ec82eebd42be3412b69..f701807f2593189632a2a556e82bc0f1ba692dbf 100644
+index 7f205fc0b39294626c809fc69ada5adda59e2ed2..c5795f7b8cb66e633ea22af3f5b44f9995628f9e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -435,7 +435,7 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0126-Add-configurable-snowball-damage.patch b/patches/server/0123-Add-configurable-snowball-damage.patch
similarity index 95%
rename from patches/server/0126-Add-configurable-snowball-damage.patch
rename to patches/server/0123-Add-configurable-snowball-damage.patch
index 3c3cd66b6..f106b6be9 100644
--- a/patches/server/0126-Add-configurable-snowball-damage.patch
+++ b/patches/server/0123-Add-configurable-snowball-damage.patch
@@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7fa4e1e1e31de83d00aa32f2b4aeb6c245ae3131..985bf48699eb7bf205ec98c044552714a094fef7 100644
+index d5d2a742a0ae58bb43a946386bba7e38ae8a4b61..e94f79558ea0c380957f7984b03cb9f90190dee2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -295,6 +295,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0124-Changeable-Mob-Left-Handed-Chance.patch
similarity index 100%
rename from patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0124-Changeable-Mob-Left-Handed-Chance.patch
diff --git a/patches/server/0129-Add-boat-fall-damage-config.patch b/patches/server/0125-Add-boat-fall-damage-config.patch
similarity index 100%
rename from patches/server/0129-Add-boat-fall-damage-config.patch
rename to patches/server/0125-Add-boat-fall-damage-config.patch
diff --git a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
deleted file mode 100644
index 85c3f9711..000000000
--- a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 24 Nov 2020 04:30:46 -0600
-Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 60cf60faa852eeb2e1354d9fa32d97153dfcad7b..1356a027255671cc2d05db22c350506a928695ce 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
-     // Paper start
-     public boolean affectsSpawning = true;
-     // Paper end
-+    public boolean isCritical = false; // Purpur
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-@@ -1243,6 +1244,7 @@ public abstract class Player extends LivingEntity {
-                     flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
-                     flag2 = flag2 && !this.isSprinting();
-                     if (flag2) {
-+                        this.isCritical = true; // Purpur
-                         f *= 1.5F;
-                     }
- 
-@@ -1279,6 +1281,7 @@ public abstract class Player extends LivingEntity {
- 
-                     Vec3 vec3d = target.getDeltaMovement();
-                     boolean flag5 = target.hurt(DamageSource.playerAttack(this), f);
-+                    this.isCritical = false; // Purpur
- 
-                     if (flag5) {
-                         if (i > 0) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 950d8351881cd0ede3b32e1d07d3e68e06cd8e83..2f8466fddf1bc82d6b8971eabb5c12a3f5337640 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -973,7 +973,7 @@ public class CraftEventFactory {
-                 } else {
-                     damageCause = DamageCause.ENTITY_EXPLOSION;
-                 }
--                event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
-+                event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, damager instanceof HumanEntity && ((net.minecraft.world.entity.player.Player) damager).isCritical); // Purpur
-                 damager.processClick(InteractionHand.MAIN_HAND); // Purpur
-             }
-             event.setCancelled(cancelled);
-@@ -1054,7 +1054,7 @@ public class CraftEventFactory {
-             } else {
-                 throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
-             }
--            EntityDamageEvent event = new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions);
-+            EntityDamageEvent event = new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions, entityDamage instanceof HumanEntity && ((net.minecraft.world.entity.player.Player) entityDamage).isCritical); // Purpur
-             event.setCancelled(cancelled);
-             CraftEventFactory.callEvent(event);
-             if (!event.isCancelled()) {
-@@ -1111,7 +1111,7 @@ public class CraftEventFactory {
-     private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
-         EntityDamageEvent event;
-         if (damager != null) {
--            event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
-+            event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, damager instanceof HumanEntity && ((net.minecraft.world.entity.player.Player) damager).isCritical); // Purpur
-             damager.processClick(InteractionHand.MAIN_HAND); // Purpur
-         } else {
-             event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
diff --git a/patches/server/0130-Snow-Golem-rate-of-fire-config.patch b/patches/server/0126-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server/0130-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0126-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server/0131-EMC-Configurable-disable-give-dropping.patch b/patches/server/0127-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0131-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0127-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0127-Left-handed-API.patch b/patches/server/0127-Left-handed-API.patch
deleted file mode 100644
index f0ac2d079..000000000
--- a/patches/server/0127-Left-handed-API.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 30 Nov 2020 06:03:06 -0600
-Subject: [PATCH] Left handed API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 2386edf499cb292241f6ba60c1cdb46f2fe704ff..2f87513408972b7eed7fd0f3f94ac9799858f58a 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -135,4 +135,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
-         return getHandle().getMaxHeadXRot();
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public boolean isLeftHanded() {
-+        return getHandle().isLeftHanded();
-+    }
-+
-+    @Override
-+    public void setLeftHanded(boolean leftHanded) {
-+        getHandle().setLeftHanded(leftHanded);
-+    }
-+    // Purpur end
- }
diff --git a/patches/server/0132-Lobotomize-stuck-villagers.patch b/patches/server/0128-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/server/0132-Lobotomize-stuck-villagers.patch
rename to patches/server/0128-Lobotomize-stuck-villagers.patch
diff --git a/patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0129-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0129-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0130-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0130-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0131-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
similarity index 100%
rename from patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
rename to patches/server/0131-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
diff --git a/patches/server/0136-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0132-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 100%
rename from patches/server/0136-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0132-Configurable-chance-for-wolves-to-spawn-rabid.patch
diff --git a/patches/server/0137-Configurable-default-collar-color.patch b/patches/server/0133-Configurable-default-collar-color.patch
similarity index 100%
rename from patches/server/0137-Configurable-default-collar-color.patch
rename to patches/server/0133-Configurable-default-collar-color.patch
diff --git a/patches/server/0138-Phantom-flames-on-swoop.patch b/patches/server/0134-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server/0138-Phantom-flames-on-swoop.patch
rename to patches/server/0134-Phantom-flames-on-swoop.patch
diff --git a/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0135-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0135-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server/0140-Implement-TPSBar.patch b/patches/server/0136-Implement-TPSBar.patch
similarity index 99%
rename from patches/server/0140-Implement-TPSBar.patch
rename to patches/server/0136-Implement-TPSBar.patch
index 533e92b6d..68de54f73 100644
--- a/patches/server/0140-Implement-TPSBar.patch
+++ b/patches/server/0136-Implement-TPSBar.patch
@@ -84,7 +84,7 @@ index 8df2dcc97091d1b3025f9a7296d3c7badb54a630..a2542b5d72393b6e0a06bd5e21c1e4e9
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c53acfd01eac8c64f068a3c2a2a458b0c1b033a1..22a5cc3ade3cf1431a9d352fa2c30d3234413997 100644
+index 5655282578018c00a60d7ddc3fb48393da9cc2ee..4baeaf922b8529e7fb4a44fff9428a77e2ea78de 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -483,6 +483,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0141-Striders-give-saddle-back.patch b/patches/server/0137-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server/0141-Striders-give-saddle-back.patch
rename to patches/server/0137-Striders-give-saddle-back.patch
diff --git a/patches/server/0142-PlayerBookTooLargeEvent.patch b/patches/server/0138-PlayerBookTooLargeEvent.patch
similarity index 91%
rename from patches/server/0142-PlayerBookTooLargeEvent.patch
rename to patches/server/0138-PlayerBookTooLargeEvent.patch
index 3339fb8a1..47b6517e6 100644
--- a/patches/server/0142-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0138-PlayerBookTooLargeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5c9064ddcb74f789da713462ccf358bf8a881eb5..087abd2f3d8cd3f57e272551f8c576e330dda54f 100644
+index 3f2990b869f14c6c7be234d103f1e6f4c8fbf7da..114d15b61928ad1b659dc36367a9cc66cb1165b8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1136,10 +1136,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1141,10 +1141,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              int maxBookPageSize = com.destroystokyo.paper.PaperConfig.maxBookPageSize;
              double multiplier = Math.max(0.3D, Math.min(1D, com.destroystokyo.paper.PaperConfig.maxBookTotalSizeMultiplier));
              long byteAllowed = maxBookPageSize;
@@ -21,7 +21,7 @@ index 5c9064ddcb74f789da713462ccf358bf8a881eb5..087abd2f3d8cd3f57e272551f8c576e3
                      server.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
                      return;
                  }
-@@ -1163,6 +1165,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1168,6 +1170,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
diff --git a/patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0139-Full-netherite-armor-grants-fire-resistance.patch
similarity index 95%
rename from patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0139-Full-netherite-armor-grants-fire-resistance.patch
index 3193d5a7a..00af72486 100644
--- a/patches/server/0143-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0139-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 1356a027255671cc2d05db22c350506a928695ce..2ac738bfa2fc61150e2cd8ca0c3988aeffeb6427 100644
+index f991ed65d27d15a6eb32533f32da0bb9b69f331d..6423f422d4eca56cd8cbdd9c23925ce703b426f5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity {
+@@ -359,6 +359,16 @@ public abstract class Player extends LivingEntity {
              this.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 200, 0, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TURTLE_HELMET); // CraftBukkit
          }
  
diff --git a/patches/server/0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0140-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0144-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0140-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0141-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 99%
rename from patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0141-Add-mobGriefing-bypass-to-everything-affected.patch
index 447235530..bb7d10ab4 100644
--- a/patches/server/0145-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0141-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ccaa225eb0e2f88b4cb91cf72cd2082a81d36de6..733a9827554f129809e77fe41174b5b2b89b8e5c 100644
+index 44255a8cc6736bac90522480d0a164287785d9d6..a5d69e5b87d7a22ab4aa7305099d9db8c1794a5c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0142-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0142-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0147-Add-EntityTeleportHinderedEvent.patch b/patches/server/0143-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/server/0147-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0143-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/server/0148-Add-StructureGenerateEvent.patch b/patches/server/0144-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0148-Add-StructureGenerateEvent.patch
rename to patches/server/0144-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0149-Farmland-trampling-changes.patch b/patches/server/0145-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0149-Farmland-trampling-changes.patch
rename to patches/server/0145-Farmland-trampling-changes.patch
diff --git a/patches/server/0150-Movement-options-for-armor-stands.patch b/patches/server/0146-Movement-options-for-armor-stands.patch
similarity index 100%
rename from patches/server/0150-Movement-options-for-armor-stands.patch
rename to patches/server/0146-Movement-options-for-armor-stands.patch
diff --git a/patches/server/0151-Fix-stuck-in-portals.patch b/patches/server/0147-Fix-stuck-in-portals.patch
similarity index 100%
rename from patches/server/0151-Fix-stuck-in-portals.patch
rename to patches/server/0147-Fix-stuck-in-portals.patch
diff --git a/patches/server/0152-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0148-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from patches/server/0152-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0148-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0153-Config-to-always-tame-in-Creative.patch b/patches/server/0149-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0153-Config-to-always-tame-in-Creative.patch
rename to patches/server/0149-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0154-End-crystal-explosion-options.patch b/patches/server/0150-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0154-End-crystal-explosion-options.patch
rename to patches/server/0150-End-crystal-explosion-options.patch
diff --git a/patches/server/0155-Add-unsafe-Entity-serialization-API.patch b/patches/server/0151-Add-unsafe-Entity-serialization-API.patch
similarity index 98%
rename from patches/server/0155-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0151-Add-unsafe-Entity-serialization-API.patch
index a66c75a34..2586943a7 100644
--- a/patches/server/0155-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server/0151-Add-unsafe-Entity-serialization-API.patch
@@ -34,7 +34,7 @@ index 501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6..5ae88a924b2f2cfd714bd693eebc708e
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ac64c94048edb8b8b2e049ed1b0c366eadbb01be..d5bfcadd00d2035c3fb8bd2ba71c1912372f6dcc 100644
+index c912788886031ed2b34c1ef909a29aacfd2cd915..3a1ad1c0bd3be8ad7e7d7efb836bb18edbc7e4a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -407,9 +407,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0152-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0152-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
diff --git a/patches/server/0157-Dont-run-with-scissors.patch b/patches/server/0153-Dont-run-with-scissors.patch
similarity index 95%
rename from patches/server/0157-Dont-run-with-scissors.patch
rename to patches/server/0153-Dont-run-with-scissors.patch
index fb904acd5..09d8ac165 100644
--- a/patches/server/0157-Dont-run-with-scissors.patch
+++ b/patches/server/0153-Dont-run-with-scissors.patch
@@ -5,10 +5,10 @@ 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 087abd2f3d8cd3f57e272551f8c576e330dda54f..27a707c9dfc52a043c98aa39ba9307a71e32a232 100644
+index 114d15b61928ad1b659dc36367a9cc66cb1165b8..0118796efe4ee2d89315dfb4a40ead13d2f46a44 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1569,6 +1569,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1574,6 +1574,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                                      this.player.fallDistance = 0.0F;
                                  }
  
@@ -22,7 +22,7 @@ index 087abd2f3d8cd3f57e272551f8c576e330dda54f..27a707c9dfc52a043c98aa39ba9307a7
                                  this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
                                  this.lastGoodX = this.player.getX();
                                  this.lastGoodY = this.player.getY();
-@@ -1581,6 +1588,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1586,6 +1593,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
      }
  
diff --git a/patches/server/0158-One-Punch-Man.patch b/patches/server/0154-One-Punch-Man.patch
similarity index 96%
rename from patches/server/0158-One-Punch-Man.patch
rename to patches/server/0154-One-Punch-Man.patch
index aabee5a48..287daea23 100644
--- a/patches/server/0158-One-Punch-Man.patch
+++ b/patches/server/0154-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 733a9827554f129809e77fe41174b5b2b89b8e5c..b2dbe65f07ecc25be810f80aaf05d924c998dfac 100644
+index a5d69e5b87d7a22ab4aa7305099d9db8c1794a5c..140180d0be9f14a10bf7ac9f4bc16bf183ee700e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2137,6 +2137,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0159-Add-config-for-snow-on-blue-ice.patch b/patches/server/0155-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0159-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0155-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0156-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0156-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0161-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0157-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 100%
rename from patches/server/0161-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0157-Config-to-ignore-nearby-mobs-when-sleeping.patch
diff --git a/patches/server/0162-Add-back-player-spawned-endermite-API.patch b/patches/server/0158-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0162-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0158-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0159-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0159-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0160-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0160-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0165-Tick-fluids-config.patch b/patches/server/0161-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0165-Tick-fluids-config.patch
rename to patches/server/0161-Tick-fluids-config.patch
diff --git a/patches/server/0166-Config-to-disable-Llama-caravans.patch b/patches/server/0162-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0166-Config-to-disable-Llama-caravans.patch
rename to patches/server/0162-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0167-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0163-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0167-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0163-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0168-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0164-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0168-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0164-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0169-Sneak-to-bulk-process-composter.patch b/patches/server/0165-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0169-Sneak-to-bulk-process-composter.patch
rename to patches/server/0165-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0170-Config-for-skipping-night.patch b/patches/server/0166-Config-for-skipping-night.patch
similarity index 96%
rename from patches/server/0170-Config-for-skipping-night.patch
rename to patches/server/0166-Config-for-skipping-night.patch
index 3a8cdec8f..518f0e33d 100644
--- a/patches/server/0170-Config-for-skipping-night.patch
+++ b/patches/server/0166-Config-for-skipping-night.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 069d98dd18713d7dd306b7a74b62ab7735da0a6a..6d43ad60dd374366d675b52e5b5e958b0cb1e1e2 100644
+index 54481445beb1f409e4ad8c5a83d210cb5119abcb..aab9dbe91b44408e5b530e32eddac4ffd6ee3b1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0171-Add-config-for-villager-trading.patch b/patches/server/0167-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0171-Add-config-for-villager-trading.patch
rename to patches/server/0167-Add-config-for-villager-trading.patch
diff --git a/patches/server/0172-Allow-infinity-on-crossbows.patch b/patches/server/0168-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0172-Allow-infinity-on-crossbows.patch
rename to patches/server/0168-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0173-Drowning-Settings.patch b/patches/server/0169-Drowning-Settings.patch
similarity index 97%
rename from patches/server/0173-Drowning-Settings.patch
rename to patches/server/0169-Drowning-Settings.patch
index f9eab469a..9f34d443b 100644
--- a/patches/server/0173-Drowning-Settings.patch
+++ b/patches/server/0169-Drowning-Settings.patch
@@ -27,7 +27,7 @@ index 3c5347c0d4b65ced4b942504b1cdb8aab53016a5..3a010a01c6cfd5307b1856bb9d70e81c
  
      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 b2dbe65f07ecc25be810f80aaf05d924c998dfac..7980fcfeb6e7a7ec32082cfb2879ff6d5480d1a2 100644
+index 140180d0be9f14a10bf7ac9f4bc16bf183ee700e..c2a4a872cca89912b7cb85af790a5001a9705b99 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -424,7 +424,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0174-Break-individual-slabs-when-sneaking.patch b/patches/server/0170-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0174-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0170-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0171-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0171-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0172-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0172-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0177-Option-to-make-doors-require-redstone.patch b/patches/server/0173-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0177-Option-to-make-doors-require-redstone.patch
rename to patches/server/0173-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0174-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0174-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0179-Configurable-sponge-absorption.patch b/patches/server/0175-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0179-Configurable-sponge-absorption.patch
rename to patches/server/0175-Configurable-sponge-absorption.patch
diff --git a/patches/server/0180-Projectile-offset-config.patch b/patches/server/0176-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0180-Projectile-offset-config.patch
rename to patches/server/0176-Projectile-offset-config.patch
diff --git a/patches/server/0181-Config-for-powered-rail-activation-distance.patch b/patches/server/0177-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0181-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0177-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0182-Piglin-portal-spawn-modifier.patch b/patches/server/0178-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0182-Piglin-portal-spawn-modifier.patch
rename to patches/server/0178-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0183-Config-to-change-max-number-of-bees.patch b/patches/server/0179-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0183-Config-to-change-max-number-of-bees.patch
rename to patches/server/0179-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0180-Configurable-damage-settings-for-magma-blocks.patch
similarity index 100%
rename from patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0180-Configurable-damage-settings-for-magma-blocks.patch
diff --git a/patches/server/0185-Config-for-wither-explosion-radius.patch b/patches/server/0181-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0185-Config-for-wither-explosion-radius.patch
rename to patches/server/0181-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0186-Gamemode-extra-permissions.patch b/patches/server/0182-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0186-Gamemode-extra-permissions.patch
rename to patches/server/0182-Gamemode-extra-permissions.patch
diff --git a/patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0183-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0183-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0188-Configurable-piston-push-limit.patch b/patches/server/0184-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0188-Configurable-piston-push-limit.patch
rename to patches/server/0184-Configurable-piston-push-limit.patch
diff --git a/patches/server/0189-Configurable-broadcast-settings.patch b/patches/server/0185-Configurable-broadcast-settings.patch
similarity index 100%
rename from patches/server/0189-Configurable-broadcast-settings.patch
rename to patches/server/0185-Configurable-broadcast-settings.patch
diff --git a/patches/server/0190-Fix-SPIGOT-6278.patch b/patches/server/0186-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0190-Fix-SPIGOT-6278.patch
rename to patches/server/0186-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0191-Configurable-mob-blindness.patch b/patches/server/0187-Configurable-mob-blindness.patch
similarity index 96%
rename from patches/server/0191-Configurable-mob-blindness.patch
rename to patches/server/0187-Configurable-mob-blindness.patch
index 3f10fcea0..2582dada2 100644
--- a/patches/server/0191-Configurable-mob-blindness.patch
+++ b/patches/server/0187-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 7980fcfeb6e7a7ec32082cfb2879ff6d5480d1a2..e1308770c3510f54da40b2ff38d08186bac22518 100644
+index c2a4a872cca89912b7cb85af790a5001a9705b99..66f15b3450ccdc36451a21a91d9a6ddaec6c05ba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -991,6 +991,17 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0192-Hide-hidden-players-from-entity-selector.patch b/patches/server/0188-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0192-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0188-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0193-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0189-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server/0193-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0189-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server/0194-Iron-golem-poppy-calms-anger.patch b/patches/server/0190-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/server/0194-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0190-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/server/0195-Breedable-parrots.patch b/patches/server/0191-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0195-Breedable-parrots.patch
rename to patches/server/0191-Breedable-parrots.patch
diff --git a/patches/server/0196-Configurable-powered-rail-boost-modifier.patch b/patches/server/0192-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0196-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0192-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0193-Add-config-change-multiplier-critical-damage-value.patch
similarity index 89%
rename from patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0193-Add-config-change-multiplier-critical-damage-value.patch
index becaaa0a8..c4208c302 100644
--- a/patches/server/0197-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0193-Add-config-change-multiplier-critical-damage-value.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add config change multiplier critical damage value
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2ac738bfa2fc61150e2cd8ca0c3988aeffeb6427..c6267fa6832596c1c0944cecbbe0e4ed0eb3e0b8 100644
+index 6423f422d4eca56cd8cbdd9c23925ce703b426f5..8a06a090993119da256db12671e56720ef74c2e2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
+@@ -1253,7 +1253,7 @@ public abstract class Player extends LivingEntity {
+                     flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
                      flag2 = flag2 && !this.isSprinting();
                      if (flag2) {
-                         this.isCritical = true; // Purpur
 -                        f *= 1.5F;
 +                        f *= this.level.purpurConfig.playerCriticalDamageMultiplier; // Purpur
                      }
diff --git a/patches/server/0198-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0194-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0198-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0194-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0199-Config-for-unverified-username-message.patch b/patches/server/0195-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0199-Config-for-unverified-username-message.patch
rename to patches/server/0195-Config-for-unverified-username-message.patch
diff --git a/patches/server/0200-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0196-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0200-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0196-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0201-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0197-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0201-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0197-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0202-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0198-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0202-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0198-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0203-API-for-any-mob-to-burn-daylight.patch b/patches/server/0199-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0203-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0199-API-for-any-mob-to-burn-daylight.patch
index 38231358e..d38677b72 100644
--- a/patches/server/0203-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0199-API-for-any-mob-to-burn-daylight.patch
@@ -29,7 +29,7 @@ index d3d6dc230674a4c6f9c388b131e1feb42660d865..840e60987e4ba4b49088b82e35ecc5a1
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e1308770c3510f54da40b2ff38d08186bac22518..214bc2bcbcb88a9a62d2151a62aaa57beadc7da0 100644
+index 66f15b3450ccdc36451a21a91d9a6ddaec6c05ba..47d9560f4f092e999488a735f6ef9987d4bab0c0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index e1308770c3510f54da40b2ff38d08186bac22518..214bc2bcbcb88a9a62d2151a62aaa57b
      }
  
      // CraftBukkit start
-@@ -3318,6 +3325,27 @@ public abstract class LivingEntity extends Entity {
+@@ -3330,6 +3337,27 @@ public abstract class LivingEntity extends Entity {
              this.hurt(DamageSource.DROWN, 1.0F);
          }
  
diff --git a/patches/server/0204-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0200-Fix-advancement-triggers-on-entity-death.patch
similarity index 96%
rename from patches/server/0204-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0200-Fix-advancement-triggers-on-entity-death.patch
index 2efa04f76..fbf99dcfa 100644
--- a/patches/server/0204-Fix-advancement-triggers-on-entity-death.patch
+++ b/patches/server/0200-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 214bc2bcbcb88a9a62d2151a62aaa57beadc7da0..6d7a2eece40e5c665d6ec6f21f8a342e350fbec4 100644
+index 47d9560f4f092e999488a735f6ef9987d4bab0c0..51b6c005db04ba60a3766bc6072ef311eab53992 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity {
@@ -139,10 +139,10 @@ index 31454b15a20e0484e21c25ffb80d4d536e2ecc0b..4fd44e58e9b83f45a66562f53710ee64
      public boolean canTakeItem(ItemStack stack) {
          net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c6267fa6832596c1c0944cecbbe0e4ed0eb3e0b8..dc26629d7aa1fc82dbc9902c807312cd814e5465 100644
+index 8a06a090993119da256db12671e56720ef74c2e2..0c0d4ec5893f082a8b4071a627a64c7b88fd0067 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1991,6 +1991,52 @@ public abstract class Player extends LivingEntity {
+@@ -1988,6 +1988,52 @@ public abstract class Player extends LivingEntity {
  
      }
  
diff --git a/patches/server/0205-Config-MobEffect-by-world.patch b/patches/server/0201-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0205-Config-MobEffect-by-world.patch
rename to patches/server/0201-Config-MobEffect-by-world.patch
diff --git a/patches/server/0206-Beacon-Activation-Range-Configurable.patch b/patches/server/0202-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0206-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0202-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0207-Add-toggle-for-sand-duping-fix.patch b/patches/server/0203-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0207-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0203-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0208-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0204-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 100%
rename from patches/server/0208-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0204-Add-toggle-for-end-portal-safe-teleporting.patch
diff --git a/patches/server/0209-Flying-Fall-Damage-API.patch b/patches/server/0205-Flying-Fall-Damage-API.patch
similarity index 87%
rename from patches/server/0209-Flying-Fall-Damage-API.patch
rename to patches/server/0205-Flying-Fall-Damage-API.patch
index f11e1f72a..32d7c3146 100644
--- a/patches/server/0209-Flying-Fall-Damage-API.patch
+++ b/patches/server/0205-Flying-Fall-Damage-API.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index dc26629d7aa1fc82dbc9902c807312cd814e5465..c1af87a22cfc13998358a71f46c09bed350f4d42 100644
+index 0c0d4ec5893f082a8b4071a627a64c7b88fd0067..3b5c1bf87268dc10719c3f8e3e8c105fa7177b9f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
+@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
+     // Paper start
      public boolean affectsSpawning = true;
      // Paper end
-     public boolean isCritical = false; // Purpur
 +    public boolean flyingFallDamage = false; // Purpur
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -1730,7 +1731,7 @@ public abstract class Player extends LivingEntity {
+@@ -1727,7 +1728,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
diff --git a/patches/server/0210-Make-lightning-rod-range-configurable.patch b/patches/server/0206-Make-lightning-rod-range-configurable.patch
similarity index 96%
rename from patches/server/0210-Make-lightning-rod-range-configurable.patch
rename to patches/server/0206-Make-lightning-rod-range-configurable.patch
index 36034714b..4ef03238d 100644
--- a/patches/server/0210-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0206-Make-lightning-rod-range-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d43ad60dd374366d675b52e5b5e958b0cb1e1e2..984dd58c368595157e51c4c843512803bc8dfd02 100644
+index aab9dbe91b44408e5b530e32eddac4ffd6ee3b1d..05a52fd9540e725b1b6feb2c472ae38a9da0ec1a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1012,7 +1012,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0207-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 93%
rename from patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0207-Burp-after-eating-food-fills-hunger-bar-completely.patch
index bd331d8b9..53193c629 100644
--- a/patches/server/0211-Burp-after-eating-food-fills-hunger-bar-completely.patch
+++ b/patches/server/0207-Burp-after-eating-food-fills-hunger-bar-completely.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c1af87a22cfc13998358a71f46c09bed350f4d42..0859225191e3ebc14a8b7ec069e9414d67c6274e 100644
+index 3b5c1bf87268dc10719c3f8e3e8c105fa7177b9f..ffa4b28ffee3a0429cc350777234345f9cefe9f6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -196,6 +196,8 @@ public abstract class Player extends LivingEntity {
+@@ -195,6 +195,8 @@ public abstract class Player extends LivingEntity {
      // CraftBukkit end
  
      // Purpur start
@@ -17,7 +17,7 @@ index c1af87a22cfc13998358a71f46c09bed350f4d42..0859225191e3ebc14a8b7ec069e9414d
      public abstract void resetLastActionTime();
  
      public void setAfk(boolean afk) {
-@@ -258,6 +260,12 @@ public abstract class Player extends LivingEntity {
+@@ -257,6 +259,12 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -30,7 +30,7 @@ index c1af87a22cfc13998358a71f46c09bed350f4d42..0859225191e3ebc14a8b7ec069e9414d
          this.noPhysics = this.isSpectator();
          if (this.isSpectator()) {
              this.onGround = false;
-@@ -2345,7 +2353,7 @@ public abstract class Player extends LivingEntity {
+@@ -2342,7 +2350,7 @@ public abstract class Player extends LivingEntity {
      public ItemStack eat(Level world, ItemStack stack) {
          this.getFoodData().eat(stack.getItem(), stack);
          this.awardStat(Stats.ITEM_USED.get(stack.getItem()));
diff --git a/patches/server/0212-Allow-player-join-full-server-by-permission.patch b/patches/server/0208-Allow-player-join-full-server-by-permission.patch
similarity index 93%
rename from patches/server/0212-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0208-Allow-player-join-full-server-by-permission.patch
index 16e61fbce..c41b9205a 100644
--- a/patches/server/0212-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0208-Allow-player-join-full-server-by-permission.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 22a5cc3ade3cf1431a9d352fa2c30d3234413997..98040579a8ce4ce0e6828840700a3e528e434741 100644
+index 4baeaf922b8529e7fb4a44fff9428a77e2ea78de..e3dadb8ad7d1f4154ae56fbc0129b64617aacf8a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -764,7 +764,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0213-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0209-Add-permission-bypass-for-portal-waiting.patch
similarity index 85%
rename from patches/server/0213-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0209-Add-permission-bypass-for-portal-waiting.patch
index c4fc05d7a..4e155322d 100644
--- a/patches/server/0213-Add-permission-bypass-for-portal-waiting.patch
+++ b/patches/server/0209-Add-permission-bypass-for-portal-waiting.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Add permission bypass for portal waiting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0859225191e3ebc14a8b7ec069e9414d67c6274e..9dd85be032f07cb67f4f384b6cda2b5735154c91 100644
+index ffa4b28ffee3a0429cc350777234345f9cefe9f6..e6c429b2afc2f45ffbe4c8dcf1a4b4955626ee86 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {
+@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
+     public boolean affectsSpawning = true;
      // Paper end
-     public boolean isCritical = false; // Purpur
      public boolean flyingFallDamage = false; // Purpur
 +    public boolean canPortalInstant = false; // Purpur
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -465,7 +466,7 @@ public abstract class Player extends LivingEntity {
+@@ -464,7 +465,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public int getPortalWaitTime() {
diff --git a/patches/server/0214-Shulker-spawn-from-bullet-options.patch b/patches/server/0210-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0214-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0210-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0215-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0211-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0215-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0211-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0216-Option-to-make-drowned-break-doors.patch b/patches/server/0212-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0216-Option-to-make-drowned-break-doors.patch
rename to patches/server/0212-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0217-Configurable-hunger-starvation-damage.patch b/patches/server/0213-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0217-Configurable-hunger-starvation-damage.patch
rename to patches/server/0213-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0218-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0214-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 98%
rename from patches/server/0218-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0214-Redirect-System.out-calls-to-plugin-loggers.patch
index 2246db184..f076cd298 100644
--- a/patches/server/0218-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0214-Redirect-System.out-calls-to-plugin-loggers.patch
@@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..f88da0b86a683b25d429ceea4a36d6dd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 64fa32a25e5e2d745d7605dfb1439f0e087dc304..1cdc15dc93b64887abbc5e7df1a91fc4705df169 100644
+index f38fe2e10dd6893dc4dbce9647d59e1f39e94d11..b5dead20f18087c8ebbd564aa25a17c60c549107 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -291,7 +291,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0219-Armor-click-equip-options.patch b/patches/server/0215-Armor-click-equip-options.patch
similarity index 100%
rename from patches/server/0219-Armor-click-equip-options.patch
rename to patches/server/0215-Armor-click-equip-options.patch
diff --git a/patches/server/0220-Add-uptime-command.patch b/patches/server/0216-Add-uptime-command.patch
similarity index 98%
rename from patches/server/0220-Add-uptime-command.patch
rename to patches/server/0216-Add-uptime-command.patch
index 4da6a317b..953fc9350 100644
--- a/patches/server/0220-Add-uptime-command.patch
+++ b/patches/server/0216-Add-uptime-command.patch
@@ -17,7 +17,7 @@ index d734addd622f6d429a79df08310bce562db3425e..d298e70100741808d466d7113eb268fb
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d87f8d7414d630890c33e41e602936068d48abd3..9cf2fc8512a6df0952bf6c534627cd66f47d1e7d 100644
+index ed9b986a0a2e6e918406392437c354aa48a563e4..80e81d4482f4e4451150d3d3cc8fe244be35d6e9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0221-Structure-seed-options.patch b/patches/server/0217-Structure-seed-options.patch
similarity index 100%
rename from patches/server/0221-Structure-seed-options.patch
rename to patches/server/0217-Structure-seed-options.patch
diff --git a/patches/server/0222-Tool-actionable-options.patch b/patches/server/0218-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0222-Tool-actionable-options.patch
rename to patches/server/0218-Tool-actionable-options.patch
diff --git a/patches/server/0223-Store-placer-on-Block-when-placed.patch b/patches/server/0219-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0223-Store-placer-on-Block-when-placed.patch
rename to patches/server/0219-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0224-Summoner-API.patch b/patches/server/0220-Summoner-API.patch
similarity index 100%
rename from patches/server/0224-Summoner-API.patch
rename to patches/server/0220-Summoner-API.patch
diff --git a/patches/server/0225-Customizable-sleeping-actionbar-messages.patch b/patches/server/0221-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0225-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0221-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0226-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0222-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0226-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0222-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0227-Silk-touchable-budding-amethyst.patch b/patches/server/0223-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0227-Silk-touchable-budding-amethyst.patch
rename to patches/server/0223-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0228-Big-dripleaf-tilt-delay.patch b/patches/server/0224-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0228-Big-dripleaf-tilt-delay.patch
rename to patches/server/0224-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0229-Player-ridable-in-water-option.patch b/patches/server/0225-Player-ridable-in-water-option.patch
similarity index 93%
rename from patches/server/0229-Player-ridable-in-water-option.patch
rename to patches/server/0225-Player-ridable-in-water-option.patch
index d065be32a..75a83332b 100644
--- a/patches/server/0229-Player-ridable-in-water-option.patch
+++ b/patches/server/0225-Player-ridable-in-water-option.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9dd85be032f07cb67f4f384b6cda2b5735154c91..e2be38964e246f48e074a807e96e2d7c37cfad64 100644
+index e6c429b2afc2f45ffbe4c8dcf1a4b4955626ee86..ab3fa78c369ebbf92857ef257e0019a0af2f323a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2062,6 +2062,11 @@ public abstract class Player extends LivingEntity {
+@@ -2059,6 +2059,11 @@ public abstract class Player extends LivingEntity {
          return this.inventory.armor;
      }
  
diff --git a/patches/server/0230-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0226-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0230-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0226-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0231-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0227-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
similarity index 100%
rename from patches/server/0231-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
rename to patches/server/0227-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
diff --git a/patches/server/0232-Add-compass-command.patch b/patches/server/0228-Add-compass-command.patch
similarity index 100%
rename from patches/server/0232-Add-compass-command.patch
rename to patches/server/0228-Add-compass-command.patch
diff --git a/patches/server/0233-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0229-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 96%
rename from patches/server/0233-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0229-Config-to-prevent-horses-from-standing-with-riders.patch
index 83d54d6a8..7a342a19a 100644
--- a/patches/server/0233-Config-to-prevent-horses-from-standing-with-riders.patch
+++ b/patches/server/0229-Config-to-prevent-horses-from-standing-with-riders.patch
@@ -7,7 +7,7 @@ Horses have a chance to stand (rear) when their ambient noise is played.
 This can happen while the horse is moving with a rider, which will cause the horse to suddenly stop for a moment.
 
 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 41bd09ca3cfc722f03d6bf8361f56f8fe0721b87..3f7f8af62aca9825c2475a95a6ae62446cf6ad30 100644
+index dbd34f589a146b9b408318c3810321ab6bce57f6..6e3f56843c47bc58eaf3d8e3b75299b36acd47d1 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
 @@ -394,7 +394,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
diff --git a/patches/server/0234-Toggle-for-kinetic-damage.patch b/patches/server/0230-Toggle-for-kinetic-damage.patch
similarity index 93%
rename from patches/server/0234-Toggle-for-kinetic-damage.patch
rename to patches/server/0230-Toggle-for-kinetic-damage.patch
index 732facffd..e930d7b99 100644
--- a/patches/server/0234-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0230-Toggle-for-kinetic-damage.patch
@@ -5,10 +5,10 @@ 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 6d7a2eece40e5c665d6ec6f21f8a342e350fbec4..fa3d4b52653398a18105b92e41e0186f27268d8f 100644
+index 51b6c005db04ba60a3766bc6072ef311eab53992..d04fb96a8c8c6362fe19a19a0d6c120adcb60e56 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2792,7 +2792,11 @@ public abstract class LivingEntity extends Entity {
+@@ -2804,7 +2804,11 @@ public abstract class LivingEntity extends Entity {
  
                      if (f4 > 0.0F) {
                          this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);
diff --git a/patches/server/0235-Add-Option-for-disable-observer-clocks.patch b/patches/server/0231-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0235-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0231-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0236-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0232-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0236-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0232-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0237-Option-for-sponges-to-work-on-lava.patch b/patches/server/0233-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0237-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0233-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0238-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0234-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0238-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0234-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0239-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0235-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0239-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0235-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0240-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0236-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0240-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0236-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0241-Conduit-behavior-configuration.patch b/patches/server/0237-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0241-Conduit-behavior-configuration.patch
rename to patches/server/0237-Conduit-behavior-configuration.patch
diff --git a/patches/server/0242-Cauldron-fill-chances.patch b/patches/server/0238-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0242-Cauldron-fill-chances.patch
rename to patches/server/0238-Cauldron-fill-chances.patch
diff --git a/patches/server/0243-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0239-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0243-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0239-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0244-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0240-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/server/0244-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0240-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/server/0245-Shulker-change-color-with-dye.patch b/patches/server/0241-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0245-Shulker-change-color-with-dye.patch
rename to patches/server/0241-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0246-Extended-OfflinePlayer-API.patch b/patches/server/0242-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0246-Extended-OfflinePlayer-API.patch
rename to patches/server/0242-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0247-Added-the-ability-to-add-combustible-items.patch b/patches/server/0243-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0247-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0243-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0244-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0244-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0249-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0245-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0249-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0245-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0250-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0246-Shift-right-click-to-use-exp-for-mending.patch
similarity index 96%
rename from patches/server/0250-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0246-Shift-right-click-to-use-exp-for-mending.patch
index 7e1f53e3c..949cec637 100644
--- a/patches/server/0250-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0246-Shift-right-click-to-use-exp-for-mending.patch
@@ -36,10 +36,10 @@ index a61c0ca02b085d1ab2587d54c9fcdc76a726cc4e..a11a7deefb7fdf7ca9b23f85f5ae5f7c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27a707c9dfc52a043c98aa39ba9307a71e32a232..306691d449decd3f40a3cbbf9ec9782877da5674 100644
+index 0118796efe4ee2d89315dfb4a40ead13d2f46a44..54b837d3a70862622a3e6d2a5f900eff4ead9103 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1931,6 +1931,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1936,6 +1936,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              boolean cancelled;
              if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
diff --git a/patches/server/0251-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0247-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0251-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0247-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0252-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0248-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0252-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0248-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0253-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0249-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0253-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0249-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0254-horses-tempted-by-gold-config.patch b/patches/server/0250-horses-tempted-by-gold-config.patch
similarity index 95%
rename from patches/server/0254-horses-tempted-by-gold-config.patch
rename to patches/server/0250-horses-tempted-by-gold-config.patch
index 589ee1234..0806a0312 100644
--- a/patches/server/0254-horses-tempted-by-gold-config.patch
+++ b/patches/server/0250-horses-tempted-by-gold-config.patch
@@ -5,7 +5,7 @@ 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 3f7f8af62aca9825c2475a95a6ae62446cf6ad30..f8de46caf169da91b18c04a8f4c2e65f5f271afa 100644
+index 6e3f56843c47bc58eaf3d8e3b75299b36acd47d1..311c18145a3c01d0105f81f32d5f7fe49c016500 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
 @@ -168,6 +168,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
diff --git a/patches/server/0255-llama-tempted-by-hay-config.patch b/patches/server/0251-llama-tempted-by-hay-config.patch
similarity index 100%
rename from patches/server/0255-llama-tempted-by-hay-config.patch
rename to patches/server/0251-llama-tempted-by-hay-config.patch
diff --git a/patches/server/0256-Halloween-options-and-optimizations.patch b/patches/server/0252-Halloween-options-and-optimizations.patch
similarity index 100%
rename from patches/server/0256-Halloween-options-and-optimizations.patch
rename to patches/server/0252-Halloween-options-and-optimizations.patch
diff --git a/patches/server/0257-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0253-Config-for-Grindstones-ignoring-curses.patch
similarity index 100%
rename from patches/server/0257-Config-for-Grindstones-ignoring-curses.patch
rename to patches/server/0253-Config-for-Grindstones-ignoring-curses.patch
diff --git a/patches/server/0258-UPnP-Port-Forwarding.patch b/patches/server/0254-UPnP-Port-Forwarding.patch
similarity index 97%
rename from patches/server/0258-UPnP-Port-Forwarding.patch
rename to patches/server/0254-UPnP-Port-Forwarding.patch
index 8059fb3de..b5309e526 100644
--- a/patches/server/0258-UPnP-Port-Forwarding.patch
+++ b/patches/server/0254-UPnP-Port-Forwarding.patch
@@ -67,7 +67,7 @@ index 61877f5ba0e54bbf046dabc067c79bf4df588278..d5c61053f6af91aa5d0894750ab86372
          // CraftBukkit start
          // this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage))); // Spigot - moved up
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b55c464928dc246c962d5056ad6b99bdad94d3bc..02c6bb6be09130a3920581e14356075780dae104 100644
+index 1134bc154cb3d83b510e48bd78851a93cfecbbe3..7e36bcda5b8caee9fb604d26f7b9b22a7b1fea98 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -396,4 +396,9 @@ public class PurpurConfig {
diff --git a/patches/server/0259-Campfire-option-for-lit-when-placed.patch b/patches/server/0255-Campfire-option-for-lit-when-placed.patch
similarity index 100%
rename from patches/server/0259-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0255-Campfire-option-for-lit-when-placed.patch
diff --git a/patches/server/0260-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0256-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 100%
rename from patches/server/0260-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0256-options-to-extinguish-fire-blocks-with-snowballs.patch