From b538cd9fbad83011169d3780ca376a5a81b941d0 Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
Date: Sun, 21 Feb 2021 13:00:30 -0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
466820160 Upstream Update (#5211)
2a0ee4b65 Add support for hex color codes in console
4e958e229 We're going on an Adventure! (#4842)
1a9735611 Stop loop when flags set to false (#5101)
a5928db4a [Auto] Updated Upstream (CraftBukkit)
---
 Paper                                         |  2 +-
 patches/api/0001-Tuinity-API-Changes.patch    |  6 +-
 patches/api/0002-Purpur-config-files.patch    |  4 +-
 .../api/0004-Allow-inventory-resizing.patch   |  6 +-
 patches/api/0007-AFK-API.patch                |  4 +-
 patches/api/0008-Bring-back-server-name.patch |  8 +-
 patches/api/0011-Lagging-threshold.patch      |  8 +-
 .../api/0012-ItemFactory-getMonsterEgg.patch  |  6 +-
 .../api/0016-Player-invulnerabilities.patch   |  4 +-
 .../0018-ItemStack-convenience-methods.patch  |  4 +-
 patches/api/0021-Ridables.patch               |  4 +-
 ...oc-warnings-missing-param-and-return.patch | 40 +++++-----
 ...-Add-unsafe-Entity-serialization-API.patch |  4 +-
 .../server/0001-Tuinity-Server-Changes.patch  | 34 ++++----
 patches/server/0002-Rebrand.patch             |  2 +-
 patches/server/0003-Purpur-config-files.patch | 10 +--
 patches/server/0005-Add-component-util.patch  | 44 ----------
 ...0005-Barrels-and-enderchests-6-rows.patch} |  4 +-
 ...t-API.patch => 0006-Advancement-API.patch} |  0
 ...8-Llama-API.patch => 0007-Llama-API.patch} |  0
 ...{0009-AFK-API.patch => 0008-AFK-API.patch} | 16 ++--
 ...atch => 0009-Bring-back-server-name.patch} |  4 +-
 ...> 0010-Configurable-server-mod-name.patch} |  0
 ... 0011-LivingEntity-safeFallDistance.patch} |  0
 ...old.patch => 0012-Lagging-threshold.patch} |  4 +-
 ...h => 0013-ItemFactory-getMonsterEgg.patch} |  4 +-
 ...14-PlayerSetSpawnerTypeWithEggEvent.patch} |  0
 ...ch => 0015-EMC-MonsterEggSpawnEvent.patch} |  0
 ...ch => 0016-Player-invulnerabilities.patch} | 22 ++---
 ...8-Anvil-API.patch => 0017-Anvil-API.patch} |  0
 ...8-Configurable-villager-brain-ticks.patch} |  0
 ...0019-Alternative-Keepalive-Handling.patch} |  8 +-
 ...s.patch => 0020-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} |  0
 ...> 0024-Disable-outdated-build-check.patch} |  0
 ...gs.patch => 0025-Giants-AI-settings.patch} |  0
 ...tch => 0026-Illusioners-AI-settings.patch} |  0
 ...> 0027-Zombie-horse-naturally-spawn.patch} |  0
 ...028-Charged-creeper-naturally-spawn.patch} |  0
 ...it-naturally-spawn-toast-and-killer.patch} |  0
 ...er-showing-in-ping-before-server-fu.patch} |  2 +-
 ...patch => 0031-Make-Iron-Golems-Swim.patch} |  0
 ...32-Dont-send-useless-entity-packets.patch} |  0
 ...atch => 0033-Tulips-change-fox-type.patch} |  0
 ...patch => 0034-Breedable-Polar-Bears.patch} |  0
 ...atch => 0035-Chickens-can-retaliate.patch} |  0
 ...ption-to-set-armorstand-step-height.patch} |  0
 ....patch => 0037-Cat-spawning-options.patch} |  0
 ...n-black-cats-spawning-in-swamp-huts.patch} |  0
 ...ms.patch => 0039-Cows-eat-mushrooms.patch} |  0
 ...ow-rotation-when-shearing-mooshroom.patch} |  0
 ...patch => 0041-Pigs-give-saddle-back.patch} |  0
 ...2-Snowman-drop-and-put-back-pumpkin.patch} |  0
 ...3-Ender-dragon-always-drop-full-exp.patch} |  0
 ... 0044-Signs-editable-on-right-click.patch} |  0
 ...tch => 0045-Signs-allow-color-codes.patch} | 37 +++++----
 ...oisten-from-water-directly-under-it.patch} |  0
 ...atch => 0047-Controllable-Minecarts.patch} |  4 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |  0
 ...49-Players-should-not-cram-to-death.patch} |  4 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |  0
 ...ould-check-if-entity-can-use-portal.patch} |  0
 ...052-Fix-the-dead-lagging-the-server.patch} |  0
 ...Skip-events-if-there-s-no-listeners.patch} |  0
 ... 0054-Add-permission-for-F3-N-debug.patch} |  4 +-
 ...skeleton-takes-wither-damage-option.patch} |  0
 ...ch => 0056-Configurable-TPS-Catchup.patch} |  0
 ...ow-loyalty-on-tridents-to-work-in-t.patch} |  0
 ...erman-and-creeper-griefing-controls.patch} |  0
 ...p-loot-bypass-mob-griefing-gamerule.patch} |  0
 ...ng-can-bypass-mob-griefing-gamerule.patch} |  0
 ...061-Villagers-follow-emerald-blocks.patch} |  0
 ...ch => 0062-Allow-leashing-villagers.patch} |  0
 ...rable-search-radius-for-villagers-t.patch} |  0
 ...tch => 0064-Implement-infinite-lava.patch} |  0
 ...5-Make-lava-flow-speed-configurable.patch} |  0
 ...dd-player-death-exp-control-options.patch} |  0
 ...=> 0067-Add-canSaveToDisk-to-Entity.patch} |  0
 ...068-Configurable-void-damage-height.patch} |  0
 ...spenser-curse-of-binding-protection.patch} |  0
 ...-for-boats-to-eject-players-on-land.patch} |  0
 ... 0071-Add-obfhelpers-for-plugin-use.patch} |  0
 ...-mends-most-damages-equipment-first.patch} |  0
 ...073-Add-5-second-tps-average-in-tps.patch} |  4 +-
 ...h => 0074-Implement-elytra-settings.patch} |  0
 ...atch => 0075-Item-entity-immunities.patch} |  0
 ...mand.patch => 0076-Add-ping-command.patch} |  0
 ...=> 0077-Configurable-jockey-options.patch} |  0
 ...d-to-crystals-and-crystals-shoot-ph.patch} |  0
 ...> 0079-Add-phantom-spawning-options.patch} |  0
 ...080-Implement-bed-explosion-options.patch} |  0
 ...nt-respawn-anchor-explosion-options.patch} |  0
 ...Add-allow-water-in-end-world-option.patch} |  0
 ... => 0083-Allow-color-codes-in-books.patch} |  2 +-
 ...espan.patch => 0084-Entity-lifespan.patch} |  4 +-
 ...eport-to-spawn-if-outside-world-bor.patch} |  4 +-
 ...ty.patch => 0086-Squid-EAR-immunity.patch} |  4 +-
 ...=> 0087-Configurable-end-spike-seed.patch} |  0
 ...h => 0088-Configurable-dungeon-seed.patch} |  0
 ...atch => 0089-Phantoms-burn-in-light.patch} |  0
 ...0090-Configurable-villager-breeding.patch} |  0
 ... 0091-Redstone-deactivates-spawners.patch} |  0
 ...ch => 0092-Totems-work-in-inventory.patch} |  0
 ...tch => 0093-Populator-seed-controls.patch} |  0
 ...-Add-vindicator-johnny-spawn-chance.patch} |  0
 .../0094-Fix-death-message-colors.patch       | 36 ---------
 ...n-to-disable-mushroom-block-updates.patch} |  0
 ...s-vanilla-scoreboard-colors-patch-to.patch | 37 ---------
 ...0096-Dispensers-place-anvils-option.patch} |  0
 ...rs.patch => 0097-Allow-anvil-colors.patch} |  0
 ...atch => 0098-Add-no-tick-block-list.patch} |  0
 ...-disable-dolphin-treasure-searching.patch} |  0
 ...patch => 0100-Short-enderman-height.patch} |  0
 ...top-squids-floating-on-top-of-water.patch} |  0
 ...105-Ridables.patch => 0102-Ridables.patch} | 14 ++--
 ...-height-for-nether-surface-builders.patch} |  0
 ...ng-obsidian-valid-for-portal-frames.patch} |  0
 ...ities-can-use-portals-configuration.patch} |  0
 ...106-LivingEntity-broadcastItemBreak.patch} |  0
 ...tomizable-wither-health-and-healing.patch} |  0
 ...gling-special-MobSpawners-per-world.patch} |  0
 ...patch => 0109-Raid-cooldown-setting.patch} |  0
 ...-config-options-per-projectile-type.patch} |  0
 ...able-zombie-aggressiveness-towards-.patch} |  0
 ...ent-TileEntity-Lore-and-DisplayName.patch} |  0
 ...-to-recipe-s-ExactChoice-ingredient.patch} |  0
 ...y.patch => 0114-Flying-squids-Oh-my.patch} |  0
 ...color-code-support-for-console-loggi.patch | 80 -------------------
 ...patch => 0115-Infinity-bow-settings.patch} |  0
 ...ge.patch => 0116-Stonecutter-damage.patch} |  0
 ...=> 0117-Configurable-daylight-cycle.patch} |  0
 ...e-and-mending-enchantments-together.patch} |  2 +-
 ...patch => 0119-Infinite-fuel-furnace.patch} |  0
 ...ws-should-not-reset-despawn-counter.patch} |  0
 ...1-Add-tablist-suffix-option-for-afk.patch} |  6 +-
 ...e-add-farmland-mechanics-from-Alpha.patch} |  0
 ...ustable-breeding-cooldown-to-config.patch} |  0
 ...-animal-breeding-times-configurable.patch} |  0
 ...es-from-item-forms-of-entities-to-e.patch} |  0
 ...when-using-a-Name-Tag-on-an-Armor-S.patch} |  0
 ...ting-and-weeping-vines-growth-rates.patch} |  0
 ...twisting-vines-configurable-max-gro.patch} |  0
 ...lowing-Endermen-to-despawn-even-whi.patch} |  0
 ...check-to-EntityDamagedByEntityEvent.patch} |  2 +-
 ...31-Add-configurable-snowball-damage.patch} |  0
 ...reak-door-minimum-difficulty-option.patch} |  0
 ...mand.patch => 0133-Add-demo-command.patch} |  2 +-
 ...d-API.patch => 0134-Left-handed-API.patch} |  0
 ...i-Fix-ProtocolLib-issues-on-Java-15.patch} |  0
 ...6-Changeable-Mob-Left-Handed-Chance.patch} |  0
 ...=> 0137-Add-boat-fall-damage-config.patch} |  4 +-
 ...disable-saving-projectiles-to-disk-.patch} |  2 +-
 ...0139-Snow-Golem-rate-of-fire-config.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...-Configurable-disable-give-dropping.patch} |  2 +-
 ...climbing-should-not-bypass-cramming.patch} |  2 +-
 ... => 0143-Lobotomize-stuck-villagers.patch} |  0
 ...illager-Clerics-to-farm-Nether-Wart.patch} |  0
 ...ied-Piglin-death-always-counting-as.patch} |  0
 ...-out-and-optimise-player-list-ticks.patch} | 10 +--
 ...le-chance-for-wolves-to-spawn-rabid.patch} |  0
 ...figurable-default-wolf-collar-color.patch} |  0
 ...Configurable-entity-base-attributes.patch} |  0
 ...tch => 0150-Phantom-flames-on-swoop.patch} |  0
 ...-to-open-even-with-a-solid-block-on.patch} |  0
 ...SBar.patch => 0152-Implement-TPSBar.patch} |  4 +-
 ...h => 0153-Striders-give-saddle-back.patch} |  0
 ...tch => 0154-PlayerBookTooLargeEvent.patch} |  2 +-
 ...herite-armor-grants-fire-resistance.patch} |  0
 ...156-Fix-rotating-UP-DOWN-CW-and-CCW.patch} |  0
 ...ack.patch => 0157-Add-MC-4-fix-back.patch} |  0
 ...efing-bypass-to-everything-affected.patch} |  0
 ...llow-Note-Block-sounds-when-blocked.patch} |  0
 ...160-Add-EntityTeleportHinderedEvent.patch} |  8 +-
 ... => 0161-Add-StructureGenerateEvent.patch} |  0
 ... => 0162-Farmland-trampling-changes.patch} |  0
 ...-Movement-options-for-armour-stands.patch} |  0
 ....patch => 0164-Fix-stuck-in-portals.patch} |  4 +-
 ...erEditBookEvent-not-saving-new-book.patch} |  2 +-
 ...to-use-infinity-bows-without-arrows.patch} |  0
 ...ggle-for-water-sensitive-mob-damage.patch} |  0
 ...8-Config-to-always-tame-in-Creative.patch} |  0
 ... 0169-End-crystal-explosion-options.patch} |  0
 ...Add-unsafe-Entity-serialization-API.patch} |  4 +-
 ...171-Add-ghast-allow-griefing-option.patch} |  0
 ...ther-Ender-Dragon-can-ride-vehicles.patch} |  0
 188 files changed, 178 insertions(+), 366 deletions(-)
 delete mode 100644 patches/server/0005-Add-component-util.patch
 rename patches/server/{0006-Barrels-and-enderchests-6-rows.patch => 0005-Barrels-and-enderchests-6-rows.patch} (98%)
 rename patches/server/{0007-Advancement-API.patch => 0006-Advancement-API.patch} (100%)
 rename patches/server/{0008-Llama-API.patch => 0007-Llama-API.patch} (100%)
 rename patches/server/{0009-AFK-API.patch => 0008-AFK-API.patch} (96%)
 rename patches/server/{0010-Bring-back-server-name.patch => 0009-Bring-back-server-name.patch} (91%)
 rename patches/server/{0011-Configurable-server-mod-name.patch => 0010-Configurable-server-mod-name.patch} (100%)
 rename patches/server/{0012-LivingEntity-safeFallDistance.patch => 0011-LivingEntity-safeFallDistance.patch} (100%)
 rename patches/server/{0013-Lagging-threshold.patch => 0012-Lagging-threshold.patch} (94%)
 rename patches/server/{0014-ItemFactory-getMonsterEgg.patch => 0013-ItemFactory-getMonsterEgg.patch} (92%)
 rename patches/server/{0015-PlayerSetSpawnerTypeWithEggEvent.patch => 0014-PlayerSetSpawnerTypeWithEggEvent.patch} (100%)
 rename patches/server/{0016-EMC-MonsterEggSpawnEvent.patch => 0015-EMC-MonsterEggSpawnEvent.patch} (100%)
 rename patches/server/{0017-Player-invulnerabilities.patch => 0016-Player-invulnerabilities.patch} (87%)
 rename patches/server/{0018-Anvil-API.patch => 0017-Anvil-API.patch} (100%)
 rename patches/server/{0019-Configurable-villager-brain-ticks.patch => 0018-Configurable-villager-brain-ticks.patch} (100%)
 rename patches/server/{0020-Alternative-Keepalive-Handling.patch => 0019-Alternative-Keepalive-Handling.patch} (94%)
 rename patches/server/{0021-Silk-touch-spawners.patch => 0020-Silk-touch-spawners.patch} (100%)
 rename patches/server/{0022-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0021-MC-168772-Fix-Add-turtle-egg-block-options.patch} (100%)
 rename patches/server/{0023-Fix-vanilla-command-permission-handler.patch => 0022-Fix-vanilla-command-permission-handler.patch} (100%)
 rename patches/server/{0024-Logger-settings-suppressing-pointless-logs.patch => 0023-Logger-settings-suppressing-pointless-logs.patch} (100%)
 rename patches/server/{0025-Disable-outdated-build-check.patch => 0024-Disable-outdated-build-check.patch} (100%)
 rename patches/server/{0026-Giants-AI-settings.patch => 0025-Giants-AI-settings.patch} (100%)
 rename patches/server/{0027-Illusioners-AI-settings.patch => 0026-Illusioners-AI-settings.patch} (100%)
 rename patches/server/{0028-Zombie-horse-naturally-spawn.patch => 0027-Zombie-horse-naturally-spawn.patch} (100%)
 rename patches/server/{0029-Charged-creeper-naturally-spawn.patch => 0028-Charged-creeper-naturally-spawn.patch} (100%)
 rename patches/server/{0030-Rabbit-naturally-spawn-toast-and-killer.patch => 0029-Rabbit-naturally-spawn-toast-and-killer.patch} (100%)
 rename patches/server/{0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (91%)
 rename patches/server/{0032-Make-Iron-Golems-Swim.patch => 0031-Make-Iron-Golems-Swim.patch} (100%)
 rename patches/server/{0033-Dont-send-useless-entity-packets.patch => 0032-Dont-send-useless-entity-packets.patch} (100%)
 rename patches/server/{0034-Tulips-change-fox-type.patch => 0033-Tulips-change-fox-type.patch} (100%)
 rename patches/server/{0035-Breedable-Polar-Bears.patch => 0034-Breedable-Polar-Bears.patch} (100%)
 rename patches/server/{0036-Chickens-can-retaliate.patch => 0035-Chickens-can-retaliate.patch} (100%)
 rename patches/server/{0037-Add-option-to-set-armorstand-step-height.patch => 0036-Add-option-to-set-armorstand-step-height.patch} (100%)
 rename patches/server/{0038-Cat-spawning-options.patch => 0037-Cat-spawning-options.patch} (100%)
 rename patches/server/{0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%)
 rename patches/server/{0040-Cows-eat-mushrooms.patch => 0039-Cows-eat-mushrooms.patch} (100%)
 rename patches/server/{0041-Fix-cow-rotation-when-shearing-mooshroom.patch => 0040-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0042-Pigs-give-saddle-back.patch => 0041-Pigs-give-saddle-back.patch} (100%)
 rename patches/server/{0043-Snowman-drop-and-put-back-pumpkin.patch => 0042-Snowman-drop-and-put-back-pumpkin.patch} (100%)
 rename patches/server/{0044-Ender-dragon-always-drop-full-exp.patch => 0043-Ender-dragon-always-drop-full-exp.patch} (100%)
 rename patches/server/{0045-Signs-editable-on-right-click.patch => 0044-Signs-editable-on-right-click.patch} (100%)
 rename patches/server/{0046-Signs-allow-color-codes.patch => 0045-Signs-allow-color-codes.patch} (57%)
 rename patches/server/{0047-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0046-Allow-soil-to-moisten-from-water-directly-under-it.patch} (100%)
 rename patches/server/{0048-Controllable-Minecarts.patch => 0047-Controllable-Minecarts.patch} (98%)
 rename patches/server/{0049-Disable-loot-drops-on-death-by-cramming.patch => 0048-Disable-loot-drops-on-death-by-cramming.patch} (100%)
 rename patches/server/{0050-Players-should-not-cram-to-death.patch => 0049-Players-should-not-cram-to-death.patch} (85%)
 rename patches/server/{0051-Option-to-toggle-milk-curing-bad-omen.patch => 0050-Option-to-toggle-milk-curing-bad-omen.patch} (100%)
 rename patches/server/{0052-End-gateway-should-check-if-entity-can-use-portal.patch => 0051-End-gateway-should-check-if-entity-can-use-portal.patch} (100%)
 rename patches/server/{0053-Fix-the-dead-lagging-the-server.patch => 0052-Fix-the-dead-lagging-the-server.patch} (100%)
 rename patches/server/{0054-Skip-events-if-there-s-no-listeners.patch => 0053-Skip-events-if-there-s-no-listeners.patch} (100%)
 rename patches/server/{0055-Add-permission-for-F3-N-debug.patch => 0054-Add-permission-for-F3-N-debug.patch} (83%)
 rename patches/server/{0056-Add-wither-skeleton-takes-wither-damage-option.patch => 0055-Add-wither-skeleton-takes-wither-damage-option.patch} (100%)
 rename patches/server/{0057-Configurable-TPS-Catchup.patch => 0056-Configurable-TPS-Catchup.patch} (100%)
 rename patches/server/{0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (100%)
 rename patches/server/{0059-Add-enderman-and-creeper-griefing-controls.patch => 0058-Add-enderman-and-creeper-griefing-controls.patch} (100%)
 rename patches/server/{0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (100%)
 rename patches/server/{0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0060-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (100%)
 rename patches/server/{0062-Villagers-follow-emerald-blocks.patch => 0061-Villagers-follow-emerald-blocks.patch} (100%)
 rename patches/server/{0063-Allow-leashing-villagers.patch => 0062-Allow-leashing-villagers.patch} (100%)
 rename patches/server/{0064-Implement-configurable-search-radius-for-villagers-t.patch => 0063-Implement-configurable-search-radius-for-villagers-t.patch} (100%)
 rename patches/server/{0065-Implement-infinite-lava.patch => 0064-Implement-infinite-lava.patch} (100%)
 rename patches/server/{0066-Make-lava-flow-speed-configurable.patch => 0065-Make-lava-flow-speed-configurable.patch} (100%)
 rename patches/server/{0067-Add-player-death-exp-control-options.patch => 0066-Add-player-death-exp-control-options.patch} (100%)
 rename patches/server/{0068-Add-canSaveToDisk-to-Entity.patch => 0067-Add-canSaveToDisk-to-Entity.patch} (100%)
 rename patches/server/{0069-Configurable-void-damage-height.patch => 0068-Configurable-void-damage-height.patch} (100%)
 rename patches/server/{0070-Dispenser-curse-of-binding-protection.patch => 0069-Dispenser-curse-of-binding-protection.patch} (100%)
 rename patches/server/{0071-Add-option-for-boats-to-eject-players-on-land.patch => 0070-Add-option-for-boats-to-eject-players-on-land.patch} (100%)
 rename patches/server/{0072-Add-obfhelpers-for-plugin-use.patch => 0071-Add-obfhelpers-for-plugin-use.patch} (100%)
 rename patches/server/{0073-Mending-mends-most-damages-equipment-first.patch => 0072-Mending-mends-most-damages-equipment-first.patch} (100%)
 rename patches/server/{0074-Add-5-second-tps-average-in-tps.patch => 0073-Add-5-second-tps-average-in-tps.patch} (96%)
 rename patches/server/{0075-Implement-elytra-settings.patch => 0074-Implement-elytra-settings.patch} (100%)
 rename patches/server/{0076-Item-entity-immunities.patch => 0075-Item-entity-immunities.patch} (100%)
 rename patches/server/{0077-Add-ping-command.patch => 0076-Add-ping-command.patch} (100%)
 rename patches/server/{0078-Configurable-jockey-options.patch => 0077-Configurable-jockey-options.patch} (100%)
 rename patches/server/{0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%)
 rename patches/server/{0080-Add-phantom-spawning-options.patch => 0079-Add-phantom-spawning-options.patch} (100%)
 rename patches/server/{0081-Implement-bed-explosion-options.patch => 0080-Implement-bed-explosion-options.patch} (100%)
 rename patches/server/{0082-Implement-respawn-anchor-explosion-options.patch => 0081-Implement-respawn-anchor-explosion-options.patch} (100%)
 rename patches/server/{0083-Add-allow-water-in-end-world-option.patch => 0082-Add-allow-water-in-end-world-option.patch} (100%)
 rename patches/server/{0084-Allow-color-codes-in-books.patch => 0083-Allow-color-codes-in-books.patch} (96%)
 rename patches/server/{0085-Entity-lifespan.patch => 0084-Entity-lifespan.patch} (97%)
 rename patches/server/{0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (95%)
 rename patches/server/{0087-Squid-EAR-immunity.patch => 0086-Squid-EAR-immunity.patch} (91%)
 rename patches/server/{0088-Configurable-end-spike-seed.patch => 0087-Configurable-end-spike-seed.patch} (100%)
 rename patches/server/{0089-Configurable-dungeon-seed.patch => 0088-Configurable-dungeon-seed.patch} (100%)
 rename patches/server/{0090-Phantoms-burn-in-light.patch => 0089-Phantoms-burn-in-light.patch} (100%)
 rename patches/server/{0091-Configurable-villager-breeding.patch => 0090-Configurable-villager-breeding.patch} (100%)
 rename patches/server/{0092-Redstone-deactivates-spawners.patch => 0091-Redstone-deactivates-spawners.patch} (100%)
 rename patches/server/{0093-Totems-work-in-inventory.patch => 0092-Totems-work-in-inventory.patch} (100%)
 rename patches/server/{0096-Populator-seed-controls.patch => 0093-Populator-seed-controls.patch} (100%)
 rename patches/server/{0097-Add-vindicator-johnny-spawn-chance.patch => 0094-Add-vindicator-johnny-spawn-chance.patch} (100%)
 delete mode 100644 patches/server/0094-Fix-death-message-colors.patch
 rename patches/server/{0098-Add-option-to-disable-mushroom-block-updates.patch => 0095-Add-option-to-disable-mushroom-block-updates.patch} (100%)
 delete mode 100644 patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
 rename patches/server/{0099-Dispensers-place-anvils-option.patch => 0096-Dispensers-place-anvils-option.patch} (100%)
 rename patches/server/{0100-Allow-anvil-colors.patch => 0097-Allow-anvil-colors.patch} (100%)
 rename patches/server/{0101-Add-no-tick-block-list.patch => 0098-Add-no-tick-block-list.patch} (100%)
 rename patches/server/{0102-Add-option-to-disable-dolphin-treasure-searching.patch => 0099-Add-option-to-disable-dolphin-treasure-searching.patch} (100%)
 rename patches/server/{0103-Short-enderman-height.patch => 0100-Short-enderman-height.patch} (100%)
 rename patches/server/{0104-Stop-squids-floating-on-top-of-water.patch => 0101-Stop-squids-floating-on-top-of-water.patch} (100%)
 rename patches/server/{0105-Ridables.patch => 0102-Ridables.patch} (99%)
 rename patches/server/{0106-Use-configured-height-for-nether-surface-builders.patch => 0103-Use-configured-height-for-nether-surface-builders.patch} (100%)
 rename patches/server/{0107-Crying-obsidian-valid-for-portal-frames.patch => 0104-Crying-obsidian-valid-for-portal-frames.patch} (100%)
 rename patches/server/{0108-Entities-can-use-portals-configuration.patch => 0105-Entities-can-use-portals-configuration.patch} (100%)
 rename patches/server/{0109-LivingEntity-broadcastItemBreak.patch => 0106-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/server/{0110-Customizable-wither-health-and-healing.patch => 0107-Customizable-wither-health-and-healing.patch} (100%)
 rename patches/server/{0111-Allow-toggling-special-MobSpawners-per-world.patch => 0108-Allow-toggling-special-MobSpawners-per-world.patch} (100%)
 rename patches/server/{0112-Raid-cooldown-setting.patch => 0109-Raid-cooldown-setting.patch} (100%)
 rename patches/server/{0113-Despawn-rate-config-options-per-projectile-type.patch => 0110-Despawn-rate-config-options-per-projectile-type.patch} (100%)
 rename patches/server/{0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0111-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%)
 rename patches/server/{0116-Persistent-TileEntity-Lore-and-DisplayName.patch => 0112-Persistent-TileEntity-Lore-and-DisplayName.patch} (100%)
 rename patches/server/{0117-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0113-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0118-Flying-squids-Oh-my.patch => 0114-Flying-squids-Oh-my.patch} (100%)
 delete mode 100644 patches/server/0114-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
 rename patches/server/{0119-Infinity-bow-settings.patch => 0115-Infinity-bow-settings.patch} (100%)
 rename patches/server/{0120-Stonecutter-damage.patch => 0116-Stonecutter-damage.patch} (100%)
 rename patches/server/{0121-Configurable-daylight-cycle.patch => 0117-Configurable-daylight-cycle.patch} (100%)
 rename patches/server/{0122-Allow-infinite-and-mending-enchantments-together.patch => 0118-Allow-infinite-and-mending-enchantments-together.patch} (95%)
 rename patches/server/{0123-Infinite-fuel-furnace.patch => 0119-Infinite-fuel-furnace.patch} (100%)
 rename patches/server/{0124-Arrows-should-not-reset-despawn-counter.patch => 0120-Arrows-should-not-reset-despawn-counter.patch} (100%)
 rename patches/server/{0125-Add-tablist-suffix-option-for-afk.patch => 0121-Add-tablist-suffix-option-for-afk.patch} (90%)
 rename patches/server/{0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (100%)
 rename patches/server/{0127-Add-adjustable-breeding-cooldown-to-config.patch => 0123-Add-adjustable-breeding-cooldown-to-config.patch} (100%)
 rename patches/server/{0128-Make-animal-breeding-times-configurable.patch => 0124-Make-animal-breeding-times-configurable.patch} (100%)
 rename patches/server/{0129-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0125-Apply-display-names-from-item-forms-of-entities-to-e.patch} (100%)
 rename patches/server/{0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0126-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (100%)
 rename patches/server/{0131-Add-twisting-and-weeping-vines-growth-rates.patch => 0127-Add-twisting-and-weeping-vines-growth-rates.patch} (100%)
 rename patches/server/{0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0128-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (100%)
 rename patches/server/{0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0129-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (100%)
 rename patches/server/{0134-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch => 0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch} (96%)
 rename patches/server/{0135-Add-configurable-snowball-damage.patch => 0131-Add-configurable-snowball-damage.patch} (100%)
 rename patches/server/{0136-Zombie-break-door-minimum-difficulty-option.patch => 0132-Zombie-break-door-minimum-difficulty-option.patch} (100%)
 rename patches/server/{0137-Add-demo-command.patch => 0133-Add-demo-command.patch} (98%)
 rename patches/server/{0138-Left-handed-API.patch => 0134-Left-handed-API.patch} (100%)
 rename patches/server/{0139-Origami-Fix-ProtocolLib-issues-on-Java-15.patch => 0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch} (100%)
 rename patches/server/{0140-Changeable-Mob-Left-Handed-Chance.patch => 0136-Changeable-Mob-Left-Handed-Chance.patch} (100%)
 rename patches/server/{0141-Add-boat-fall-damage-config.patch => 0137-Add-boat-fall-damage-config.patch} (95%)
 rename patches/server/{0142-Config-migration-disable-saving-projectiles-to-disk-.patch => 0138-Config-migration-disable-saving-projectiles-to-disk-.patch} (97%)
 rename patches/server/{0143-Snow-Golem-rate-of-fire-config.patch => 0139-Snow-Golem-rate-of-fire-config.patch} (100%)
 rename patches/server/{0144-PaperPR-Config-option-for-Piglins-guarding-chests.patch => 0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0145-EMC-Configurable-disable-give-dropping.patch => 0141-EMC-Configurable-disable-give-dropping.patch} (95%)
 rename patches/server/{0146-Config-migration-climbing-should-not-bypass-cramming.patch => 0142-Config-migration-climbing-should-not-bypass-cramming.patch} (96%)
 rename patches/server/{0147-Lobotomize-stuck-villagers.patch => 0143-Lobotomize-stuck-villagers.patch} (100%)
 rename patches/server/{0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0144-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (100%)
 rename patches/server/{0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0145-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (100%)
 rename patches/server/{0150-Spread-out-and-optimise-player-list-ticks.patch => 0146-Spread-out-and-optimise-player-list-ticks.patch} (88%)
 rename patches/server/{0151-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0147-Configurable-chance-for-wolves-to-spawn-rabid.patch} (100%)
 rename patches/server/{0152-Configurable-default-wolf-collar-color.patch => 0148-Configurable-default-wolf-collar-color.patch} (100%)
 rename patches/server/{0153-Configurable-entity-base-attributes.patch => 0149-Configurable-entity-base-attributes.patch} (100%)
 rename patches/server/{0154-Phantom-flames-on-swoop.patch => 0150-Phantom-flames-on-swoop.patch} (100%)
 rename patches/server/{0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0151-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (100%)
 rename patches/server/{0156-Implement-TPSBar.patch => 0152-Implement-TPSBar.patch} (98%)
 rename patches/server/{0157-Striders-give-saddle-back.patch => 0153-Striders-give-saddle-back.patch} (100%)
 rename patches/server/{0158-PlayerBookTooLargeEvent.patch => 0154-PlayerBookTooLargeEvent.patch} (96%)
 rename patches/server/{0159-Full-netherite-armor-grants-fire-resistance.patch => 0155-Full-netherite-armor-grants-fire-resistance.patch} (100%)
 rename patches/server/{0160-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%)
 rename patches/server/{0161-Add-MC-4-fix-back.patch => 0157-Add-MC-4-fix-back.patch} (100%)
 rename patches/server/{0162-Add-mobGriefing-bypass-to-everything-affected.patch => 0158-Add-mobGriefing-bypass-to-everything-affected.patch} (100%)
 rename patches/server/{0163-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0159-Config-to-allow-Note-Block-sounds-when-blocked.patch} (100%)
 rename patches/server/{0164-Add-EntityTeleportHinderedEvent.patch => 0160-Add-EntityTeleportHinderedEvent.patch} (96%)
 rename patches/server/{0165-Add-StructureGenerateEvent.patch => 0161-Add-StructureGenerateEvent.patch} (100%)
 rename patches/server/{0166-Farmland-trampling-changes.patch => 0162-Farmland-trampling-changes.patch} (100%)
 rename patches/server/{0167-Movement-options-for-armour-stands.patch => 0163-Movement-options-for-armour-stands.patch} (100%)
 rename patches/server/{0168-Fix-stuck-in-portals.patch => 0164-Fix-stuck-in-portals.patch} (94%)
 rename patches/server/{0169-Fix-PlayerEditBookEvent-not-saving-new-book.patch => 0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch} (91%)
 rename patches/server/{0170-Config-to-use-infinity-bows-without-arrows.patch => 0166-Config-to-use-infinity-bows-without-arrows.patch} (100%)
 rename patches/server/{0171-Toggle-for-water-sensitive-mob-damage.patch => 0167-Toggle-for-water-sensitive-mob-damage.patch} (100%)
 rename patches/server/{0172-Config-to-always-tame-in-Creative.patch => 0168-Config-to-always-tame-in-Creative.patch} (100%)
 rename patches/server/{0173-End-crystal-explosion-options.patch => 0169-End-crystal-explosion-options.patch} (100%)
 rename patches/server/{0174-Add-unsafe-Entity-serialization-API.patch => 0170-Add-unsafe-Entity-serialization-API.patch} (97%)
 rename patches/server/{0175-Add-ghast-allow-griefing-option.patch => 0171-Add-ghast-allow-griefing-option.patch} (100%)
 rename patches/server/{0176-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0172-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (100%)

diff --git a/Paper b/Paper
index 5fd19303f..466820160 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 5fd19303fe910f71501d82fb2f0f3a24732e75fe
+Subproject commit 4668201606ced19348529b86b6ae70370eba0fe9
diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch
index 10fc005d1..9e38f6838 100644
--- a/patches/api/0001-Tuinity-API-Changes.patch
+++ b/patches/api/0001-Tuinity-API-Changes.patch
@@ -8,7 +8,7 @@ Tuinity config
 API to retrieve raw YamlConfiguration + timing exports
 
 diff --git a/pom.xml b/pom.xml
-index 6c6ae6b48094c86c74cd4e9f4214056f63e6ac68..c441d455e2273b63d2cec136872a5025182d75d6 100644
+index 5bc8dd2489d34c598f8079d13058eeb0a9b79713..74ca13bb403f86aa8f6510972a5c076002ed787a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -37,10 +37,10 @@ index 6c6ae6b48094c86c74cd4e9f4214056f63e6ac68..c441d455e2273b63d2cec136872a5025
  
      <properties>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8e01e1bbb7cfd98b47dbdb3a0e132dafd1413de6..b45ad8df8b7a44c9e6d12326e5ea85e8d166a16c 100644
+index a79fa08b9e6fb924b2da933eb6e4b365d14d938d..414c9a2ca5389c4a99ddfe5a04706df221e7346e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1482,6 +1482,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1584,6 +1584,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch
index 257372bec..7a292d497 100644
--- a/patches/api/0002-Purpur-config-files.patch
+++ b/patches/api/0002-Purpur-config-files.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b45ad8df8b7a44c9e6d12326e5ea85e8d166a16c..c69143ba156f6aa3cf3ffb9ee3f6d461867982c5 100644
+index 414c9a2ca5389c4a99ddfe5a04706df221e7346e..136ed8b9799c9e9b66dd326de4bb303864091ec6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1490,6 +1490,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1592,6 +1592,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Tuinity end - add config to timings report
  
diff --git a/patches/api/0004-Allow-inventory-resizing.patch b/patches/api/0004-Allow-inventory-resizing.patch
index e8f24f5a4..486bb37df 100644
--- a/patches/api/0004-Allow-inventory-resizing.patch
+++ b/patches/api/0004-Allow-inventory-resizing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow inventory resizing
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..2351283df16dac808d77b840aa88732d7b28c0a1 100644
+index 090d22bd30f7947103771aaaf09a2398970ac337..ca660dde2010098e8c77141d05c2d4d5470adf81 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 @@ -132,7 +132,7 @@ public enum InventoryType {
@@ -17,8 +17,8 @@ index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..2351283df16dac808d77b840aa88732d
      private final String title;
      private final boolean isCreatable;
  
-@@ -146,6 +146,12 @@ public enum InventoryType {
-         this.isCreatable = isCreatable;
+@@ -159,6 +159,12 @@ public enum InventoryType {
+         this.defaultTitleComponent = net.kyori.adventure.text.Component.text(defaultTitle); // Paper - Adventure
      }
  
 +    // Purpur start
diff --git a/patches/api/0007-AFK-API.patch b/patches/api/0007-AFK-API.patch
index 1873b51ab..a3a3a5260 100644
--- a/patches/api/0007-AFK-API.patch
+++ b/patches/api/0007-AFK-API.patch
@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cb6464c89e02d29484554a9a2184996a256925d2..7fd2085fa24779df1eab354532611d3642b37a27 100644
+index 2e78c50de2f01d667a534bfb60ea93209b7f8f8e..5884cd31988c6eab3b56e857db09c96ff54d634c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1938,4 +1938,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2106,4 +2106,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0008-Bring-back-server-name.patch b/patches/api/0008-Bring-back-server-name.patch
index 8fed27d72..193ceb970 100644
--- a/patches/api/0008-Bring-back-server-name.patch
+++ b/patches/api/0008-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fecd7b14d317f55eb1ce7b5c6af9913917971427..d070b420f4cb90610d7018a7fbbc88074268b02b 100644
+index 68101a322ffab8ec28843386b79b8079576fa720..ce5e38f7eac68d99cbf29a8d4af1a0da4c31f290 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1817,4 +1817,15 @@ public final class Bukkit {
+@@ -1931,4 +1931,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index fecd7b14d317f55eb1ce7b5c6af9913917971427..d070b420f4cb90610d7018a7fbbc8807
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c69143ba156f6aa3cf3ffb9ee3f6d461867982c5..dce7d8126c4a628270b09608e4561c419238b0f4 100644
+index 136ed8b9799c9e9b66dd326de4bb303864091ec6..9b25ed377d07d319229ac5b9b6be0a6d4ee48d2c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1602,4 +1602,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1708,4 +1708,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
      // Paper end
diff --git a/patches/api/0011-Lagging-threshold.patch b/patches/api/0011-Lagging-threshold.patch
index a0e4cefae..17b2ad47b 100644
--- a/patches/api/0011-Lagging-threshold.patch
+++ b/patches/api/0011-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d070b420f4cb90610d7018a7fbbc88074268b02b..ba8eb67291c9848b367419f4c8110161ac7fab0d 100644
+index ce5e38f7eac68d99cbf29a8d4af1a0da4c31f290..cf46ff5d32e3efea829c0af5380aa3ea4124c473 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1827,5 +1827,14 @@ public final class Bukkit {
+@@ -1941,5 +1941,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index d070b420f4cb90610d7018a7fbbc88074268b02b..ba8eb67291c9848b367419f4c8110161
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dce7d8126c4a628270b09608e4561c419238b0f4..05b47c2462a00451fc64c79c3eda116fc8003a9f 100644
+index 9b25ed377d07d319229ac5b9b6be0a6d4ee48d2c..746683f5e540950fe30d70b25173d946159ae8c6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1610,5 +1610,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1716,5 +1716,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0012-ItemFactory-getMonsterEgg.patch b/patches/api/0012-ItemFactory-getMonsterEgg.patch
index f475acc8f..4701a2509 100644
--- a/patches/api/0012-ItemFactory-getMonsterEgg.patch
+++ b/patches/api/0012-ItemFactory-getMonsterEgg.patch
@@ -5,11 +5,11 @@ 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 3f23927e58e0ccf8cf04d4beb4d83346e3f84730..23d55f756b2bb5a557bfae102d7039d8394fbe69 100644
+index eab52f8615b329a795b3fe3a3719e5687e105061..0c5e488fca4370a18fede705f58bff25f3a7b4cb 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -215,4 +215,15 @@ public interface ItemFactory {
-     @NotNull
+@@ -233,4 +233,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
 +
diff --git a/patches/api/0016-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch
index 68d7d1706..f76913c06 100644
--- a/patches/api/0016-Player-invulnerabilities.patch
+++ b/patches/api/0016-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7fd2085fa24779df1eab354532611d3642b37a27..c3288513f240daf412d106e7d8cea1823b17a2d7 100644
+index 5884cd31988c6eab3b56e857db09c96ff54d634c..d9ea837004d7e8643f93ad241a6dad3192e0afce 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1958,5 +1958,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2126,5 +2126,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();
diff --git a/patches/api/0018-ItemStack-convenience-methods.patch b/patches/api/0018-ItemStack-convenience-methods.patch
index 27851fc55..cc5d522c2 100644
--- a/patches/api/0018-ItemStack-convenience-methods.patch
+++ b/patches/api/0018-ItemStack-convenience-methods.patch
@@ -46,7 +46,7 @@ index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..f71c9fd069309ef330d9065760b80ec1
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 4f2520f7a4ca6d57a85924ada1068a055b9a01fb..23cef1e67236a879525f39da994efc9a9c5cd289 100644
+index 7531fc910ed65dc12e242cf5042ce4cef9fe661d..890a37ebd79e770114ea188a0a5d9d2e27542911 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -68,7 +68,7 @@ index 4f2520f7a4ca6d57a85924ada1068a055b9a01fb..23cef1e67236a879525f39da994efc9a
  
  /**
   * Represents a stack of items.
-@@ -792,4 +804,627 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -798,4 +810,627 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
          return itemMeta.hasItemFlag(flag);
      }
      // Paper end
diff --git a/patches/api/0021-Ridables.patch b/patches/api/0021-Ridables.patch
index fc251fc33..3adb827fd 100644
--- a/patches/api/0021-Ridables.patch
+++ b/patches/api/0021-Ridables.patch
@@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 76e857c364fe79e20cf9bde54b65e5b7108174fd..5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad 100644
+index 428daeb04d0a35a443467e2f657d2356bcfdd7d7..7dc06b28af9fa45b2b49a6d37c1ed829257f812a 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -698,4 +698,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -704,4 +704,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isTicking();
      // Paper end
diff --git a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
index a214f0808..64c066734 100644
--- a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -448,7 +448,7 @@ index 525ede42137cc27cf20cf713478e85292455676e..a0279fcbfc76ad97a61fc191424e876d
  
      WATER,
 diff --git a/src/main/java/org/bukkit/Nameable.java b/src/main/java/org/bukkit/Nameable.java
-index fee814e01a653d2b53c56e8b566383ca44aa5346..cda8b54d73edf47ef8d5a1bba25478b187fe1cde 100644
+index 2acdf2a6d3955923c721222b9da784f3278f6418..737c3b053060e38f6776a5a508948cc300bbe6f4 100644
 --- a/src/main/java/org/bukkit/Nameable.java
 +++ b/src/main/java/org/bukkit/Nameable.java
 @@ -2,6 +2,9 @@ package org.bukkit;
@@ -460,7 +460,7 @@ index fee814e01a653d2b53c56e8b566383ca44aa5346..cda8b54d73edf47ef8d5a1bba25478b1
 + */
  public interface Nameable {
  
-     /**
+     // Paper start
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
 index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f7c52db79 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
@@ -476,10 +476,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 05b47c2462a00451fc64c79c3eda116fc8003a9f..26c1953d23efd370ac7fd47fc3432edba4724139 100644
+index 746683f5e540950fe30d70b25173d946159ae8c6..ea140aaf20f5d4212c109a2bfc0aab1e0851c665 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1455,6 +1455,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1557,6 +1557,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      UnsafeValues getUnsafe();
  
      // Spigot start
@@ -679,10 +679,10 @@ index 70274f2e2a1d6f27c4febd9d5d5fa3ee1b49f100..3b98e6e3e6dea0df5fb9462c78e8c142
  
      /**
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index de4370233e0358da30d3704145044a99d8369f52..29d2077926620786c74b1f2f6ec6067a818d6e82 100644
+index 6aa795fe79ceca03c1725c36f2b0d3a63acd134e..683a1f55257d2b1d63e14a975b80ff4ab80ed3e0 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
-@@ -55,6 +55,9 @@ public interface CommandSender extends Permissible {
+@@ -62,6 +62,9 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
      public String getName();
  
      // Spigot start
@@ -798,7 +798,7 @@ index d9be83961b28b927a587f6dbb339b531520e4865..1ff4c5e283ac05c405c09bd4b8530664
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad..08dbe8208fad174f03a0e08c26bb48a0729ec0ce 100644
+index 7dc06b28af9fa45b2b49a6d37c1ed829257f812a..c51d545e137eec2017c9f2ff944db70f2fdffdfc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -622,6 +622,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -811,7 +811,7 @@ index 5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad..08dbe8208fad174f03a0e08c26bb48a0
      public class Spigot extends CommandSender.Spigot {
  
      }
-@@ -665,36 +668,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -671,36 +674,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
  
      /**
       * Check if entity is in rain
@@ -932,10 +932,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c3288513f240daf412d106e7d8cea1823b17a2d7..40394eeb64c8dac9d88d8b243ea0aad4da46936d 100644
+index d9ea837004d7e8643f93ad241a6dad3192e0afce..86629a708963463badc4ab4796ea1221e8768e8a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1776,6 +1776,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1936,6 +1936,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
  
      /**
@@ -944,7 +944,7 @@ index c3288513f240daf412d106e7d8cea1823b17a2d7..40394eeb64c8dac9d88d8b243ea0aad4
       * @return the client option value of the player
       */
      @NotNull
-@@ -1807,6 +1809,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1967,6 +1969,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      // Paper end
  
      // Spigot start
@@ -1052,7 +1052,7 @@ index ceb3e2c5117740ce284e893fff8e41a002d78649..fab5c3c90f55c113cae2bca2354a94e8
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
-index 63c80b4ee1f7adc8a9efc3b607993104b1991f90..b5d6dc0d864833880b59fc52a0b49d37b0904f98 100644
+index 91cab8b13d5bba34007f124838b32a1df58c5ac7..078228106b299a8e38495f7f881d38de4f87bc95 100644
 --- a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
 @@ -4,6 +4,9 @@ import org.bukkit.entity.Minecart;
@@ -1213,10 +1213,10 @@ index 21ad8888c0e403bfc63518502577d651c02dda05..295cbe558ace7b55c80fc84256808d2f
          /**
           * Unknown reason
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 2351283df16dac808d77b840aa88732d7b28c0a1..007d3e45095a5b6e35b6af681e6e042830a5432d 100644
+index ca660dde2010098e8c77141d05c2d4d5470adf81..129eac25da4f27489038fb15ab1aeecb172b60cc 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -171,6 +171,9 @@ public enum InventoryType {
+@@ -185,6 +185,9 @@ public enum InventoryType {
          return isCreatable;
      }
  
@@ -1241,10 +1241,10 @@ index efd29d198dd847e22988963f70ad57e1b810aeb7..b5de6e77a030057f923a5d82ea0054b9
      private static final HandlerList handlers = new HandlerList();
      private boolean repair;
 diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-index af52a5dfb452da11e51cad9c882cae1533cba520..30a7ac800096866d2a09dd304ffd17c42c5b2d9a 100644
+index 876cdce63a362f9cc208f767c10169e75a798a09..be2ffb6dca8c6125870cde85ec62ac7a60ee9ca4 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-@@ -60,6 +60,9 @@ public class PlayerQuitEvent extends PlayerEvent {
+@@ -94,6 +94,9 @@ public class PlayerQuitEvent extends PlayerEvent {
          return this.reason;
      }
  
@@ -1352,10 +1352,10 @@ index c7b17eabf07b829a02afe7c1f27a5127b6bfea70..d4e2bcf8ce8fc2af851b471490147f00
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 23d55f756b2bb5a557bfae102d7039d8394fbe69..50e58cf9a494c2cf17b7f55918e3d21f63437b3c 100644
+index 0c5e488fca4370a18fede705f58bff25f3a7b4cb..ffe8a6dcb13d917a7c295dfa6123da9e29e66d6d 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -169,7 +169,7 @@ public interface ItemFactory {
+@@ -179,7 +179,7 @@ public interface ItemFactory {
      /**
       * Creates a {@link net.md_5.bungee.api.chat.hover.content.Content} of that ItemStack for displaying.
       *
@@ -1418,10 +1418,10 @@ index e7d905b1146b2bdd2da5bdeb6bf3541fb181d59e..1fab68c9de96b0d362ebf85fd675cc19
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index 94852d50e88d0594b84b581cd627174043629995..c63257f38dffd05977e3676e7c341123f01fe282 100644
+index 0cfd4b02cc2095da56b4dc8d4ea4e9b4a95f513c..1378c8fc2fd187035fc159c8d025d58b5a61f535 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-@@ -188,6 +188,9 @@ public interface BookMeta extends ItemMeta {
+@@ -305,6 +305,9 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
      BookMeta clone();
  
      // Spigot start
diff --git a/patches/api/0037-Add-unsafe-Entity-serialization-API.patch b/patches/api/0037-Add-unsafe-Entity-serialization-API.patch
index 4458d2b19..2f1c2dcb5 100644
--- a/patches/api/0037-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/api/0037-Add-unsafe-Entity-serialization-API.patch
@@ -50,10 +50,10 @@ index 97b9ade0e771eae663fb42f91e15545034d58fc9..0c9d3c8a28a791fe26bb1c014b568e95
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 08dbe8208fad174f03a0e08c26bb48a0729ec0ce..2b7e8c7f24b2d9dd49db901f6279b8b5930a3006 100644
+index c51d545e137eec2017c9f2ff944db70f2fdffdfc..1e25f387e053b648477a3e9dace1a6c95e7f8cba 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -745,5 +745,24 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -751,5 +751,24 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 05487e45e..8de02914b 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -10921,10 +10921,10 @@ index 7636a51a7ef0aa05b5b2aaa9d17e7b551dedac96..480a02a8f6ec7110f9af8f2037fdc09a
  
          double d0 = this.locX() + vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9a409eebabae11ab84cf9bcced1f9a030b4a479..173a210392d71cdfc551f095dc0d9c9040d22d3f 100644
+index 17f6031558d98182c32b3df3fb60daf528d5e684..81249a38ecfdb04a8e266c8d9c3d00d63ccead4b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -528,6 +528,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -531,6 +531,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  }
              }
  
@@ -11905,10 +11905,10 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..001ac05cf26237eec8a77c476e678ff6
  
      public void a(int i) {
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c61cd50df0c81f7ab12bd0c955fd6f07f2b02e64..d987483255195c0bde713a92676baced1eaff2b3 100644
+index 6be12b7ae8501c22a7c544638c44fc6faedd5b07..2b4ac8d1f3218e89b73fb9e1d3eed8cb8bf7334d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
-@@ -234,7 +234,7 @@ public class LoginListener implements PacketLoginInListener {
+@@ -235,7 +235,7 @@ public class LoginListener implements PacketLoginInListener {
  
              s = (new BigInteger(MinecraftEncryption.a("", this.server.getKeyPair().getPublic(), this.loginKey))).toString(16);
              this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
@@ -13758,7 +13758,7 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0
      }
      // Paper end - optimised tracker
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 87b1ff21957d5d708209257e569785aeaf191181..4185ec46435ddf48d9e25c4d71ac4e14eb6301cf 100644
+index 4e3aa45856015d55bd87d43738533e8d7b01beda..674889b81ec338338d2d21d89bd4613f89a77a9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -14124,10 +14124,10 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
              this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eb44877e7384ae0a028a12b832684126b8d50ec..eabd1aa2b740bcb6db40be300cd6daf59674fa3f 100644
+index e1ab296811081a0d1449d48d16de065c070fde23..e86ab7dd06df2c6973456def1b43dfb5518ec739 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -98,6 +98,7 @@ public abstract class PlayerList {
+@@ -100,6 +100,7 @@ public abstract class PlayerList {
      }
  
      public void a(NetworkManager networkmanager, EntityPlayer entityplayer) {
@@ -14135,7 +14135,7 @@ index 1eb44877e7384ae0a028a12b832684126b8d50ec..eabd1aa2b740bcb6db40be300cd6daf5
          EntityPlayer prev = pendingPlayers.put(entityplayer.getUniqueID(), entityplayer);// Paper
          if (prev != null) {
              disconnectPendingPlayer(prev);
-@@ -637,7 +638,7 @@ public abstract class PlayerList {
+@@ -639,7 +640,7 @@ public abstract class PlayerList {
          SocketAddress socketaddress = loginlistener.networkManager.getSocketAddress();
  
          EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(World.OVERWORLD), gameprofile, new PlayerInteractManager(this.server.getWorldServer(World.OVERWORLD)));
@@ -17620,7 +17620,7 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf798fed9b62 100644
+index f4263b7a787a3b60d20d63aec3fd42658ca4af38..6c226d46e970fe2ade300fabf0fdd5e9f2679593 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@@ -17632,7 +17632,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -860,6 +860,7 @@ public final class CraftServer implements Server {
+@@ -863,6 +863,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -17640,7 +17640,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -894,6 +895,7 @@ public final class CraftServer implements Server {
+@@ -897,6 +898,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -17648,7 +17648,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1857,7 +1859,10 @@ public final class CraftServer implements Server {
+@@ -1899,7 +1901,10 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -17659,8 +17659,8 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
 +        // Tuinity End
      }
  
-     @Override
-@@ -2285,6 +2290,14 @@ public final class CraftServer implements Server {
+     // Paper start
+@@ -2333,6 +2338,14 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
@@ -17786,10 +17786,10 @@ index 22bde395939f97086e411cef190bb2b1e7ede79a..0f6cb508a170360b6479f9c340484124
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d0b50289c 100644
+index bb474fbdf44dbc61b4fa0bced4d15bc2d1fb548f..744e6351c58e5aa4a0c668f2ff1adb76a3dc0822 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -508,27 +508,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -509,27 +509,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setHeadRotation(yaw);
      }
  
@@ -17818,7 +17818,7 @@ index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d
  
      @Override
      public boolean teleport(Location location) {
-@@ -562,6 +542,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -563,6 +543,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return true;
      }
  
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index cfcad5847..332da2852 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 44524e08bed8897e43e408b6f179bf798fed9b62..19a209cfc71e30edd3ff2d8c319df5e8b331e6cf 100644
+index 6c226d46e970fe2ade300fabf0fdd5e9f2679593..559bcf739ebe9e96c98e11836e29e4e1cd2e87c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index 20cd0fe21..d64c4d427 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -373,10 +373,10 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547ca1f221d7 100644
+index 559bcf739ebe9e96c98e11836e29e4e1cd2e87c4..cb0ab8a9641b1d026d58664b55feaa6239931755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -861,6 +861,7 @@ public final class CraftServer implements Server {
+@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
          com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -384,7 +384,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -896,6 +897,7 @@ public final class CraftServer implements Server {
+@@ -899,6 +900,7 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
              world.tuinityConfig.init(); // Tuinity - Server Config
@@ -392,7 +392,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -914,6 +916,7 @@ public final class CraftServer implements Server {
+@@ -917,6 +919,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -400,7 +400,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2298,6 +2301,18 @@ public final class CraftServer implements Server {
+@@ -2346,6 +2349,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  
diff --git a/patches/server/0005-Add-component-util.patch b/patches/server/0005-Add-component-util.patch
deleted file mode 100644
index f63b095a5..000000000
--- a/patches/server/0005-Add-component-util.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 15 Aug 2020 03:49:33 -0500
-Subject: [PATCH] Add component util
-
-
-diff --git a/src/main/java/net/pl3x/purpur/ComponentUtil.java b/src/main/java/net/pl3x/purpur/ComponentUtil.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3f7bc68d1a6fb00758b178bb46113e38b8bc24bc
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/ComponentUtil.java
-@@ -0,0 +1,32 @@
-+package net.pl3x.purpur;
-+
-+import net.md_5.bungee.api.chat.BaseComponent;
-+import net.md_5.bungee.api.chat.TextComponent;
-+import net.md_5.bungee.chat.ComponentSerializer;
-+import net.minecraft.server.IChatBaseComponent;
-+import net.minecraft.server.MinecraftServer;
-+
-+import java.util.List;
-+
-+public class ComponentUtil {
-+    public static String fromComponent(IChatBaseComponent component) {
-+        String json = "";
-+        try {
-+            int chop;
-+            List<IChatBaseComponent> siblings = component.getSiblings();
-+            if (siblings.size() > 0) chop = siblings.get(0).getChatModifier().getColor() == null ? 4 : 2;
-+            else chop = component.getChatModifier().getColor() == null ? 2 : 0;
-+            json = IChatBaseComponent.ChatSerializer.componentToJson(component);
-+            BaseComponent[] parsed = ComponentSerializer.parse(json);
-+            return TextComponent.toLegacyText(parsed).substring(chop);
-+        } catch (Exception e) {
-+            MinecraftServer.LOGGER.warn("There was a problem processing a chat component!");
-+            MinecraftServer.LOGGER.warn("We have fallen back to legacy colorless string to prevent real errors");
-+            MinecraftServer.LOGGER.warn("Please report this to Purpur!");
-+            MinecraftServer.LOGGER.warn("JSON: " + json);
-+            MinecraftServer.LOGGER.warn("The following error describes what went wrong:");
-+            e.printStackTrace();
-+            return component.getString();
-+        }
-+    }
-+}
diff --git a/patches/server/0006-Barrels-and-enderchests-6-rows.patch b/patches/server/0005-Barrels-and-enderchests-6-rows.patch
similarity index 98%
rename from patches/server/0006-Barrels-and-enderchests-6-rows.patch
rename to patches/server/0005-Barrels-and-enderchests-6-rows.patch
index c8bd7f2b8..1ca624652 100644
--- a/patches/server/0006-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0005-Barrels-and-enderchests-6-rows.patch
@@ -143,10 +143,10 @@ index 00eb196f8caa2e4f2478972c14f4596071adbd2a..cb7e34924cb5dbff25d1ffe05cfe5bc2
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 8c714c7430c0a6b8fd7f4a158d9a271e1642bd7a..cae362bae9e1e253c34bc81813d251fece839de3 100644
+index 97c9b528f9ee8eb156a311d68d5d897fb1d837b7..08d35aa86919b97408f05d3669cd68164a3cb64f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -198,8 +198,10 @@ public class CraftContainer extends Container {
+@@ -212,8 +212,10 @@ public class CraftContainer extends Container {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:
diff --git a/patches/server/0007-Advancement-API.patch b/patches/server/0006-Advancement-API.patch
similarity index 100%
rename from patches/server/0007-Advancement-API.patch
rename to patches/server/0006-Advancement-API.patch
diff --git a/patches/server/0008-Llama-API.patch b/patches/server/0007-Llama-API.patch
similarity index 100%
rename from patches/server/0008-Llama-API.patch
rename to patches/server/0007-Llama-API.patch
diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0008-AFK-API.patch
similarity index 96%
rename from patches/server/0009-AFK-API.patch
rename to patches/server/0008-AFK-API.patch
index 8d25e7860..5d7af715c 100644
--- a/patches/server/0009-AFK-API.patch
+++ b/patches/server/0008-AFK-API.patch
@@ -25,10 +25,10 @@ index 59b00c78f8d92bcceca35d0f25e4d94b3ebdc6e2..e0cf2af8fcbfc66fc32aa8e693b62160
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 173a210392d71cdfc551f095dc0d9c9040d22d3f..af4fb76d000594229e0c0dfdcde48fbafc087de0 100644
+index 81249a38ecfdb04a8e266c8d9c3d00d63ccead4b..771f634a06eca998853830d78b4d1546dd2b4c67 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1927,8 +1927,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1929,8 +1929,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -149,10 +149,10 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4185ec46435ddf48d9e25c4d71ac4e14eb6301cf..1d810a9b23d236493db121dde92c7ebce25a25fe 100644
+index 674889b81ec338338d2d21d89bd4613f89a77a9e..07a481d9f49028cc8911e8bd348b2d2996d565ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -263,10 +263,10 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ed7b91bf703c7e7d5cbe323d9ab1c299c33ebad1..e319f3b1282af8019ae706f46e3978e789fbc877 100644
+index 66522b820786649a1b82647d8ccdb086edf420f6..3838e2f2430c1e21315cb93b986e428cfde6f591 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2222,4 +2222,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2427,4 +2427,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
@@ -289,10 +289,10 @@ index ed7b91bf703c7e7d5cbe323d9ab1c299c33ebad1..e319f3b1282af8019ae706f46e3978e7
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6ade13fd88c381280f619daaa8d6b241c67dd9d9..f80526939be358ac46430f35f3fdc7f88038c262 100644
+index 18295dceeacefd2586f3e3fe8bd58790740ba14d..f2e978107ef1163ceadb3ea7594eba6e900a8a28 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -205,6 +205,7 @@ public class ActivationRange
+@@ -206,6 +206,7 @@ public class ActivationRange
          {
  
              player.activatedTick = MinecraftServer.currentTick;
diff --git a/patches/server/0010-Bring-back-server-name.patch b/patches/server/0009-Bring-back-server-name.patch
similarity index 91%
rename from patches/server/0010-Bring-back-server-name.patch
rename to patches/server/0009-Bring-back-server-name.patch
index 28dfe1eca..5aad5d00b 100644
--- a/patches/server/0010-Bring-back-server-name.patch
+++ b/patches/server/0009-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cd8db287bb4110e17ec0da57ee1547ca1f221d7..529f50aa6755c202ac2d3a6d0e4dfd38c4eaf6e8 100644
+index cb0ab8a9641b1d026d58664b55feaa6239931755..5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2451,4 +2451,11 @@ public final class CraftServer implements Server {
+@@ -2509,4 +2509,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end
diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0010-Configurable-server-mod-name.patch
similarity index 100%
rename from patches/server/0011-Configurable-server-mod-name.patch
rename to patches/server/0010-Configurable-server-mod-name.patch
diff --git a/patches/server/0012-LivingEntity-safeFallDistance.patch b/patches/server/0011-LivingEntity-safeFallDistance.patch
similarity index 100%
rename from patches/server/0012-LivingEntity-safeFallDistance.patch
rename to patches/server/0011-LivingEntity-safeFallDistance.patch
diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0012-Lagging-threshold.patch
similarity index 94%
rename from patches/server/0013-Lagging-threshold.patch
rename to patches/server/0012-Lagging-threshold.patch
index 6affec213..a00c0867e 100644
--- a/patches/server/0013-Lagging-threshold.patch
+++ b/patches/server/0012-Lagging-threshold.patch
@@ -41,10 +41,10 @@ index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 529f50aa6755c202ac2d3a6d0e4dfd38c4eaf6e8..cb54a5c340a8f2b82668fc7b8e3beeb977cd3c80 100644
+index 5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751..d1ebee6dd6fe01300a0b661120b1661d18aedb20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2457,5 +2457,10 @@ public final class CraftServer implements Server {
+@@ -2515,5 +2515,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }
diff --git a/patches/server/0014-ItemFactory-getMonsterEgg.patch b/patches/server/0013-ItemFactory-getMonsterEgg.patch
similarity index 92%
rename from patches/server/0014-ItemFactory-getMonsterEgg.patch
rename to patches/server/0013-ItemFactory-getMonsterEgg.patch
index f8518e78e..41e6a2d9c 100644
--- a/patches/server/0014-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0013-ItemFactory-getMonsterEgg.patch
@@ -18,10 +18,10 @@ index a236e0441fc20270b4c44ed5a7d5b94297949226..eeac4aeaf21b43647aa643ec55a1ae84
      private final int c;
      private final EntityTypes<?> d;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index af84813c703813ec3a6ca89ff437d89e31a9100f..2d38a4782d85dd9c5e6097bea6c13c6185ea05ab 100644
+index c79623339cfe8fb8484bcc2a8c3eb119b9e83093..3a6a1f8ce0a30f2bdc08ec36fe9a2381439e7fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -388,4 +388,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -396,4 +396,18 @@ public final class CraftItemFactory implements ItemFactory {
              new net.md_5.bungee.api.chat.TextComponent(customName));
      }
      // Paper end
diff --git a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/server/0016-EMC-MonsterEggSpawnEvent.patch b/patches/server/0015-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/server/0016-EMC-MonsterEggSpawnEvent.patch
rename to patches/server/0015-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/server/0017-Player-invulnerabilities.patch b/patches/server/0016-Player-invulnerabilities.patch
similarity index 87%
rename from patches/server/0017-Player-invulnerabilities.patch
rename to patches/server/0016-Player-invulnerabilities.patch
index 68a61ccc4..8f4a19235 100644
--- a/patches/server/0017-Player-invulnerabilities.patch
+++ b/patches/server/0016-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813b5abe8f6 100644
+index 771f634a06eca998853830d78b4d1546dd2b4c67..f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -151,6 +151,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -154,6 +154,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.canPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -17,7 +17,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -992,6 +994,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -989,6 +991,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -999,7 +1007,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -996,7 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1175,6 +1183,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1172,6 +1180,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              }
              // Paper end
  
@@ -47,7 +47,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
              return this;
          }
      }
-@@ -2345,9 +2354,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2347,9 +2356,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d810a9b23d236493db121dde92c7ebce25a25fe..218ebc7befca683607b0b9863384a5b5d6bd3a2f 100644
+index 07a481d9f49028cc8911e8bd348b2d2996d565ec..3839f0ab12b42ddcafc6b469d6fafeee9781ae10 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1733,6 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,10 +79,10 @@ index 1d810a9b23d236493db121dde92c7ebce25a25fe..218ebc7befca683607b0b9863384a5b5
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index eabd1aa2b740bcb6db40be300cd6daf59674fa3f..46043d3a4f4056fff93b867c65d363ac1277db7a 100644
+index e86ab7dd06df2c6973456def1b43dfb5518ec739..757238ed5a7b62bcea8a9b57030dee21a2d7ad9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -915,6 +915,8 @@ public abstract class PlayerList {
+@@ -917,6 +917,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -108,10 +108,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e319f3b1282af8019ae706f46e3978e789fbc877..62ef7bb712e91fed150bf9c16c11635a9aaaab67 100644
+index 3838e2f2430c1e21315cb93b986e428cfde6f591..bae2a248349e07718e3b4668691ed3c65736f4ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2238,5 +2238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2443,5 +2443,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }
diff --git a/patches/server/0018-Anvil-API.patch b/patches/server/0017-Anvil-API.patch
similarity index 100%
rename from patches/server/0018-Anvil-API.patch
rename to patches/server/0017-Anvil-API.patch
diff --git a/patches/server/0019-Configurable-villager-brain-ticks.patch b/patches/server/0018-Configurable-villager-brain-ticks.patch
similarity index 100%
rename from patches/server/0019-Configurable-villager-brain-ticks.patch
rename to patches/server/0018-Configurable-villager-brain-ticks.patch
diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0019-Alternative-Keepalive-Handling.patch
similarity index 94%
rename from patches/server/0020-Alternative-Keepalive-Handling.patch
rename to patches/server/0019-Alternative-Keepalive-Handling.patch
index fc0b83b86..d8c014019 100644
--- a/patches/server/0020-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0019-Alternative-Keepalive-Handling.patch
@@ -17,10 +17,10 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3bd155b64e 100644
+index 3839f0ab12b42ddcafc6b469d6fafeee9781ae10..917609140f5d5200c918bd467998736dd504d909 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -86,6 +86,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER
      private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
@@ -28,7 +28,7 @@ index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3b
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -218,6 +219,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -220,6 +221,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
          long currentTime = SystemUtils.getMonotonicMillis();
          long elapsedTime = currentTime - this.getLastPing();
  
@@ -50,7 +50,7 @@ index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3b
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2907,6 +2923,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2909,6 +2925,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/patches/server/0021-Silk-touch-spawners.patch b/patches/server/0020-Silk-touch-spawners.patch
similarity index 100%
rename from patches/server/0021-Silk-touch-spawners.patch
rename to patches/server/0020-Silk-touch-spawners.patch
diff --git a/patches/server/0022-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0021-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 100%
rename from patches/server/0022-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0021-MC-168772-Fix-Add-turtle-egg-block-options.patch
diff --git a/patches/server/0023-Fix-vanilla-command-permission-handler.patch b/patches/server/0022-Fix-vanilla-command-permission-handler.patch
similarity index 100%
rename from patches/server/0023-Fix-vanilla-command-permission-handler.patch
rename to patches/server/0022-Fix-vanilla-command-permission-handler.patch
diff --git a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0023-Logger-settings-suppressing-pointless-logs.patch
similarity index 100%
rename from patches/server/0024-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0023-Logger-settings-suppressing-pointless-logs.patch
diff --git a/patches/server/0025-Disable-outdated-build-check.patch b/patches/server/0024-Disable-outdated-build-check.patch
similarity index 100%
rename from patches/server/0025-Disable-outdated-build-check.patch
rename to patches/server/0024-Disable-outdated-build-check.patch
diff --git a/patches/server/0026-Giants-AI-settings.patch b/patches/server/0025-Giants-AI-settings.patch
similarity index 100%
rename from patches/server/0026-Giants-AI-settings.patch
rename to patches/server/0025-Giants-AI-settings.patch
diff --git a/patches/server/0027-Illusioners-AI-settings.patch b/patches/server/0026-Illusioners-AI-settings.patch
similarity index 100%
rename from patches/server/0027-Illusioners-AI-settings.patch
rename to patches/server/0026-Illusioners-AI-settings.patch
diff --git a/patches/server/0028-Zombie-horse-naturally-spawn.patch b/patches/server/0027-Zombie-horse-naturally-spawn.patch
similarity index 100%
rename from patches/server/0028-Zombie-horse-naturally-spawn.patch
rename to patches/server/0027-Zombie-horse-naturally-spawn.patch
diff --git a/patches/server/0029-Charged-creeper-naturally-spawn.patch b/patches/server/0028-Charged-creeper-naturally-spawn.patch
similarity index 100%
rename from patches/server/0029-Charged-creeper-naturally-spawn.patch
rename to patches/server/0028-Charged-creeper-naturally-spawn.patch
diff --git a/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 100%
rename from patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch
diff --git a/patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 91%
rename from patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index b1287fe4e..40454d09d 100644
--- a/patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 9beb6fad228ccb3081b661c845836f4f29404d86..b98d094422f09ddffe09bac7cf1a9c7e92ae5aa6 100644
+index d0fad346dd4511722f958a8c0bda67492184fb62..1df22ad7b35d6bd974e7fe805920542654c1b9d0 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {
diff --git a/patches/server/0032-Make-Iron-Golems-Swim.patch b/patches/server/0031-Make-Iron-Golems-Swim.patch
similarity index 100%
rename from patches/server/0032-Make-Iron-Golems-Swim.patch
rename to patches/server/0031-Make-Iron-Golems-Swim.patch
diff --git a/patches/server/0033-Dont-send-useless-entity-packets.patch b/patches/server/0032-Dont-send-useless-entity-packets.patch
similarity index 100%
rename from patches/server/0033-Dont-send-useless-entity-packets.patch
rename to patches/server/0032-Dont-send-useless-entity-packets.patch
diff --git a/patches/server/0034-Tulips-change-fox-type.patch b/patches/server/0033-Tulips-change-fox-type.patch
similarity index 100%
rename from patches/server/0034-Tulips-change-fox-type.patch
rename to patches/server/0033-Tulips-change-fox-type.patch
diff --git a/patches/server/0035-Breedable-Polar-Bears.patch b/patches/server/0034-Breedable-Polar-Bears.patch
similarity index 100%
rename from patches/server/0035-Breedable-Polar-Bears.patch
rename to patches/server/0034-Breedable-Polar-Bears.patch
diff --git a/patches/server/0036-Chickens-can-retaliate.patch b/patches/server/0035-Chickens-can-retaliate.patch
similarity index 100%
rename from patches/server/0036-Chickens-can-retaliate.patch
rename to patches/server/0035-Chickens-can-retaliate.patch
diff --git a/patches/server/0037-Add-option-to-set-armorstand-step-height.patch b/patches/server/0036-Add-option-to-set-armorstand-step-height.patch
similarity index 100%
rename from patches/server/0037-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0036-Add-option-to-set-armorstand-step-height.patch
diff --git a/patches/server/0038-Cat-spawning-options.patch b/patches/server/0037-Cat-spawning-options.patch
similarity index 100%
rename from patches/server/0038-Cat-spawning-options.patch
rename to patches/server/0037-Cat-spawning-options.patch
diff --git a/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
similarity index 100%
rename from patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
rename to patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
diff --git a/patches/server/0040-Cows-eat-mushrooms.patch b/patches/server/0039-Cows-eat-mushrooms.patch
similarity index 100%
rename from patches/server/0040-Cows-eat-mushrooms.patch
rename to patches/server/0039-Cows-eat-mushrooms.patch
diff --git a/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0042-Pigs-give-saddle-back.patch b/patches/server/0041-Pigs-give-saddle-back.patch
similarity index 100%
rename from patches/server/0042-Pigs-give-saddle-back.patch
rename to patches/server/0041-Pigs-give-saddle-back.patch
diff --git a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch
similarity index 100%
rename from patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch
diff --git a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch b/patches/server/0043-Ender-dragon-always-drop-full-exp.patch
similarity index 100%
rename from patches/server/0044-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0043-Ender-dragon-always-drop-full-exp.patch
diff --git a/patches/server/0045-Signs-editable-on-right-click.patch b/patches/server/0044-Signs-editable-on-right-click.patch
similarity index 100%
rename from patches/server/0045-Signs-editable-on-right-click.patch
rename to patches/server/0044-Signs-editable-on-right-click.patch
diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0045-Signs-allow-color-codes.patch
similarity index 57%
rename from patches/server/0046-Signs-allow-color-codes.patch
rename to patches/server/0045-Signs-allow-color-codes.patch
index 2b4f60289..ad3f0cfbd 100644
--- a/patches/server/0046-Signs-allow-color-codes.patch
+++ b/patches/server/0045-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5e157aabc8326a32a6a1825fef0f9813b5abe8f6..c533c24aefa6693dd5c11d690930327c5d7a8802 100644
+index f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec..a76d4ed8a0baa09340fcf58e647afa1ce18d9c97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1452,6 +1452,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1449,6 +1449,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,29 +17,38 @@ index 5e157aabc8326a32a6a1825fef0f9813b5abe8f6..c533c24aefa6693dd5c11d690930327c
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dc93f0c8f65e2a796604b8e4488c1b3bd155b64e..eaddc933261aeccc963ac0f35eebb387c16ae6a0 100644
+index 917609140f5d5200c918bd467998736dd504d909..bce0c34a7acf686e715f6cfc73098f5840f269ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2904,6 +2904,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2903,6 +2903,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
 +                // Purpur start
 +                if (worldserver.purpurConfig.signAllowColors) {
-+                    lines[i] = currentLine;
-+                    if (player.hasPermission("purpur.sign.color")) lines[i] = lines[i].replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
-+                    if (player.hasPermission("purpur.sign.style")) lines[i] = lines[i].replaceAll("(?i)&([l-or])", "\u00a7$1");
-+                    if (player.hasPermission("purpur.sign.magic")) lines[i] = lines[i].replaceAll("(?i)&([kr])", "\u00a7$1");
++                    final org.bukkit.entity.Player bukkitPlayer = player.getBukkitEntity();
++                    if (bukkitPlayer.hasPermission("purpur.sign.color")) currentLine = currentLine.replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
++                    if (bukkitPlayer.hasPermission("purpur.sign.style")) currentLine = currentLine.replaceAll("(?i)&([l-or])", "\u00a7$1");
++                    if (bukkitPlayer.hasPermission("purpur.sign.magic")) currentLine = currentLine.replaceAll("(?i)&([kr])", "\u00a7$1");
++                    lines.add(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(currentLine));
 +                } else
 +                // Purpur end
-                 lines[i] = SharedConstants.filterAllowedChatCharacters(currentLine); // Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created.
+                 lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterAllowedChatCharacters(currentLine))); // Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created.
              }
-             SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
+             SignChangeEvent event = new SignChangeEvent(org.bukkit.craftbukkit.block.CraftBlock.at(worldserver, blockposition), this.getPlayer(), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc90b897e91 100644
+index 316766970243e8ac00e4c82f6c710de5edc3fa51..be6c9e17379e2c9bf50c58f11632c308efded6c3 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
-@@ -93,6 +93,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
+@@ -1,6 +1,7 @@
+ package net.minecraft.server;
+ 
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
++import io.papermc.paper.adventure.PaperAdventure; // Purpur
+ import java.util.UUID;
+ import javax.annotation.Nullable;
+ 
+@@ -93,6 +94,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
          this.g[i] = null;
      }
  
@@ -47,8 +56,8 @@ index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc9
 +    public PacketPlayOutTileEntityData getTranslatedUpdatePacket() {
 +        NBTTagCompound nbt = save(new NBTTagCompound());
 +        for (int i = 0; i < 4; ++i) {
-+            String line = net.pl3x.purpur.ComponentUtil.fromComponent(lines[i]).replace("\u00a7", "&");
-+            nbt.setString("Text" + (i + 1), IChatBaseComponent.ChatSerializer.componentToJson(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(line)[0]));
++            String line = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().serialize(PaperAdventure.asAdventure(lines[i]));
++            nbt.setString("Text" + (i + 1), net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().serialize(net.kyori.adventure.text.Component.text(line)));
 +        }
 +        nbt.setString("PurpurEditor", "true");
 +        return new PacketPlayOutTileEntityData(position, 9, nbt);
diff --git a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 100%
rename from patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
diff --git a/patches/server/0048-Controllable-Minecarts.patch b/patches/server/0047-Controllable-Minecarts.patch
similarity index 98%
rename from patches/server/0048-Controllable-Minecarts.patch
rename to patches/server/0047-Controllable-Minecarts.patch
index c16977988..e1030fc03 100644
--- a/patches/server/0048-Controllable-Minecarts.patch
+++ b/patches/server/0047-Controllable-Minecarts.patch
@@ -106,10 +106,10 @@ index 022dfdc5b6af4b243e7e4da8660e8e41d04e1a30..298af30b1a7f12d42216fc1b7ee801fd
          this.move(EnumMoveType.SELF, this.getMot());
          if (!this.onGround) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c533c24aefa6693dd5c11d690930327c5d7a8802..26237522deb4495df374d144335a0034ba046762 100644
+index a76d4ed8a0baa09340fcf58e647afa1ce18d9c97..26220aa522f5bfa64fe0cacbe3800624b41299bb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1005,6 +1005,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1002,6 +1002,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {
diff --git a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch
similarity index 100%
rename from patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch
diff --git a/patches/server/0050-Players-should-not-cram-to-death.patch b/patches/server/0049-Players-should-not-cram-to-death.patch
similarity index 85%
rename from patches/server/0050-Players-should-not-cram-to-death.patch
rename to patches/server/0049-Players-should-not-cram-to-death.patch
index 76f27e11f..626df24e0 100644
--- a/patches/server/0050-Players-should-not-cram-to-death.patch
+++ b/patches/server/0049-Players-should-not-cram-to-death.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 26237522deb4495df374d144335a0034ba046762..41f9b0b905fd79a9c570be601048f817aba64bbd 100644
+index 26220aa522f5bfa64fe0cacbe3800624b41299bb..d3b0e7d03b625f13b1317025d88d93886a900c95 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1429,7 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1426,7 +1426,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
diff --git a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 100%
rename from patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
diff --git a/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0053-Fix-the-dead-lagging-the-server.patch b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
similarity index 100%
rename from patches/server/0053-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0052-Fix-the-dead-lagging-the-server.patch
diff --git a/patches/server/0054-Skip-events-if-there-s-no-listeners.patch b/patches/server/0053-Skip-events-if-there-s-no-listeners.patch
similarity index 100%
rename from patches/server/0054-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0053-Skip-events-if-there-s-no-listeners.patch
diff --git a/patches/server/0055-Add-permission-for-F3-N-debug.patch b/patches/server/0054-Add-permission-for-F3-N-debug.patch
similarity index 83%
rename from patches/server/0055-Add-permission-for-F3-N-debug.patch
rename to patches/server/0054-Add-permission-for-F3-N-debug.patch
index 8e1e10df1..1cdfeb2ff 100644
--- a/patches/server/0055-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0054-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 46043d3a4f4056fff93b867c65d363ac1277db7a..726e3292318f6a0de474f68fe30da4a954c7600a 100644
+index 757238ed5a7b62bcea8a9b57030dee21a2d7ad9e..3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1074,6 +1074,7 @@ public abstract class PlayerList {
+@@ -1076,6 +1076,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0055-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 100%
rename from patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0055-Add-wither-skeleton-takes-wither-damage-option.patch
diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0056-Configurable-TPS-Catchup.patch
similarity index 100%
rename from patches/server/0057-Configurable-TPS-Catchup.patch
rename to patches/server/0056-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/0057-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/0057-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/0058-Add-enderman-and-creeper-griefing-controls.patch
similarity index 100%
rename from patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
diff --git a/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
similarity index 100%
rename from patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
rename to patches/server/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
diff --git a/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0060-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
similarity index 100%
rename from patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
rename to patches/server/0060-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
diff --git a/patches/server/0062-Villagers-follow-emerald-blocks.patch b/patches/server/0061-Villagers-follow-emerald-blocks.patch
similarity index 100%
rename from patches/server/0062-Villagers-follow-emerald-blocks.patch
rename to patches/server/0061-Villagers-follow-emerald-blocks.patch
diff --git a/patches/server/0063-Allow-leashing-villagers.patch b/patches/server/0062-Allow-leashing-villagers.patch
similarity index 100%
rename from patches/server/0063-Allow-leashing-villagers.patch
rename to patches/server/0062-Allow-leashing-villagers.patch
diff --git a/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0063-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 100%
rename from patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0063-Implement-configurable-search-radius-for-villagers-t.patch
diff --git a/patches/server/0065-Implement-infinite-lava.patch b/patches/server/0064-Implement-infinite-lava.patch
similarity index 100%
rename from patches/server/0065-Implement-infinite-lava.patch
rename to patches/server/0064-Implement-infinite-lava.patch
diff --git a/patches/server/0066-Make-lava-flow-speed-configurable.patch b/patches/server/0065-Make-lava-flow-speed-configurable.patch
similarity index 100%
rename from patches/server/0066-Make-lava-flow-speed-configurable.patch
rename to patches/server/0065-Make-lava-flow-speed-configurable.patch
diff --git a/patches/server/0067-Add-player-death-exp-control-options.patch b/patches/server/0066-Add-player-death-exp-control-options.patch
similarity index 100%
rename from patches/server/0067-Add-player-death-exp-control-options.patch
rename to patches/server/0066-Add-player-death-exp-control-options.patch
diff --git a/patches/server/0068-Add-canSaveToDisk-to-Entity.patch b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0068-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0067-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0069-Configurable-void-damage-height.patch b/patches/server/0068-Configurable-void-damage-height.patch
similarity index 100%
rename from patches/server/0069-Configurable-void-damage-height.patch
rename to patches/server/0068-Configurable-void-damage-height.patch
diff --git a/patches/server/0070-Dispenser-curse-of-binding-protection.patch b/patches/server/0069-Dispenser-curse-of-binding-protection.patch
similarity index 100%
rename from patches/server/0070-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0069-Dispenser-curse-of-binding-protection.patch
diff --git a/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0070-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 100%
rename from patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0070-Add-option-for-boats-to-eject-players-on-land.patch
diff --git a/patches/server/0072-Add-obfhelpers-for-plugin-use.patch b/patches/server/0071-Add-obfhelpers-for-plugin-use.patch
similarity index 100%
rename from patches/server/0072-Add-obfhelpers-for-plugin-use.patch
rename to patches/server/0071-Add-obfhelpers-for-plugin-use.patch
diff --git a/patches/server/0073-Mending-mends-most-damages-equipment-first.patch b/patches/server/0072-Mending-mends-most-damages-equipment-first.patch
similarity index 100%
rename from patches/server/0073-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0072-Mending-mends-most-damages-equipment-first.patch
diff --git a/patches/server/0074-Add-5-second-tps-average-in-tps.patch b/patches/server/0073-Add-5-second-tps-average-in-tps.patch
similarity index 96%
rename from patches/server/0074-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0073-Add-5-second-tps-average-in-tps.patch
index acddcf365..dcd27f9b5 100644
--- a/patches/server/0074-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0073-Add-5-second-tps-average-in-tps.patch
@@ -47,10 +47,10 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cb54a5c340a8f2b82668fc7b8e3beeb977cd3c80..dfe6777db04bb550ae0e761addd26b2d5abf3baf 100644
+index d1ebee6dd6fe01300a0b661120b1661d18aedb20..1f17349c00522cd4768836d78e712cd6c184fd11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2247,6 +2247,7 @@ public final class CraftServer implements Server {
+@@ -2295,6 +2295,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0075-Implement-elytra-settings.patch b/patches/server/0074-Implement-elytra-settings.patch
similarity index 100%
rename from patches/server/0075-Implement-elytra-settings.patch
rename to patches/server/0074-Implement-elytra-settings.patch
diff --git a/patches/server/0076-Item-entity-immunities.patch b/patches/server/0075-Item-entity-immunities.patch
similarity index 100%
rename from patches/server/0076-Item-entity-immunities.patch
rename to patches/server/0075-Item-entity-immunities.patch
diff --git a/patches/server/0077-Add-ping-command.patch b/patches/server/0076-Add-ping-command.patch
similarity index 100%
rename from patches/server/0077-Add-ping-command.patch
rename to patches/server/0076-Add-ping-command.patch
diff --git a/patches/server/0078-Configurable-jockey-options.patch b/patches/server/0077-Configurable-jockey-options.patch
similarity index 100%
rename from patches/server/0078-Configurable-jockey-options.patch
rename to patches/server/0077-Configurable-jockey-options.patch
diff --git a/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/server/0080-Add-phantom-spawning-options.patch b/patches/server/0079-Add-phantom-spawning-options.patch
similarity index 100%
rename from patches/server/0080-Add-phantom-spawning-options.patch
rename to patches/server/0079-Add-phantom-spawning-options.patch
diff --git a/patches/server/0081-Implement-bed-explosion-options.patch b/patches/server/0080-Implement-bed-explosion-options.patch
similarity index 100%
rename from patches/server/0081-Implement-bed-explosion-options.patch
rename to patches/server/0080-Implement-bed-explosion-options.patch
diff --git a/patches/server/0082-Implement-respawn-anchor-explosion-options.patch b/patches/server/0081-Implement-respawn-anchor-explosion-options.patch
similarity index 100%
rename from patches/server/0082-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0081-Implement-respawn-anchor-explosion-options.patch
diff --git a/patches/server/0083-Add-allow-water-in-end-world-option.patch b/patches/server/0082-Add-allow-water-in-end-world-option.patch
similarity index 100%
rename from patches/server/0083-Add-allow-water-in-end-world-option.patch
rename to patches/server/0082-Add-allow-water-in-end-world-option.patch
diff --git a/patches/server/0084-Allow-color-codes-in-books.patch b/patches/server/0083-Allow-color-codes-in-books.patch
similarity index 96%
rename from patches/server/0084-Allow-color-codes-in-books.patch
rename to patches/server/0083-Allow-color-codes-in-books.patch
index 27c0a671c..341b30d2c 100644
--- a/patches/server/0084-Allow-color-codes-in-books.patch
+++ b/patches/server/0083-Allow-color-codes-in-books.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eaddc933261aeccc963ac0f35eebb387c16ae6a0..67fa3bd958876abc39c46d9e517551836b0e86ed 100644
+index bce0c34a7acf686e715f6cfc73098f5840f269ca..a5952ce1e6d0f48d7801104bdbd05eb21a0df4de 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1054,7 +1054,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0085-Entity-lifespan.patch b/patches/server/0084-Entity-lifespan.patch
similarity index 97%
rename from patches/server/0085-Entity-lifespan.patch
rename to patches/server/0084-Entity-lifespan.patch
index 6d7546875..a822c6f83 100644
--- a/patches/server/0085-Entity-lifespan.patch
+++ b/patches/server/0084-Entity-lifespan.patch
@@ -92,10 +92,10 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 67fa3bd958876abc39c46d9e517551836b0e86ed..94353290087df17e441dba8fe8999ad558652cda 100644
+index a5952ce1e6d0f48d7801104bdbd05eb21a0df4de..cd13a09ace9341e6741956058c0faca16fe6ac16 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2296,6 +2296,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2299,6 +2299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
                      Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
                      PlayerInteractEntityEvent event;
diff --git a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 95%
rename from patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index df94a284c..92821cb7a 100644
--- a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -17,10 +17,10 @@ index ba678ad67d1a48724738a71e1ff3b4e85b672f2c..67f33647cd66c32fcc6d91edd7f66684
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 41f9b0b905fd79a9c570be601048f817aba64bbd..fa8e8cdb2ee594fea47c32acf6013771ad1e59a5 100644
+index d3b0e7d03b625f13b1317025d88d93886a900c95..fd923594c67f51cfd77ca22f5b6664a3b7136e7e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2412,4 +2412,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2414,4 +2414,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
diff --git a/patches/server/0087-Squid-EAR-immunity.patch b/patches/server/0086-Squid-EAR-immunity.patch
similarity index 91%
rename from patches/server/0087-Squid-EAR-immunity.patch
rename to patches/server/0086-Squid-EAR-immunity.patch
index 72311de18..10eb15175 100644
--- a/patches/server/0087-Squid-EAR-immunity.patch
+++ b/patches/server/0086-Squid-EAR-immunity.patch
@@ -21,10 +21,10 @@ index 5d35651f43de81c8cf047479ad9c88c4b3f1c38c..32bb2524641722d16b6bafcc6b1af279
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerCanBeLeashed = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f80526939be358ac46430f35f3fdc7f88038c262..66b7c75929cd98737628b9d4f22829b5b65b8373 100644
+index f2e978107ef1163ceadb3ea7594eba6e900a8a28..05b165f4f2de1f09164c33c0b222dc660c86ebb9 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -376,6 +376,7 @@ public class ActivationRange
+@@ -377,6 +377,7 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
diff --git a/patches/server/0088-Configurable-end-spike-seed.patch b/patches/server/0087-Configurable-end-spike-seed.patch
similarity index 100%
rename from patches/server/0088-Configurable-end-spike-seed.patch
rename to patches/server/0087-Configurable-end-spike-seed.patch
diff --git a/patches/server/0089-Configurable-dungeon-seed.patch b/patches/server/0088-Configurable-dungeon-seed.patch
similarity index 100%
rename from patches/server/0089-Configurable-dungeon-seed.patch
rename to patches/server/0088-Configurable-dungeon-seed.patch
diff --git a/patches/server/0090-Phantoms-burn-in-light.patch b/patches/server/0089-Phantoms-burn-in-light.patch
similarity index 100%
rename from patches/server/0090-Phantoms-burn-in-light.patch
rename to patches/server/0089-Phantoms-burn-in-light.patch
diff --git a/patches/server/0091-Configurable-villager-breeding.patch b/patches/server/0090-Configurable-villager-breeding.patch
similarity index 100%
rename from patches/server/0091-Configurable-villager-breeding.patch
rename to patches/server/0090-Configurable-villager-breeding.patch
diff --git a/patches/server/0092-Redstone-deactivates-spawners.patch b/patches/server/0091-Redstone-deactivates-spawners.patch
similarity index 100%
rename from patches/server/0092-Redstone-deactivates-spawners.patch
rename to patches/server/0091-Redstone-deactivates-spawners.patch
diff --git a/patches/server/0093-Totems-work-in-inventory.patch b/patches/server/0092-Totems-work-in-inventory.patch
similarity index 100%
rename from patches/server/0093-Totems-work-in-inventory.patch
rename to patches/server/0092-Totems-work-in-inventory.patch
diff --git a/patches/server/0096-Populator-seed-controls.patch b/patches/server/0093-Populator-seed-controls.patch
similarity index 100%
rename from patches/server/0096-Populator-seed-controls.patch
rename to patches/server/0093-Populator-seed-controls.patch
diff --git a/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0094-Add-vindicator-johnny-spawn-chance.patch
similarity index 100%
rename from patches/server/0097-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0094-Add-vindicator-johnny-spawn-chance.patch
diff --git a/patches/server/0094-Fix-death-message-colors.patch b/patches/server/0094-Fix-death-message-colors.patch
deleted file mode 100644
index da2b95d78..000000000
--- a/patches/server/0094-Fix-death-message-colors.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 19 Jul 2020 14:08:33 -0500
-Subject: [PATCH] Fix death message colors
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fa8e8cdb2ee594fea47c32acf6013771ad1e59a5..5aee348399622959afe421b896c182863151d0d1 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -853,7 +853,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-         IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();
- 
--        String deathmessage = defaultMessage.getString();
-+        // Purpur start
-+        String deathmessage;
-+        String json = "";
-+        try {
-+            json = IChatBaseComponent.ChatSerializer.componentToJson(defaultMessage);
-+            net.md_5.bungee.api.chat.BaseComponent[] parsed = net.md_5.bungee.chat.ComponentSerializer.parse(json);
-+            net.md_5.bungee.api.chat.TextComponent wrapped = new net.md_5.bungee.api.chat.TextComponent(parsed);
-+            deathmessage = wrapped.toLegacyText();
-+        } catch (Exception e) {
-+            deathmessage = defaultMessage.getString();
-+            MinecraftServer.LOGGER.warn("There was a problem processing the death message json component!");
-+            MinecraftServer.LOGGER.warn("We have fallen back to legacy colorless death message to prevent real errors");
-+            MinecraftServer.LOGGER.warn("Please report this to Purpur!");
-+            MinecraftServer.LOGGER.warn("JSON: " + json);
-+            MinecraftServer.LOGGER.warn("The following error describes what went wrong:");
-+            e.printStackTrace();
-+        }
-+        // Purpur end
-         org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
-         // Paper start - cancellable death event
-         if (event.isCancelled()) {
diff --git a/patches/server/0098-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0095-Add-option-to-disable-mushroom-block-updates.patch
similarity index 100%
rename from patches/server/0098-Add-option-to-disable-mushroom-block-updates.patch
rename to patches/server/0095-Add-option-to-disable-mushroom-block-updates.patch
diff --git a/patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
deleted file mode 100644
index d50741679..000000000
--- a/patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 19 Jul 2020 15:30:50 -0500
-Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
- chat event
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 94353290087df17e441dba8fe8999ad558652cda..05f2cc5904f196c70e8e83625810673f6110aba0 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2055,7 +2055,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
-                             return null;
-                         }
- 
--                        String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
-+                        // Purpur Start - Support for vanilla world scoreboard name coloring (copied from paper's diff below)
-+                        String displayName = queueEvent.getPlayer().getDisplayName();
-+                        if (PlayerConnection.this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
-+                            IChatBaseComponent nameFromTeam = ScoreboardTeam.a(PlayerConnection.this.player.getScoreboardTeam(), PlayerConnection.this.player.getDisplayName());
-+                            // Explicitly add a RESET here, vanilla uses components for this now...
-+                            displayName = new net.md_5.bungee.api.chat.TextComponent(net.md_5.bungee.chat.ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.componentToJson(nameFromTeam))).toLegacyText() + org.bukkit.ChatColor.RESET;
-+                        }
-+                        String message = String.format(queueEvent.getFormat(), displayName, queueEvent.getMessage());
-+                        // Purpur end
-                         PlayerConnection.this.minecraftServer.console.sendMessage(message);
-                         if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
-                             for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-@@ -2088,7 +2096,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
-                 // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
-                 String displayName = event.getPlayer().getDisplayName();
-                 if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
--                    IChatBaseComponent nameFromTeam = ScoreboardTeam.a(this.player.getScoreboardTeam(), ((CraftPlayer) player).getHandle().getDisplayName());
-+                    IChatBaseComponent nameFromTeam = ScoreboardTeam.a(this.player.getScoreboardTeam(), this.player.getDisplayName()); // Purpur - why are we casting bukkit player back to nms player when we already have a nms player...
-                     // Explicitly add a RESET here, vanilla uses components for this now...
-                     displayName = new net.md_5.bungee.api.chat.TextComponent(net.md_5.bungee.chat.ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.componentToJson(nameFromTeam))).toLegacyText() + org.bukkit.ChatColor.RESET;
-                 }
diff --git a/patches/server/0099-Dispensers-place-anvils-option.patch b/patches/server/0096-Dispensers-place-anvils-option.patch
similarity index 100%
rename from patches/server/0099-Dispensers-place-anvils-option.patch
rename to patches/server/0096-Dispensers-place-anvils-option.patch
diff --git a/patches/server/0100-Allow-anvil-colors.patch b/patches/server/0097-Allow-anvil-colors.patch
similarity index 100%
rename from patches/server/0100-Allow-anvil-colors.patch
rename to patches/server/0097-Allow-anvil-colors.patch
diff --git a/patches/server/0101-Add-no-tick-block-list.patch b/patches/server/0098-Add-no-tick-block-list.patch
similarity index 100%
rename from patches/server/0101-Add-no-tick-block-list.patch
rename to patches/server/0098-Add-no-tick-block-list.patch
diff --git a/patches/server/0102-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0099-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 100%
rename from patches/server/0102-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0099-Add-option-to-disable-dolphin-treasure-searching.patch
diff --git a/patches/server/0103-Short-enderman-height.patch b/patches/server/0100-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0103-Short-enderman-height.patch
rename to patches/server/0100-Short-enderman-height.patch
diff --git a/patches/server/0104-Stop-squids-floating-on-top-of-water.patch b/patches/server/0101-Stop-squids-floating-on-top-of-water.patch
similarity index 100%
rename from patches/server/0104-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0101-Stop-squids-floating-on-top-of-water.patch
diff --git a/patches/server/0105-Ridables.patch b/patches/server/0102-Ridables.patch
similarity index 99%
rename from patches/server/0105-Ridables.patch
rename to patches/server/0102-Ridables.patch
index d12ef03a5..9d80f14c4 100644
--- a/patches/server/0105-Ridables.patch
+++ b/patches/server/0102-Ridables.patch
@@ -3203,10 +3203,10 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5aee348399622959afe421b896c182863151d0d1..efe04677f69f8c6eaff1bfa0cd377ad96f31ac1c 100644
+index fd923594c67f51cfd77ca22f5b6664a3b7136e7e..f4d971448c91d2814055eea9f13426f1225c3e21 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -509,6 +509,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -512,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.advancementDataPlayer.b(this);
@@ -4956,10 +4956,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 05f2cc5904f196c70e8e83625810673f6110aba0..ef222cdfdfb49dcdcb0e3bf6f6cabc765be003cc 100644
+index cd13a09ace9341e6741956058c0faca16fe6ac16..6d6b9734292d2c8e2213865760569976c181a4eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2313,6 +2313,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2308,6 +2308,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                      this.server.getPluginManager().callEvent(event);
  
@@ -6350,10 +6350,10 @@ index 0000000000000000000000000000000000000000..9a9e46d7ee247f9e43ae5c697f10e466
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f1d28638b 100644
+index 744e6351c58e5aa4a0c668f2ff1adb76a3dc0822..a3b810556e306bc2be65c7811cfa7806d5752cfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1160,4 +1160,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1174,4 +1174,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isTicking();
      }
      // Paper end
@@ -6381,7 +6381,7 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
 +    // 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 9ff0f70154367b99317ed3927a97ec08c7e9e015..90c0033e31ad5e115568bc092d3515b5b99e965a 100644
+index a6d9212da2821d12449b0405dd360185388eefe5..6eece873dc948c89f8431a6f11e4a940bf6ca476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -527,6 +527,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0106-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0103-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server/0106-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0103-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server/0107-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0104-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0107-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0104-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0108-Entities-can-use-portals-configuration.patch b/patches/server/0105-Entities-can-use-portals-configuration.patch
similarity index 100%
rename from patches/server/0108-Entities-can-use-portals-configuration.patch
rename to patches/server/0105-Entities-can-use-portals-configuration.patch
diff --git a/patches/server/0109-LivingEntity-broadcastItemBreak.patch b/patches/server/0106-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0109-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0106-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0110-Customizable-wither-health-and-healing.patch b/patches/server/0107-Customizable-wither-health-and-healing.patch
similarity index 100%
rename from patches/server/0110-Customizable-wither-health-and-healing.patch
rename to patches/server/0107-Customizable-wither-health-and-healing.patch
diff --git a/patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0108-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 100%
rename from patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0108-Allow-toggling-special-MobSpawners-per-world.patch
diff --git a/patches/server/0112-Raid-cooldown-setting.patch b/patches/server/0109-Raid-cooldown-setting.patch
similarity index 100%
rename from patches/server/0112-Raid-cooldown-setting.patch
rename to patches/server/0109-Raid-cooldown-setting.patch
diff --git a/patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0110-Despawn-rate-config-options-per-projectile-type.patch
similarity index 100%
rename from patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0110-Despawn-rate-config-options-per-projectile-type.patch
diff --git a/patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0111-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0111-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0112-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0112-Persistent-TileEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0117-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0113-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0117-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0113-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0118-Flying-squids-Oh-my.patch b/patches/server/0114-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server/0118-Flying-squids-Oh-my.patch
rename to patches/server/0114-Flying-squids-Oh-my.patch
diff --git a/patches/server/0114-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0114-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
deleted file mode 100644
index b0118f91c..000000000
--- a/patches/server/0114-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Esophose <Esophose@users.noreply.github.com>
-Date: Thu, 27 Aug 2020 12:25:18 -0500
-Subject: [PATCH] PaperPR - Add hex color code support for console logging
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..2a0ada490b15b0c4939dd4304f86e01634fb1cfa 100644
---- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-@@ -1,17 +1,52 @@
- package com.destroystokyo.paper.console;
- 
-+import java.awt.Color;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import net.minecrell.terminalconsole.MinecraftFormattingConverter;
-+import net.minecrell.terminalconsole.TerminalConsoleAppender;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-+import org.apache.logging.log4j.util.PropertiesUtil;
-+import org.bukkit.ChatColor;
- import org.bukkit.craftbukkit.command.CraftConsoleCommandSender;
- 
- public class TerminalConsoleCommandSender extends CraftConsoleCommandSender {
- 
-     private static final Logger LOGGER = LogManager.getRootLogger();
-+    private static final char ANSI_ESC_CHAR = '\u001B';
-+    private static final String RGB_STRING = ANSI_ESC_CHAR + "[38;2;%d;%d;%dm";
-+    private static final String ANSI_RESET = ANSI_ESC_CHAR + "[m";
-+    private static final Pattern HEX_PATTERN = Pattern.compile("(?i)(" + ChatColor.COLOR_CHAR + "x(" + ChatColor.COLOR_CHAR + "[0-9a-f]){6})");
-+    private static final boolean keepFormatting = PropertiesUtil.getProperties().getBooleanProperty(MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY);
- 
-     @Override
-     public void sendRawMessage(String message) {
-         // TerminalConsoleAppender supports color codes directly in log messages
--        LOGGER.info(message);
-+        // However, we need to convert hex colors manually, as those do not get transformed
-+        LOGGER.info(hexMagicToAnsi(message));
-     }
- 
-+    private static String hexMagicToAnsi(String input) {
-+        // If formatting should be kept, just leave the input as-is
-+        if (keepFormatting || !net.pl3x.purpur.PurpurConfig.useHexColorsInConsole) // Purpur
-+            return input;
-+
-+        // If Ansi is not supported, just strip out any hex coloring
-+        if (!TerminalConsoleAppender.isAnsiSupported())
-+            return HEX_PATTERN.matcher(input).replaceAll("");
-+
-+        Matcher matcher = HEX_PATTERN.matcher(input);
-+        StringBuffer buffer = new StringBuffer();
-+        while (matcher.find()) {
-+            String hex = matcher.group().replace(String.valueOf(ChatColor.COLOR_CHAR), "").replace('x', '#');
-+            Color color = Color.decode(hex);
-+            String replacement = String.format(RGB_STRING, color.getRed(), color.getGreen(), color.getBlue());
-+            matcher.appendReplacement(buffer, replacement);
-+        }
-+        matcher.appendTail(buffer);
-+
-+        // We add the Ansi reset to the end of each message to prevent the color from carrying over to the next logged message
-+        return buffer.toString() + ANSI_RESET;
-+    }
- }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a5febd7671ae1818edb18955d5e8176303c92c93..966834c737c4f388f76fcc515f266f684de593b5 100644
---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -220,9 +220,11 @@ public class PurpurConfig {
- 
-     public static boolean loggerSuppressInitLegacyMaterialError = false;
-     public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
-+    public static boolean useHexColorsInConsole = true;
-     private static void loggerSettings() {
-         loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
-         loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
-+        useHexColorsInConsole = getBoolean("settings.logger.hex-color-support-in-console", useHexColorsInConsole);
-     }
- 
-     public static boolean tpsCatchup = true;
diff --git a/patches/server/0119-Infinity-bow-settings.patch b/patches/server/0115-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server/0119-Infinity-bow-settings.patch
rename to patches/server/0115-Infinity-bow-settings.patch
diff --git a/patches/server/0120-Stonecutter-damage.patch b/patches/server/0116-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0120-Stonecutter-damage.patch
rename to patches/server/0116-Stonecutter-damage.patch
diff --git a/patches/server/0121-Configurable-daylight-cycle.patch b/patches/server/0117-Configurable-daylight-cycle.patch
similarity index 100%
rename from patches/server/0121-Configurable-daylight-cycle.patch
rename to patches/server/0117-Configurable-daylight-cycle.patch
diff --git a/patches/server/0122-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0118-Allow-infinite-and-mending-enchantments-together.patch
similarity index 95%
rename from patches/server/0122-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0118-Allow-infinite-and-mending-enchantments-together.patch
index fbbe9361f..30dc5086f 100644
--- a/patches/server/0122-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0118-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,7 +17,7 @@ index 408cfa460920f74e0394ab27101ecb12cceb9c43..3d4e34f7070a48c436284ba7744a94ae
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 966834c737c4f388f76fcc515f266f684de593b5..47d323038914fd601e17499802bf3dae5f842d31 100644
+index a5febd7671ae1818edb18955d5e8176303c92c93..a20d7ac486a915fae2c6c7d42aa07d44f42438db 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -197,6 +197,16 @@ public class PurpurConfig {
diff --git a/patches/server/0123-Infinite-fuel-furnace.patch b/patches/server/0119-Infinite-fuel-furnace.patch
similarity index 100%
rename from patches/server/0123-Infinite-fuel-furnace.patch
rename to patches/server/0119-Infinite-fuel-furnace.patch
diff --git a/patches/server/0124-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0120-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0124-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0120-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0125-Add-tablist-suffix-option-for-afk.patch b/patches/server/0121-Add-tablist-suffix-option-for-afk.patch
similarity index 90%
rename from patches/server/0125-Add-tablist-suffix-option-for-afk.patch
rename to patches/server/0121-Add-tablist-suffix-option-for-afk.patch
index 05d6720c1..170b3eb06 100644
--- a/patches/server/0125-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/server/0121-Add-tablist-suffix-option-for-afk.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index efe04677f69f8c6eaff1bfa0cd377ad96f31ac1c..c8a4de0b45ea25a0c96dda90aa8d2400b32a4589 100644
+index f4d971448c91d2814055eea9f13426f1225c3e21..b3b88a1d9eab891a09c5ce64fc5e9440e1997dd0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1995,7 +1995,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1980,7 +1980,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          if (world.purpurConfig.idleTimeoutUpdateTabList) {
@@ -22,7 +22,7 @@ index efe04677f69f8c6eaff1bfa0cd377ad96f31ac1c..c8a4de0b45ea25a0c96dda90aa8d2400
  
          ((WorldServer) world).everyoneSleeping();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 47d323038914fd601e17499802bf3dae5f842d31..74c76b7f3e0992a90acec338a96077bf4f7afd2a 100644
+index a20d7ac486a915fae2c6c7d42aa07d44f42438db..767715963a79b06c8a0988b65bc589dc9c351138 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -135,12 +135,14 @@ public class PurpurConfig {
diff --git a/patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 100%
rename from patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
diff --git a/patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0123-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 100%
rename from patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0123-Add-adjustable-breeding-cooldown-to-config.patch
diff --git a/patches/server/0128-Make-animal-breeding-times-configurable.patch b/patches/server/0124-Make-animal-breeding-times-configurable.patch
similarity index 100%
rename from patches/server/0128-Make-animal-breeding-times-configurable.patch
rename to patches/server/0124-Make-animal-breeding-times-configurable.patch
diff --git a/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0125-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0125-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0126-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 100%
rename from patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0126-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
diff --git a/patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0127-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 100%
rename from patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server/0127-Add-twisting-and-weeping-vines-growth-rates.patch
diff --git a/patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0128-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 100%
rename from patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0128-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
diff --git a/patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0129-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 100%
rename from patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0129-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
diff --git a/patches/server/0134-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 96%
rename from patches/server/0134-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/server/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
index e774a7bf2..f2275519d 100644
--- a/patches/server/0134-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
@@ -33,7 +33,7 @@ index e6e180ea46529e80eeab95f550dee5f3f8198ba8..b6bfd8f5073ce481dfe2b1667ece42d3
                      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 90c0033e31ad5e115568bc092d3515b5b99e965a..d98fbec82ae9110974ca562edbd7e07090e35bb0 100644
+index 6eece873dc948c89f8431a6f11e4a940bf6ca476..3796cdb49329584fe8c753bf24e4b23f922de372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1073,7 +1073,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0135-Add-configurable-snowball-damage.patch b/patches/server/0131-Add-configurable-snowball-damage.patch
similarity index 100%
rename from patches/server/0135-Add-configurable-snowball-damage.patch
rename to patches/server/0131-Add-configurable-snowball-damage.patch
diff --git a/patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0132-Zombie-break-door-minimum-difficulty-option.patch
similarity index 100%
rename from patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch
rename to patches/server/0132-Zombie-break-door-minimum-difficulty-option.patch
diff --git a/patches/server/0137-Add-demo-command.patch b/patches/server/0133-Add-demo-command.patch
similarity index 98%
rename from patches/server/0137-Add-demo-command.patch
rename to patches/server/0133-Add-demo-command.patch
index 16d4ac026..11cbaa41b 100644
--- a/patches/server/0137-Add-demo-command.patch
+++ b/patches/server/0133-Add-demo-command.patch
@@ -30,7 +30,7 @@ index 08cbc787e2bf6587878bdeffa7248e5d23cdcf98..57d39ed441ec7be933f4fce48225f527
      public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7);
      public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 74c76b7f3e0992a90acec338a96077bf4f7afd2a..9294bfab12ef88690e359ff90551c5c615cdd3dd 100644
+index 767715963a79b06c8a0988b65bc589dc9c351138..fa03879f52f89988d1f43a6cab9e202c88ff6d8d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -136,6 +136,7 @@ public class PurpurConfig {
diff --git a/patches/server/0138-Left-handed-API.patch b/patches/server/0134-Left-handed-API.patch
similarity index 100%
rename from patches/server/0138-Left-handed-API.patch
rename to patches/server/0134-Left-handed-API.patch
diff --git a/patches/server/0139-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/server/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
similarity index 100%
rename from patches/server/0139-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
rename to patches/server/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
diff --git a/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0136-Changeable-Mob-Left-Handed-Chance.patch
similarity index 100%
rename from patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0136-Changeable-Mob-Left-Handed-Chance.patch
diff --git a/patches/server/0141-Add-boat-fall-damage-config.patch b/patches/server/0137-Add-boat-fall-damage-config.patch
similarity index 95%
rename from patches/server/0141-Add-boat-fall-damage-config.patch
rename to patches/server/0137-Add-boat-fall-damage-config.patch
index b2784db1e..bb5b3fa79 100644
--- a/patches/server/0141-Add-boat-fall-damage-config.patch
+++ b/patches/server/0137-Add-boat-fall-damage-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c8a4de0b45ea25a0c96dda90aa8d2400b32a4589..a95dbbdb1a3ce4f403eab793ec5d6820678a2116 100644
+index b3b88a1d9eab891a09c5ce64fc5e9440e1997dd0..d9565c8a33afbaaec66672d888f45dfa63985a2e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1031,7 +1031,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1011,7 +1011,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {
diff --git a/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0138-Config-migration-disable-saving-projectiles-to-disk-.patch
similarity index 97%
rename from patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch
rename to patches/server/0138-Config-migration-disable-saving-projectiles-to-disk-.patch
index 01814cd5f..a3bd742ac 100644
--- a/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch
+++ b/patches/server/0138-Config-migration-disable-saving-projectiles-to-disk-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk ->
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9294bfab12ef88690e359ff90551c5c615cdd3dd..e928716d7a2dcb390507b746763e6f7eaae241b5 100644
+index fa03879f52f89988d1f43a6cab9e202c88ff6d8d..d25d2e43c2dc3588b98b1d76f84ab10c957f2104 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
diff --git a/patches/server/0143-Snow-Golem-rate-of-fire-config.patch b/patches/server/0139-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server/0143-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0139-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server/0144-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0144-PaperPR-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0145-EMC-Configurable-disable-give-dropping.patch b/patches/server/0141-EMC-Configurable-disable-give-dropping.patch
similarity index 95%
rename from patches/server/0145-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0141-EMC-Configurable-disable-give-dropping.patch
index a43213c4e..f96044a63 100644
--- a/patches/server/0145-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0141-EMC-Configurable-disable-give-dropping.patch
@@ -20,7 +20,7 @@ index 1d22c45af884a917e77e02c272fcbae74794200c..7bf90f27fdc48440ef229cca0e100d2c
                      itemstack.setCount(1);
                      entityitem = entityplayer.drop(itemstack, false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e928716d7a2dcb390507b746763e6f7eaae241b5..7aee1687571010da55e8bb776ec1c658748e979a 100644
+index d25d2e43c2dc3588b98b1d76f84ab10c957f2104..12196850591679cae87575ad25d4d061af65848b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -191,6 +191,11 @@ public class PurpurConfig {
diff --git a/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0142-Config-migration-climbing-should-not-bypass-cramming.patch
similarity index 96%
rename from patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch
rename to patches/server/0142-Config-migration-climbing-should-not-bypass-cramming.patch
index c42fd13e7..c82fb50c7 100644
--- a/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch
+++ b/patches/server/0142-Config-migration-climbing-should-not-bypass-cramming.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7aee1687571010da55e8bb776ec1c658748e979a..645213cacb6061f84da7a1c9d6f2fa94670346ff 100644
+index 12196850591679cae87575ad25d4d061af65848b..5d75481660d5e11abe263f2a6343b87c75cca090 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -144,6 +144,17 @@ public class PurpurConfig {
diff --git a/patches/server/0147-Lobotomize-stuck-villagers.patch b/patches/server/0143-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/server/0147-Lobotomize-stuck-villagers.patch
rename to patches/server/0143-Lobotomize-stuck-villagers.patch
diff --git a/patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0144-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0144-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0145-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0145-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server/0150-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
similarity index 88%
rename from patches/server/0150-Spread-out-and-optimise-player-list-ticks.patch
rename to patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
index 6ac4516ec..f5aeb8a9c 100644
--- a/patches/server/0150-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Spread out and optimise player list ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 726e3292318f6a0de474f68fe30da4a954c7600a..58a184c518c557b7e4cfeebba9e4a7a9fbaf8c85 100644
+index 3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898..381595db593fdddb195a07d1352ff514ac281c43 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -71,7 +71,7 @@ public abstract class PlayerList {
+@@ -73,7 +73,7 @@ public abstract class PlayerList {
      private int viewDistance;
      private EnumGamemode u;
      private boolean v;
@@ -17,7 +17,7 @@ index 726e3292318f6a0de474f68fe30da4a954c7600a..58a184c518c557b7e4cfeebba9e4a7a9
  
      // CraftBukkit start
      private CraftServer cserver;
-@@ -929,22 +929,23 @@ public abstract class PlayerList {
+@@ -931,22 +931,23 @@ public abstract class PlayerList {
      }
  
      public void tick() {
@@ -56,10 +56,10 @@ index 726e3292318f6a0de474f68fe30da4a954c7600a..58a184c518c557b7e4cfeebba9e4a7a9
  
      public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 62ef7bb712e91fed150bf9c16c11635a9aaaab67..16fdd444a8064df688b1760760d584b36a700957 100644
+index bae2a248349e07718e3b4668691ed3c65736f4ff..22cc108b5727c07db31aa0d0b3af4717b92a316b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1381,7 +1381,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1451,7 +1451,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(Player player) {
diff --git a/patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0147-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 100%
rename from patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0147-Configurable-chance-for-wolves-to-spawn-rabid.patch
diff --git a/patches/server/0152-Configurable-default-wolf-collar-color.patch b/patches/server/0148-Configurable-default-wolf-collar-color.patch
similarity index 100%
rename from patches/server/0152-Configurable-default-wolf-collar-color.patch
rename to patches/server/0148-Configurable-default-wolf-collar-color.patch
diff --git a/patches/server/0153-Configurable-entity-base-attributes.patch b/patches/server/0149-Configurable-entity-base-attributes.patch
similarity index 100%
rename from patches/server/0153-Configurable-entity-base-attributes.patch
rename to patches/server/0149-Configurable-entity-base-attributes.patch
diff --git a/patches/server/0154-Phantom-flames-on-swoop.patch b/patches/server/0150-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server/0154-Phantom-flames-on-swoop.patch
rename to patches/server/0150-Phantom-flames-on-swoop.patch
diff --git a/patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0151-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0151-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server/0156-Implement-TPSBar.patch b/patches/server/0152-Implement-TPSBar.patch
similarity index 98%
rename from patches/server/0156-Implement-TPSBar.patch
rename to patches/server/0152-Implement-TPSBar.patch
index 07f249107..9cf2096be 100644
--- a/patches/server/0156-Implement-TPSBar.patch
+++ b/patches/server/0152-Implement-TPSBar.patch
@@ -37,10 +37,10 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
          this.isRestarting = isRestarting;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 58a184c518c557b7e4cfeebba9e4a7a9fbaf8c85..7db99b6639a0afdd1f68539f6c6a6f48275e5b6b 100644
+index 381595db593fdddb195a07d1352ff514ac281c43..e765d0c7ea5ee030ac718ebd7572e1a6719aa84c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -514,6 +514,8 @@ public abstract class PlayerList {
+@@ -516,6 +516,8 @@ public abstract class PlayerList {
          if (entityplayer.didPlayerJoinEvent) cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
diff --git a/patches/server/0157-Striders-give-saddle-back.patch b/patches/server/0153-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server/0157-Striders-give-saddle-back.patch
rename to patches/server/0153-Striders-give-saddle-back.patch
diff --git a/patches/server/0158-PlayerBookTooLargeEvent.patch b/patches/server/0154-PlayerBookTooLargeEvent.patch
similarity index 96%
rename from patches/server/0158-PlayerBookTooLargeEvent.patch
rename to patches/server/0154-PlayerBookTooLargeEvent.patch
index 4a946df53..644e8a0ee 100644
--- a/patches/server/0158-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0154-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef222cdfdfb49dcdcb0e3bf6f6cabc765be003cc..95c1ba7241069ad291c2acef6972937ac7c4c7c7 100644
+index 6d6b9734292d2c8e2213865760569976c181a4eb..024f5769035e978c2e7749526329a78a70ae7887 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -966,6 +966,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0155-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0155-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/server/0160-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0160-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0161-Add-MC-4-fix-back.patch b/patches/server/0157-Add-MC-4-fix-back.patch
similarity index 100%
rename from patches/server/0161-Add-MC-4-fix-back.patch
rename to patches/server/0157-Add-MC-4-fix-back.patch
diff --git a/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0158-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 100%
rename from patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0158-Add-mobGriefing-bypass-to-everything-affected.patch
diff --git a/patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0159-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0159-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0164-Add-EntityTeleportHinderedEvent.patch b/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
similarity index 96%
rename from patches/server/0164-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0160-Add-EntityTeleportHinderedEvent.patch
index d0bfea078..17e051a98 100644
--- a/patches/server/0164-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
@@ -108,10 +108,10 @@ index 2b25d505a5b5d8799177beacfaa9a5bcddb939ef..31d011ad08b2756fb236099cb92cd37b
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b56ca054b37f5887e13b481baad8132f1d28638b..eb0ce05d25ba33626d2dd3e3380d805c560bfe58 100644
+index a3b810556e306bc2be65c7811cfa7806d5752cfa..f96c41fc8788ee7b674c18cc0fa692df9cee1939 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -521,6 +521,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -522,6 +522,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          location.checkFinite();
  
          if (entity.isVehicle() || entity.dead) {
@@ -123,7 +123,7 @@ index b56ca054b37f5887e13b481baad8132f1d28638b..eb0ce05d25ba33626d2dd3e3380d805c
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 16fdd444a8064df688b1760760d584b36a700957..77caf8d52cc0cafb99948787e72a0fd09743aa00 100644
+index 22cc108b5727c07db31aa0d0b3af4717b92a316b..945687b295cbf3c26869fede4ff96d3352a96b42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -115,6 +115,7 @@ import org.bukkit.entity.EntityType;
@@ -134,7 +134,7 @@ index 16fdd444a8064df688b1760760d584b36a700957..77caf8d52cc0cafb99948787e72a0fd0
  import org.bukkit.event.player.PlayerUnregisterChannelEvent;
  import org.bukkit.inventory.InventoryView.Property;
  import org.bukkit.inventory.ItemStack;
-@@ -790,6 +791,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -860,6 +861,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {
diff --git a/patches/server/0165-Add-StructureGenerateEvent.patch b/patches/server/0161-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0165-Add-StructureGenerateEvent.patch
rename to patches/server/0161-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0166-Farmland-trampling-changes.patch b/patches/server/0162-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0166-Farmland-trampling-changes.patch
rename to patches/server/0162-Farmland-trampling-changes.patch
diff --git a/patches/server/0167-Movement-options-for-armour-stands.patch b/patches/server/0163-Movement-options-for-armour-stands.patch
similarity index 100%
rename from patches/server/0167-Movement-options-for-armour-stands.patch
rename to patches/server/0163-Movement-options-for-armour-stands.patch
diff --git a/patches/server/0168-Fix-stuck-in-portals.patch b/patches/server/0164-Fix-stuck-in-portals.patch
similarity index 94%
rename from patches/server/0168-Fix-stuck-in-portals.patch
rename to patches/server/0164-Fix-stuck-in-portals.patch
index a017201d8..666c7fd20 100644
--- a/patches/server/0168-Fix-stuck-in-portals.patch
+++ b/patches/server/0164-Fix-stuck-in-portals.patch
@@ -25,10 +25,10 @@ index 1c407f3050ba34afd33ce66b6ef8ef682010091a..a2ba87dac005572d2617b6fe2c92f698
  
              this.inPortal = true;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a95dbbdb1a3ce4f403eab793ec5d6820678a2116..ebff0ef7f9bf38562265fc2cd4f81f59fda2278d 100644
+index d9565c8a33afbaaec66672d888f45dfa63985a2e..d9206191e653df877e327b6538eaa321c48be789 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1181,6 +1181,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1161,6 +1161,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  playerlist.d(this);
                  worldserver1.removePlayer(this);
                  this.dead = false;
diff --git a/patches/server/0169-Fix-PlayerEditBookEvent-not-saving-new-book.patch b/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch
similarity index 91%
rename from patches/server/0169-Fix-PlayerEditBookEvent-not-saving-new-book.patch
rename to patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch
index 3c4c39f7b..63927d4db 100644
--- a/patches/server/0169-Fix-PlayerEditBookEvent-not-saving-new-book.patch
+++ b/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerEditBookEvent not saving new book
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 95c1ba7241069ad291c2acef6972937ac7c4c7c7..1471785da53a18edf31a20212f3cc6c19de92822 100644
+index 024f5769035e978c2e7749526329a78a70ae7887..2e9fe1a2390eb109d3737797be777f6e04210eff 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1061,7 +1061,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch b/patches/server/0166-Config-to-use-infinity-bows-without-arrows.patch
similarity index 100%
rename from patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch
rename to patches/server/0166-Config-to-use-infinity-bows-without-arrows.patch
diff --git a/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0167-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0167-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0172-Config-to-always-tame-in-Creative.patch b/patches/server/0168-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0172-Config-to-always-tame-in-Creative.patch
rename to patches/server/0168-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0173-End-crystal-explosion-options.patch b/patches/server/0169-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0173-End-crystal-explosion-options.patch
rename to patches/server/0169-End-crystal-explosion-options.patch
diff --git a/patches/server/0174-Add-unsafe-Entity-serialization-API.patch b/patches/server/0170-Add-unsafe-Entity-serialization-API.patch
similarity index 97%
rename from patches/server/0174-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0170-Add-unsafe-Entity-serialization-API.patch
index 9df3bd4c5..a20c6d456 100644
--- a/patches/server/0174-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server/0170-Add-unsafe-Entity-serialization-API.patch
@@ -29,10 +29,10 @@ index 73cf30786d2b4d6f87be5f9aad87c3edb594d18e..f5fb3b3c08a05bede7ed1141c018bd0d
          return SystemUtils.a(a(nbttagcompound).map((entitytypes) -> {
              return entitytypes.a(world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index eb0ce05d25ba33626d2dd3e3380d805c560bfe58..7c30064237bd58673de710915b1a9437335a3e8a 100644
+index f96c41fc8788ee7b674c18cc0fa692df9cee1939..63a419b4eed399a50ba9dde515c1c13da4e720c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1185,5 +1185,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1199,5 +1199,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isRidableInWater() {
          return getHandle().isRidableInWater();
      }
diff --git a/patches/server/0175-Add-ghast-allow-griefing-option.patch b/patches/server/0171-Add-ghast-allow-griefing-option.patch
similarity index 100%
rename from patches/server/0175-Add-ghast-allow-griefing-option.patch
rename to patches/server/0171-Add-ghast-allow-griefing-option.patch
diff --git a/patches/server/0176-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0172-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0176-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0172-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch