From 1d3f71029710c47a4d6b889264d70f53ec8b7e93 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Fri, 30 Apr 2021 16:15:10 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
840e72091 [CI-SKIP] [Auto] Rebuild Patches
a33232d4a Add beacon activation and deactivation events (#5121)
bc7ea673a Add internal channel initialization listeners (#5557)
b28ad17ac Check for world change in MoveEvent API methods
3095c7592 [Auto] Updated Upstream (CraftBukkit)
f56989c97 Add RespawnFlags to PlayerRespawnEvent (#5533)
7579c2667 Add more API to PlayerMoveEvent (#5553)
---
 Paper                                         |   2 +-
 .../server/0001-Tuinity-Server-Changes.patch  |   8 +-
 .../0003-Multithreaded-entity-tracking.patch  | 463 ------------------
 ...{0004-Rebrand.patch => 0003-Rebrand.patch} |   0
 ...s.patch => 0004-Purpur-config-files.patch} |   0
 ...s-stuff.patch => 0005-Timings-stuff.patch} |   0
 ...0006-Barrels-and-enderchests-6-rows.patch} |   0
 ...t-API.patch => 0007-Advancement-API.patch} |   0
 ...9-Llama-API.patch => 0008-Llama-API.patch} |   0
 ...{0010-AFK-API.patch => 0009-AFK-API.patch} |   4 +-
 ...atch => 0010-Bring-back-server-name.patch} |   0
 ...> 0011-Configurable-server-mod-name.patch} |   0
 ... 0012-LivingEntity-safeFallDistance.patch} |   0
 ...old.patch => 0013-Lagging-threshold.patch} |   0
 ...h => 0014-ItemFactory-getMonsterEgg.patch} |   0
 ...15-PlayerSetSpawnerTypeWithEggEvent.patch} |   0
 ...ch => 0016-EMC-MonsterEggSpawnEvent.patch} |   0
 ...ch => 0017-Player-invulnerabilities.patch} |   6 +-
 ...9-Anvil-API.patch => 0018-Anvil-API.patch} |   0
 ...9-Configurable-villager-brain-ticks.patch} |   0
 ...0020-Alternative-Keepalive-Handling.patch} |   2 +-
 ...s.patch => 0021-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
 ...> 0025-Disable-outdated-build-check.patch} |   0
 ...gs.patch => 0026-Giants-AI-settings.patch} |   0
 ...tch => 0027-Illusioners-AI-settings.patch} |   0
 ...> 0028-Zombie-horse-naturally-spawn.patch} |   0
 ...029-Charged-creeper-naturally-spawn.patch} |   0
 ...it-naturally-spawn-toast-and-killer.patch} |   0
 ...er-showing-in-ping-before-server-fu.patch} |   0
 ...patch => 0032-Make-Iron-Golems-Swim.patch} |   0
 ...33-Dont-send-useless-entity-packets.patch} |   6 +-
 ...atch => 0034-Tulips-change-fox-type.patch} |   0
 ...patch => 0035-Breedable-Polar-Bears.patch} |   0
 ...atch => 0036-Chickens-can-retaliate.patch} |   0
 ...ption-to-set-armorstand-step-height.patch} |   0
 ....patch => 0038-Cat-spawning-options.patch} |   0
 ...n-black-cats-spawning-in-swamp-huts.patch} |   0
 ...ms.patch => 0040-Cows-eat-mushrooms.patch} |   0
 ...ow-rotation-when-shearing-mooshroom.patch} |   0
 ...patch => 0042-Pigs-give-saddle-back.patch} |   0
 ...3-Snowman-drop-and-put-back-pumpkin.patch} |   0
 ...4-Ender-dragon-always-drop-full-exp.patch} |   0
 ... 0045-Signs-editable-on-right-click.patch} |   0
 ...tch => 0046-Signs-allow-color-codes.patch} |   4 +-
 ...oisten-from-water-directly-under-it.patch} |   0
 ...Minecart-settings-and-WASD-controls.patch} |   2 +-
 ...ble-loot-drops-on-death-by-cramming.patch} |   0
 ...50-Players-should-not-cram-to-death.patch} |   2 +-
 ...tion-to-toggle-milk-curing-bad-omen.patch} |   0
 ...ould-check-if-entity-can-use-portal.patch} |   0
 ...053-Fix-the-dead-lagging-the-server.patch} |   0
 ...Skip-events-if-there-s-no-listeners.patch} |   0
 ... 0055-Add-permission-for-F3-N-debug.patch} |   2 +-
 ...skeleton-takes-wither-damage-option.patch} |   0
 ...ch => 0057-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
 ...062-Villagers-follow-emerald-blocks.patch} |   0
 ...ch => 0063-Allow-leashing-villagers.patch} |   0
 ...rable-search-radius-for-villagers-t.patch} |   0
 ...tch => 0065-Implement-infinite-lava.patch} |   0
 ...6-Make-lava-flow-speed-configurable.patch} |   0
 ...dd-player-death-exp-control-options.patch} |   0
 ...=> 0068-Add-canSaveToDisk-to-Entity.patch} |   0
 ...069-Configurable-void-damage-height.patch} |   0
 ...spenser-curse-of-binding-protection.patch} |   0
 ...-for-boats-to-eject-players-on-land.patch} |   0
 ... 0072-Add-obfhelpers-for-plugin-use.patch} |   0
 ...-mends-most-damages-equipment-first.patch} |   0
 ...074-Add-5-second-tps-average-in-tps.patch} |   0
 ...h => 0075-Implement-elytra-settings.patch} |   0
 ...atch => 0076-Item-entity-immunities.patch} |  12 +-
 ...mand.patch => 0077-Add-ping-command.patch} |   0
 ...=> 0078-Configurable-jockey-options.patch} |   0
 ...d-to-crystals-and-crystals-shoot-ph.patch} |   0
 ...> 0080-Add-phantom-spawning-options.patch} |   0
 ...081-Implement-bed-explosion-options.patch} |   0
 ...nt-respawn-anchor-explosion-options.patch} |   0
 ...Add-allow-water-in-end-world-option.patch} |   0
 ... => 0084-Allow-color-codes-in-books.patch} |   2 +-
 ...espan.patch => 0085-Entity-lifespan.patch} |   2 +-
 ...eport-to-spawn-if-outside-world-bor.patch} |   2 +-
 ...ty.patch => 0087-Squid-EAR-immunity.patch} |   0
 ...=> 0088-Configurable-end-spike-seed.patch} |   0
 ...h => 0089-Configurable-dungeon-seed.patch} |   0
 ...atch => 0090-Phantoms-burn-in-light.patch} |   0
 ...0091-Configurable-villager-breeding.patch} |   0
 ... 0092-Redstone-deactivates-spawners.patch} |   0
 ...ch => 0093-Totems-work-in-inventory.patch} |   0
 ...tch => 0094-Populator-seed-controls.patch} |   0
 ...-Add-vindicator-johnny-spawn-chance.patch} |   0
 ...able-mushroom-and-note-block-update.patch} |   0
 ...0097-Dispensers-place-anvils-option.patch} |   0
 ...rs.patch => 0098-Allow-anvil-colors.patch} |   0
 ... 0099-Add-no-random-tick-block-list.patch} |   0
 ...-disable-dolphin-treasure-searching.patch} |   0
 ...patch => 0101-Short-enderman-height.patch} |   0
 ...top-squids-floating-on-top-of-water.patch} |   0
 ...104-Ridables.patch => 0103-Ridables.patch} |   4 +-
 ...-height-for-nether-surface-builders.patch} |   0
 ...ng-obsidian-valid-for-portal-frames.patch} |   0
 ...ities-can-use-portals-configuration.patch} |   0
 ...107-LivingEntity-broadcastItemBreak.patch} |   0
 ...tomizable-wither-health-and-healing.patch} |   0
 ...gling-special-MobSpawners-per-world.patch} |   0
 ...patch => 0110-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 => 0115-Flying-squids-Oh-my.patch} |   0
 ...patch => 0116-Infinity-bow-settings.patch} |   0
 ...ge.patch => 0117-Stonecutter-damage.patch} |   0
 ...=> 0118-Configurable-daylight-cycle.patch} |   0
 ...e-and-mending-enchantments-together.patch} |   0
 ...patch => 0120-Infinite-fuel-furnace.patch} |   0
 ...ws-should-not-reset-despawn-counter.patch} |   0
 ...2-Add-tablist-suffix-option-for-afk.patch} |   2 +-
 ...e-add-farmland-mechanics-from-Alpha.patch} |   0
 ...ustable-breeding-cooldown-to-config.patch} |   0
 ...-entity-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} |   0
 ...32-Add-configurable-snowball-damage.patch} |   0
 ...reak-door-minimum-difficulty-option.patch} |   0
 ...mand.patch => 0134-Add-demo-command.patch} |   0
 ...d-API.patch => 0135-Left-handed-API.patch} |   0
 ...i-Fix-ProtocolLib-issues-on-Java-15.patch} |   0
 ...7-Changeable-Mob-Left-Handed-Chance.patch} |   0
 ...=> 0138-Add-boat-fall-damage-config.patch} |   2 +-
 ...disable-saving-projectiles-to-disk-.patch} |   0
 ...0140-Snow-Golem-rate-of-fire-config.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...-Configurable-disable-give-dropping.patch} |   0
 ...climbing-should-not-bypass-cramming.patch} |   0
 ... => 0144-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} |   2 +-
 ...le-chance-for-wolves-to-spawn-rabid.patch} |   0
 ...figurable-default-wolf-collar-color.patch} |   0
 ...Configurable-entity-base-attributes.patch} |   0
 ...tch => 0151-Phantom-flames-on-swoop.patch} |   0
 ...-to-open-even-with-a-solid-block-on.patch} |   0
 ...SBar.patch => 0153-Implement-TPSBar.patch} |   2 +-
 ...h => 0154-Striders-give-saddle-back.patch} |   0
 ...tch => 0155-PlayerBookTooLargeEvent.patch} |   2 +-
 ...herite-armor-grants-fire-resistance.patch} |   0
 ...157-Fix-rotating-UP-DOWN-CW-and-CCW.patch} |   0
 ...ack.patch => 0158-Add-MC-4-fix-back.patch} |   0
 ...efing-bypass-to-everything-affected.patch} |   0
 ...llow-Note-Block-sounds-when-blocked.patch} |   0
 ...161-Add-EntityTeleportHinderedEvent.patch} |   0
 ... => 0162-Add-StructureGenerateEvent.patch} |   0
 ... => 0163-Farmland-trampling-changes.patch} |   0
 ...4-Movement-options-for-armor-stands.patch} |   0
 ....patch => 0165-Fix-stuck-in-portals.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} |   0
 ...171-Add-ghast-allow-griefing-option.patch} |   0
 ...ther-Ender-Dragon-can-ride-vehicles.patch} |   0
 ...atch => 0173-Dont-run-with-scissors.patch} |   2 +-
 ...nch-Man.patch => 0174-One-Punch-Man.patch} |   0
 ...175-Add-config-for-snow-on-blue-ice.patch} |   0
 ...r-Pearl-cooldown-damage-and-Endermi.patch} |   0
 ...to-ignore-nearby-mobs-when-sleeping.patch} |   2 +-
 ...nderman-to-aggro-spawned-Endermites.patch} |   0
 ...Dragon-Head-wearers-and-stare-aggro.patch} |   0
 ...> 0180-Re-enable-timings-by-default.patch} |   0
 ...ig.patch => 0181-Tick-fluids-config.patch} |   0
 ...82-Config-to-disable-Llama-caravans.patch} |   0
 ...g-to-make-Creepers-explode-on-death.patch} |   0
 ...rable-ravager-griefable-blocks-list.patch} |   0
 ...185-Sneak-to-bulk-process-composter.patch} |   0
 ...h => 0186-Config-for-skipping-night.patch} |   0
 ...187-Add-config-for-villager-trading.patch} |   0
 ...=> 0188-Allow-infinity-on-crossbows.patch} |   0
 ...ngs.patch => 0189-Drowning-Settings.patch} |   0
 ...reak-individual-slabs-when-sneaking.patch} |   0
 ...to-disable-hostile-mob-spawn-on-ice.patch} |   0
 ...g-to-show-Armor-Stand-arms-on-spawn.patch} |   0
 ...tion-to-make-doors-require-redstone.patch} |   0
 ...Config-to-allow-for-unsafe-enchants.patch} |   0
 ...0195-Configurable-sponge-absorption.patch} |   0
 ...ch => 0196-Projectile-offset-config.patch} |   0
 ...or-powered-rail-activation-distance.patch} |   0
 ...> 0198-Piglin-portal-spawn-modifier.patch} |   0
 ...Config-to-change-max-number-of-bees.patch} |   0
 ...le-damage-settings-for-magma-blocks.patch} |   0
 ...-Config-for-wither-explosion-radius.patch} |   0
 ...d.patch => 0202-Add-credits-command.patch} |   0
 ... => 0203-Gamemode-extra-permissions.patch} |   0
 204 files changed, 38 insertions(+), 501 deletions(-)
 delete mode 100644 patches/server/0003-Multithreaded-entity-tracking.patch
 rename patches/server/{0004-Rebrand.patch => 0003-Rebrand.patch} (100%)
 rename patches/server/{0005-Purpur-config-files.patch => 0004-Purpur-config-files.patch} (100%)
 rename patches/server/{0006-Timings-stuff.patch => 0005-Timings-stuff.patch} (100%)
 rename patches/server/{0007-Barrels-and-enderchests-6-rows.patch => 0006-Barrels-and-enderchests-6-rows.patch} (100%)
 rename patches/server/{0008-Advancement-API.patch => 0007-Advancement-API.patch} (100%)
 rename patches/server/{0009-Llama-API.patch => 0008-Llama-API.patch} (100%)
 rename patches/server/{0010-AFK-API.patch => 0009-AFK-API.patch} (98%)
 rename patches/server/{0011-Bring-back-server-name.patch => 0010-Bring-back-server-name.patch} (100%)
 rename patches/server/{0012-Configurable-server-mod-name.patch => 0011-Configurable-server-mod-name.patch} (100%)
 rename patches/server/{0013-LivingEntity-safeFallDistance.patch => 0012-LivingEntity-safeFallDistance.patch} (100%)
 rename patches/server/{0014-Lagging-threshold.patch => 0013-Lagging-threshold.patch} (100%)
 rename patches/server/{0015-ItemFactory-getMonsterEgg.patch => 0014-ItemFactory-getMonsterEgg.patch} (100%)
 rename patches/server/{0016-PlayerSetSpawnerTypeWithEggEvent.patch => 0015-PlayerSetSpawnerTypeWithEggEvent.patch} (100%)
 rename patches/server/{0017-EMC-MonsterEggSpawnEvent.patch => 0016-EMC-MonsterEggSpawnEvent.patch} (100%)
 rename patches/server/{0018-Player-invulnerabilities.patch => 0017-Player-invulnerabilities.patch} (95%)
 rename patches/server/{0019-Anvil-API.patch => 0018-Anvil-API.patch} (100%)
 rename patches/server/{0020-Configurable-villager-brain-ticks.patch => 0019-Configurable-villager-brain-ticks.patch} (100%)
 rename patches/server/{0021-Alternative-Keepalive-Handling.patch => 0020-Alternative-Keepalive-Handling.patch} (98%)
 rename patches/server/{0022-Silk-touch-spawners.patch => 0021-Silk-touch-spawners.patch} (100%)
 rename patches/server/{0023-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0022-MC-168772-Fix-Add-turtle-egg-block-options.patch} (100%)
 rename patches/server/{0024-Fix-vanilla-command-permission-handler.patch => 0023-Fix-vanilla-command-permission-handler.patch} (100%)
 rename patches/server/{0025-Logger-settings-suppressing-pointless-logs.patch => 0024-Logger-settings-suppressing-pointless-logs.patch} (100%)
 rename patches/server/{0026-Disable-outdated-build-check.patch => 0025-Disable-outdated-build-check.patch} (100%)
 rename patches/server/{0027-Giants-AI-settings.patch => 0026-Giants-AI-settings.patch} (100%)
 rename patches/server/{0028-Illusioners-AI-settings.patch => 0027-Illusioners-AI-settings.patch} (100%)
 rename patches/server/{0029-Zombie-horse-naturally-spawn.patch => 0028-Zombie-horse-naturally-spawn.patch} (100%)
 rename patches/server/{0030-Charged-creeper-naturally-spawn.patch => 0029-Charged-creeper-naturally-spawn.patch} (100%)
 rename patches/server/{0031-Rabbit-naturally-spawn-toast-and-killer.patch => 0030-Rabbit-naturally-spawn-toast-and-killer.patch} (100%)
 rename patches/server/{0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%)
 rename patches/server/{0033-Make-Iron-Golems-Swim.patch => 0032-Make-Iron-Golems-Swim.patch} (100%)
 rename patches/server/{0034-Dont-send-useless-entity-packets.patch => 0033-Dont-send-useless-entity-packets.patch} (95%)
 rename patches/server/{0035-Tulips-change-fox-type.patch => 0034-Tulips-change-fox-type.patch} (100%)
 rename patches/server/{0036-Breedable-Polar-Bears.patch => 0035-Breedable-Polar-Bears.patch} (100%)
 rename patches/server/{0037-Chickens-can-retaliate.patch => 0036-Chickens-can-retaliate.patch} (100%)
 rename patches/server/{0038-Add-option-to-set-armorstand-step-height.patch => 0037-Add-option-to-set-armorstand-step-height.patch} (100%)
 rename patches/server/{0039-Cat-spawning-options.patch => 0038-Cat-spawning-options.patch} (100%)
 rename patches/server/{0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%)
 rename patches/server/{0041-Cows-eat-mushrooms.patch => 0040-Cows-eat-mushrooms.patch} (100%)
 rename patches/server/{0042-Fix-cow-rotation-when-shearing-mooshroom.patch => 0041-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0043-Pigs-give-saddle-back.patch => 0042-Pigs-give-saddle-back.patch} (100%)
 rename patches/server/{0044-Snowman-drop-and-put-back-pumpkin.patch => 0043-Snowman-drop-and-put-back-pumpkin.patch} (100%)
 rename patches/server/{0045-Ender-dragon-always-drop-full-exp.patch => 0044-Ender-dragon-always-drop-full-exp.patch} (100%)
 rename patches/server/{0046-Signs-editable-on-right-click.patch => 0045-Signs-editable-on-right-click.patch} (100%)
 rename patches/server/{0047-Signs-allow-color-codes.patch => 0046-Signs-allow-color-codes.patch} (96%)
 rename patches/server/{0048-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0047-Allow-soil-to-moisten-from-water-directly-under-it.patch} (100%)
 rename patches/server/{0049-Minecart-settings-and-WASD-controls.patch => 0048-Minecart-settings-and-WASD-controls.patch} (99%)
 rename patches/server/{0050-Disable-loot-drops-on-death-by-cramming.patch => 0049-Disable-loot-drops-on-death-by-cramming.patch} (100%)
 rename patches/server/{0051-Players-should-not-cram-to-death.patch => 0050-Players-should-not-cram-to-death.patch} (91%)
 rename patches/server/{0052-Option-to-toggle-milk-curing-bad-omen.patch => 0051-Option-to-toggle-milk-curing-bad-omen.patch} (100%)
 rename patches/server/{0053-End-gateway-should-check-if-entity-can-use-portal.patch => 0052-End-gateway-should-check-if-entity-can-use-portal.patch} (100%)
 rename patches/server/{0054-Fix-the-dead-lagging-the-server.patch => 0053-Fix-the-dead-lagging-the-server.patch} (100%)
 rename patches/server/{0055-Skip-events-if-there-s-no-listeners.patch => 0054-Skip-events-if-there-s-no-listeners.patch} (100%)
 rename patches/server/{0056-Add-permission-for-F3-N-debug.patch => 0055-Add-permission-for-F3-N-debug.patch} (89%)
 rename patches/server/{0057-Add-wither-skeleton-takes-wither-damage-option.patch => 0056-Add-wither-skeleton-takes-wither-damage-option.patch} (100%)
 rename patches/server/{0058-Configurable-TPS-Catchup.patch => 0057-Configurable-TPS-Catchup.patch} (100%)
 rename patches/server/{0059-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (100%)
 rename patches/server/{0060-Add-enderman-and-creeper-griefing-controls.patch => 0059-Add-enderman-and-creeper-griefing-controls.patch} (100%)
 rename patches/server/{0061-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (100%)
 rename patches/server/{0062-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (100%)
 rename patches/server/{0063-Villagers-follow-emerald-blocks.patch => 0062-Villagers-follow-emerald-blocks.patch} (100%)
 rename patches/server/{0064-Allow-leashing-villagers.patch => 0063-Allow-leashing-villagers.patch} (100%)
 rename patches/server/{0065-Implement-configurable-search-radius-for-villagers-t.patch => 0064-Implement-configurable-search-radius-for-villagers-t.patch} (100%)
 rename patches/server/{0066-Implement-infinite-lava.patch => 0065-Implement-infinite-lava.patch} (100%)
 rename patches/server/{0067-Make-lava-flow-speed-configurable.patch => 0066-Make-lava-flow-speed-configurable.patch} (100%)
 rename patches/server/{0068-Add-player-death-exp-control-options.patch => 0067-Add-player-death-exp-control-options.patch} (100%)
 rename patches/server/{0069-Add-canSaveToDisk-to-Entity.patch => 0068-Add-canSaveToDisk-to-Entity.patch} (100%)
 rename patches/server/{0070-Configurable-void-damage-height.patch => 0069-Configurable-void-damage-height.patch} (100%)
 rename patches/server/{0071-Dispenser-curse-of-binding-protection.patch => 0070-Dispenser-curse-of-binding-protection.patch} (100%)
 rename patches/server/{0072-Add-option-for-boats-to-eject-players-on-land.patch => 0071-Add-option-for-boats-to-eject-players-on-land.patch} (100%)
 rename patches/server/{0073-Add-obfhelpers-for-plugin-use.patch => 0072-Add-obfhelpers-for-plugin-use.patch} (100%)
 rename patches/server/{0074-Mending-mends-most-damages-equipment-first.patch => 0073-Mending-mends-most-damages-equipment-first.patch} (100%)
 rename patches/server/{0075-Add-5-second-tps-average-in-tps.patch => 0074-Add-5-second-tps-average-in-tps.patch} (100%)
 rename patches/server/{0076-Implement-elytra-settings.patch => 0075-Implement-elytra-settings.patch} (100%)
 rename patches/server/{0077-Item-entity-immunities.patch => 0076-Item-entity-immunities.patch} (96%)
 rename patches/server/{0078-Add-ping-command.patch => 0077-Add-ping-command.patch} (100%)
 rename patches/server/{0079-Configurable-jockey-options.patch => 0078-Configurable-jockey-options.patch} (100%)
 rename patches/server/{0080-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%)
 rename patches/server/{0081-Add-phantom-spawning-options.patch => 0080-Add-phantom-spawning-options.patch} (100%)
 rename patches/server/{0082-Implement-bed-explosion-options.patch => 0081-Implement-bed-explosion-options.patch} (100%)
 rename patches/server/{0083-Implement-respawn-anchor-explosion-options.patch => 0082-Implement-respawn-anchor-explosion-options.patch} (100%)
 rename patches/server/{0084-Add-allow-water-in-end-world-option.patch => 0083-Add-allow-water-in-end-world-option.patch} (100%)
 rename patches/server/{0085-Allow-color-codes-in-books.patch => 0084-Allow-color-codes-in-books.patch} (96%)
 rename patches/server/{0086-Entity-lifespan.patch => 0085-Entity-lifespan.patch} (98%)
 rename patches/server/{0087-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (97%)
 rename patches/server/{0088-Squid-EAR-immunity.patch => 0087-Squid-EAR-immunity.patch} (100%)
 rename patches/server/{0089-Configurable-end-spike-seed.patch => 0088-Configurable-end-spike-seed.patch} (100%)
 rename patches/server/{0090-Configurable-dungeon-seed.patch => 0089-Configurable-dungeon-seed.patch} (100%)
 rename patches/server/{0091-Phantoms-burn-in-light.patch => 0090-Phantoms-burn-in-light.patch} (100%)
 rename patches/server/{0092-Configurable-villager-breeding.patch => 0091-Configurable-villager-breeding.patch} (100%)
 rename patches/server/{0093-Redstone-deactivates-spawners.patch => 0092-Redstone-deactivates-spawners.patch} (100%)
 rename patches/server/{0094-Totems-work-in-inventory.patch => 0093-Totems-work-in-inventory.patch} (100%)
 rename patches/server/{0095-Populator-seed-controls.patch => 0094-Populator-seed-controls.patch} (100%)
 rename patches/server/{0096-Add-vindicator-johnny-spawn-chance.patch => 0095-Add-vindicator-johnny-spawn-chance.patch} (100%)
 rename patches/server/{0097-Add-option-to-disable-mushroom-and-note-block-update.patch => 0096-Add-option-to-disable-mushroom-and-note-block-update.patch} (100%)
 rename patches/server/{0098-Dispensers-place-anvils-option.patch => 0097-Dispensers-place-anvils-option.patch} (100%)
 rename patches/server/{0099-Allow-anvil-colors.patch => 0098-Allow-anvil-colors.patch} (100%)
 rename patches/server/{0100-Add-no-random-tick-block-list.patch => 0099-Add-no-random-tick-block-list.patch} (100%)
 rename patches/server/{0101-Add-option-to-disable-dolphin-treasure-searching.patch => 0100-Add-option-to-disable-dolphin-treasure-searching.patch} (100%)
 rename patches/server/{0102-Short-enderman-height.patch => 0101-Short-enderman-height.patch} (100%)
 rename patches/server/{0103-Stop-squids-floating-on-top-of-water.patch => 0102-Stop-squids-floating-on-top-of-water.patch} (100%)
 rename patches/server/{0104-Ridables.patch => 0103-Ridables.patch} (99%)
 rename patches/server/{0105-Use-configured-height-for-nether-surface-builders.patch => 0104-Use-configured-height-for-nether-surface-builders.patch} (100%)
 rename patches/server/{0106-Crying-obsidian-valid-for-portal-frames.patch => 0105-Crying-obsidian-valid-for-portal-frames.patch} (100%)
 rename patches/server/{0107-Entities-can-use-portals-configuration.patch => 0106-Entities-can-use-portals-configuration.patch} (100%)
 rename patches/server/{0108-LivingEntity-broadcastItemBreak.patch => 0107-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/server/{0109-Customizable-wither-health-and-healing.patch => 0108-Customizable-wither-health-and-healing.patch} (100%)
 rename patches/server/{0110-Allow-toggling-special-MobSpawners-per-world.patch => 0109-Allow-toggling-special-MobSpawners-per-world.patch} (100%)
 rename patches/server/{0111-Raid-cooldown-setting.patch => 0110-Raid-cooldown-setting.patch} (100%)
 rename patches/server/{0112-Despawn-rate-config-options-per-projectile-type.patch => 0111-Despawn-rate-config-options-per-projectile-type.patch} (100%)
 rename patches/server/{0113-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%)
 rename patches/server/{0114-Persistent-TileEntity-Lore-and-DisplayName.patch => 0113-Persistent-TileEntity-Lore-and-DisplayName.patch} (100%)
 rename patches/server/{0115-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0114-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0116-Flying-squids-Oh-my.patch => 0115-Flying-squids-Oh-my.patch} (100%)
 rename patches/server/{0117-Infinity-bow-settings.patch => 0116-Infinity-bow-settings.patch} (100%)
 rename patches/server/{0118-Stonecutter-damage.patch => 0117-Stonecutter-damage.patch} (100%)
 rename patches/server/{0119-Configurable-daylight-cycle.patch => 0118-Configurable-daylight-cycle.patch} (100%)
 rename patches/server/{0120-Allow-infinite-and-mending-enchantments-together.patch => 0119-Allow-infinite-and-mending-enchantments-together.patch} (100%)
 rename patches/server/{0121-Infinite-fuel-furnace.patch => 0120-Infinite-fuel-furnace.patch} (100%)
 rename patches/server/{0122-Arrows-should-not-reset-despawn-counter.patch => 0121-Arrows-should-not-reset-despawn-counter.patch} (100%)
 rename patches/server/{0123-Add-tablist-suffix-option-for-afk.patch => 0122-Add-tablist-suffix-option-for-afk.patch} (96%)
 rename patches/server/{0124-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (100%)
 rename patches/server/{0125-Add-adjustable-breeding-cooldown-to-config.patch => 0124-Add-adjustable-breeding-cooldown-to-config.patch} (100%)
 rename patches/server/{0126-Make-entity-breeding-times-configurable.patch => 0125-Make-entity-breeding-times-configurable.patch} (100%)
 rename patches/server/{0127-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0126-Apply-display-names-from-item-forms-of-entities-to-e.patch} (100%)
 rename patches/server/{0128-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (100%)
 rename patches/server/{0129-Add-twisting-and-weeping-vines-growth-rates.patch => 0128-Add-twisting-and-weeping-vines-growth-rates.patch} (100%)
 rename patches/server/{0130-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (100%)
 rename patches/server/{0131-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (100%)
 rename patches/server/{0132-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch => 0131-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch} (100%)
 rename patches/server/{0133-Add-configurable-snowball-damage.patch => 0132-Add-configurable-snowball-damage.patch} (100%)
 rename patches/server/{0134-Zombie-break-door-minimum-difficulty-option.patch => 0133-Zombie-break-door-minimum-difficulty-option.patch} (100%)
 rename patches/server/{0135-Add-demo-command.patch => 0134-Add-demo-command.patch} (100%)
 rename patches/server/{0136-Left-handed-API.patch => 0135-Left-handed-API.patch} (100%)
 rename patches/server/{0137-Origami-Fix-ProtocolLib-issues-on-Java-15.patch => 0136-Origami-Fix-ProtocolLib-issues-on-Java-15.patch} (100%)
 rename patches/server/{0138-Changeable-Mob-Left-Handed-Chance.patch => 0137-Changeable-Mob-Left-Handed-Chance.patch} (100%)
 rename patches/server/{0139-Add-boat-fall-damage-config.patch => 0138-Add-boat-fall-damage-config.patch} (97%)
 rename patches/server/{0140-Config-migration-disable-saving-projectiles-to-disk-.patch => 0139-Config-migration-disable-saving-projectiles-to-disk-.patch} (100%)
 rename patches/server/{0141-Snow-Golem-rate-of-fire-config.patch => 0140-Snow-Golem-rate-of-fire-config.patch} (100%)
 rename patches/server/{0142-PaperPR-Config-option-for-Piglins-guarding-chests.patch => 0141-PaperPR-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0143-EMC-Configurable-disable-give-dropping.patch => 0142-EMC-Configurable-disable-give-dropping.patch} (100%)
 rename patches/server/{0144-Config-migration-climbing-should-not-bypass-cramming.patch => 0143-Config-migration-climbing-should-not-bypass-cramming.patch} (100%)
 rename patches/server/{0145-Lobotomize-stuck-villagers.patch => 0144-Lobotomize-stuck-villagers.patch} (100%)
 rename patches/server/{0146-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (100%)
 rename patches/server/{0147-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (100%)
 rename patches/server/{0148-Spread-out-and-optimise-player-list-ticks.patch => 0147-Spread-out-and-optimise-player-list-ticks.patch} (97%)
 rename patches/server/{0149-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0148-Configurable-chance-for-wolves-to-spawn-rabid.patch} (100%)
 rename patches/server/{0150-Configurable-default-wolf-collar-color.patch => 0149-Configurable-default-wolf-collar-color.patch} (100%)
 rename patches/server/{0151-Configurable-entity-base-attributes.patch => 0150-Configurable-entity-base-attributes.patch} (100%)
 rename patches/server/{0152-Phantom-flames-on-swoop.patch => 0151-Phantom-flames-on-swoop.patch} (100%)
 rename patches/server/{0153-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (100%)
 rename patches/server/{0154-Implement-TPSBar.patch => 0153-Implement-TPSBar.patch} (98%)
 rename patches/server/{0155-Striders-give-saddle-back.patch => 0154-Striders-give-saddle-back.patch} (100%)
 rename patches/server/{0156-PlayerBookTooLargeEvent.patch => 0155-PlayerBookTooLargeEvent.patch} (96%)
 rename patches/server/{0157-Full-netherite-armor-grants-fire-resistance.patch => 0156-Full-netherite-armor-grants-fire-resistance.patch} (100%)
 rename patches/server/{0158-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0157-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%)
 rename patches/server/{0159-Add-MC-4-fix-back.patch => 0158-Add-MC-4-fix-back.patch} (100%)
 rename patches/server/{0160-Add-mobGriefing-bypass-to-everything-affected.patch => 0159-Add-mobGriefing-bypass-to-everything-affected.patch} (100%)
 rename patches/server/{0161-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0160-Config-to-allow-Note-Block-sounds-when-blocked.patch} (100%)
 rename patches/server/{0162-Add-EntityTeleportHinderedEvent.patch => 0161-Add-EntityTeleportHinderedEvent.patch} (100%)
 rename patches/server/{0163-Add-StructureGenerateEvent.patch => 0162-Add-StructureGenerateEvent.patch} (100%)
 rename patches/server/{0164-Farmland-trampling-changes.patch => 0163-Farmland-trampling-changes.patch} (100%)
 rename patches/server/{0165-Movement-options-for-armor-stands.patch => 0164-Movement-options-for-armor-stands.patch} (100%)
 rename patches/server/{0166-Fix-stuck-in-portals.patch => 0165-Fix-stuck-in-portals.patch} (96%)
 rename patches/server/{0167-Config-to-use-infinity-bows-without-arrows.patch => 0166-Config-to-use-infinity-bows-without-arrows.patch} (100%)
 rename patches/server/{0168-Toggle-for-water-sensitive-mob-damage.patch => 0167-Toggle-for-water-sensitive-mob-damage.patch} (100%)
 rename patches/server/{0169-Config-to-always-tame-in-Creative.patch => 0168-Config-to-always-tame-in-Creative.patch} (100%)
 rename patches/server/{0170-End-crystal-explosion-options.patch => 0169-End-crystal-explosion-options.patch} (100%)
 rename patches/server/{0171-Add-unsafe-Entity-serialization-API.patch => 0170-Add-unsafe-Entity-serialization-API.patch} (100%)
 rename patches/server/{0172-Add-ghast-allow-griefing-option.patch => 0171-Add-ghast-allow-griefing-option.patch} (100%)
 rename patches/server/{0173-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0172-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (100%)
 rename patches/server/{0174-Dont-run-with-scissors.patch => 0173-Dont-run-with-scissors.patch} (96%)
 rename patches/server/{0175-One-Punch-Man.patch => 0174-One-Punch-Man.patch} (100%)
 rename patches/server/{0176-Add-config-for-snow-on-blue-ice.patch => 0175-Add-config-for-snow-on-blue-ice.patch} (100%)
 rename patches/server/{0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0176-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (100%)
 rename patches/server/{0178-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0177-Config-to-ignore-nearby-mobs-when-sleeping.patch} (96%)
 rename patches/server/{0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch => 0178-Config-for-Enderman-to-aggro-spawned-Endermites.patch} (100%)
 rename patches/server/{0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0179-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (100%)
 rename patches/server/{0181-Re-enable-timings-by-default.patch => 0180-Re-enable-timings-by-default.patch} (100%)
 rename patches/server/{0182-Tick-fluids-config.patch => 0181-Tick-fluids-config.patch} (100%)
 rename patches/server/{0183-Config-to-disable-Llama-caravans.patch => 0182-Config-to-disable-Llama-caravans.patch} (100%)
 rename patches/server/{0184-Config-to-make-Creepers-explode-on-death.patch => 0183-Config-to-make-Creepers-explode-on-death.patch} (100%)
 rename patches/server/{0185-Configurable-ravager-griefable-blocks-list.patch => 0184-Configurable-ravager-griefable-blocks-list.patch} (100%)
 rename patches/server/{0186-Sneak-to-bulk-process-composter.patch => 0185-Sneak-to-bulk-process-composter.patch} (100%)
 rename patches/server/{0187-Config-for-skipping-night.patch => 0186-Config-for-skipping-night.patch} (100%)
 rename patches/server/{0188-Add-config-for-villager-trading.patch => 0187-Add-config-for-villager-trading.patch} (100%)
 rename patches/server/{0189-Allow-infinity-on-crossbows.patch => 0188-Allow-infinity-on-crossbows.patch} (100%)
 rename patches/server/{0190-Drowning-Settings.patch => 0189-Drowning-Settings.patch} (100%)
 rename patches/server/{0191-Break-individual-slabs-when-sneaking.patch => 0190-Break-individual-slabs-when-sneaking.patch} (100%)
 rename patches/server/{0192-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0191-Config-to-disable-hostile-mob-spawn-on-ice.patch} (100%)
 rename patches/server/{0193-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0192-Config-to-show-Armor-Stand-arms-on-spawn.patch} (100%)
 rename patches/server/{0194-Option-to-make-doors-require-redstone.patch => 0193-Option-to-make-doors-require-redstone.patch} (100%)
 rename patches/server/{0195-Config-to-allow-for-unsafe-enchants.patch => 0194-Config-to-allow-for-unsafe-enchants.patch} (100%)
 rename patches/server/{0196-Configurable-sponge-absorption.patch => 0195-Configurable-sponge-absorption.patch} (100%)
 rename patches/server/{0197-Projectile-offset-config.patch => 0196-Projectile-offset-config.patch} (100%)
 rename patches/server/{0198-Config-for-powered-rail-activation-distance.patch => 0197-Config-for-powered-rail-activation-distance.patch} (100%)
 rename patches/server/{0199-Piglin-portal-spawn-modifier.patch => 0198-Piglin-portal-spawn-modifier.patch} (100%)
 rename patches/server/{0200-Config-to-change-max-number-of-bees.patch => 0199-Config-to-change-max-number-of-bees.patch} (100%)
 rename patches/server/{0201-Configurable-damage-settings-for-magma-blocks.patch => 0200-Configurable-damage-settings-for-magma-blocks.patch} (100%)
 rename patches/server/{0202-Config-for-wither-explosion-radius.patch => 0201-Config-for-wither-explosion-radius.patch} (100%)
 rename patches/server/{0203-Add-credits-command.patch => 0202-Add-credits-command.patch} (100%)
 rename patches/server/{0204-Gamemode-extra-permissions.patch => 0203-Gamemode-extra-permissions.patch} (100%)

diff --git a/Paper b/Paper
index ef60c01c4..840e72091 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit ef60c01c4da777f07b72668a103c95e06730f259
+Subproject commit 840e72091f3e9a1eccfd9baed07ff0fb45b53686
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 897342fca..95cb9a549 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -15035,7 +15035,7 @@ index c67b94840e4c967baebf6eb351df15f0e4ead4be..ed836462123efc6903e406fa926e55e1
              throw new IllegalStateException("Protocol error", cryptographyexception);
          }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index b543776da3b799643893984a8c6f29477ed78d4a..159c38618d7745ea513ad179b1217d76c2c4897a 100644
+index 9455cb9bc849a330e57fdc466fb51902631e22d8..53320d1d134305c0b37442dfca9931629a6d196d 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -542,6 +542,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -15254,7 +15254,7 @@ index b543776da3b799643893984a8c6f29477ed78d4a..159c38618d7745ea513ad179b1217d76
          Stream<VoxelShape> stream = iworldreader.d(this.player, this.player.getBoundingBox().shrink(9.999999747378752E-6D), (entity) -> {
              return true;
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnection.java b/src/main/java/net/minecraft/server/network/ServerConnection.java
-index dc362724ea0cc1b2f9d9ceffff483217b4356c40..70fde7bad2e0a6d7432d8509fdb7c46d9f020d4c 100644
+index 69fc2789df88344587b6052f93661ed38f24a503..92836f1200461ba7fff2f8bcb5e1755ec9a0c9ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnection.java
 @@ -87,6 +87,11 @@ public class ServerConnection {
@@ -15270,7 +15270,7 @@ index dc362724ea0cc1b2f9d9ceffff483217b4356c40..70fde7bad2e0a6d7432d8509fdb7c46d
                  protected void initChannel(Channel channel) throws Exception {
                      try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f8f0212497ad4fbb1273820a06a4ae6721053b8e..c705bf1e651a764d56b87ebc5a86a938d8bd34bb 100644
+index 6bfa8020c19721dd63e038e4b866a7d3a24e66ac..b5043eabe63fe703a321cff6c0f6449cf729cd0e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -16846,7 +16846,7 @@ index 2f8b3587f527620152609d5be342b328a7621e0f..e440d26c920c4efddf958c61bfdfa508
              if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(itemstack)) {
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
-index b9680f6f2e30ec9397d6a9c83e79563d9253aff6..546de0ec2b624a781480ac95f65b2cbfbb5dcf2e 100644
+index c4248531d4a6a11259d9d78ce1d7683a86840d40..f3077c22445949c484a73ee56eab593f527795a6 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 @@ -83,7 +83,9 @@ public abstract class EntityFireball extends IProjectile {
diff --git a/patches/server/0003-Multithreaded-entity-tracking.patch b/patches/server/0003-Multithreaded-entity-tracking.patch
deleted file mode 100644
index 0dc146177..000000000
--- a/patches/server/0003-Multithreaded-entity-tracking.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paul Sauve <paul@technove.co>
-Date: Fri, 12 Feb 2021 16:29:41 -0600
-Subject: [PATCH] Multithreaded entity tracking
-
-Adds a configuration option to run the tracker on multiple threads.
-This will generally be faster than the single threaded approach,
-unless you don't have a lot of entities/players.
-
-Airplane
-Copyright (C) 2020 Technove LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java
-index be408aebbccbda46e8aa82ef337574137cfa0096..739839314fd8a88b5fca8b9678e1df07a166c35d 100644
---- a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java
-+++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java
-@@ -16,11 +16,11 @@ public final class IteratorSafeOrderedReferenceSet<E> {
- 
-     /* list impl */
-     protected E[] listElements;
--    protected int listSize;
-+    protected int listSize; public int getListSize() { return this.listSize; } // Airplane - getter
- 
-     protected final double maxFragFactor;
- 
--    protected int iteratorCount;
-+    public int iteratorCount; // Airplane - public for debug
- 
-     private final boolean threadRestricted;
- 
-diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
-index 65adf3ceda012c8cfdea675c40e2bb27d34ebac7..bb87d8792fa6f4b888dd562d63353fe90d2bc588 100644
---- a/src/main/java/gg/airplane/AirplaneConfig.java
-+++ b/src/main/java/gg/airplane/AirplaneConfig.java
-@@ -120,4 +120,17 @@ public class AirplaneConfig {
-     }
- 
- 
-+    public static boolean multithreadedEntityTracker = false;
-+    public static boolean entityTrackerAsyncPackets = false;
-+
-+    private static void entityTracker() {
-+        config.setComment("tracker", "Options to improve the performance of the entity tracker");
-+
-+        multithreadedEntityTracker = config.getBoolean("tracker.multithreaded", multithreadedEntityTracker,
-+          "This enables the multithreading of the tracker.");
-+        entityTrackerAsyncPackets = config.getBoolean("tracker.unsafe-async-packets", entityTrackerAsyncPackets,
-+          "This option can break plugins that assume packets from the",
-+          "entity tracker will be sent sync.");
-+    }
-+
- }
-diff --git a/src/main/java/gg/airplane/commands/AirplaneCommands.java b/src/main/java/gg/airplane/commands/AirplaneCommands.java
-index 66b20250a26d005427601b1cdee43bdd9eba70cc..f84e26b2d8ab9a9b2d9e92e18002483127121135 100644
---- a/src/main/java/gg/airplane/commands/AirplaneCommands.java
-+++ b/src/main/java/gg/airplane/commands/AirplaneCommands.java
-@@ -2,11 +2,13 @@ package gg.airplane.commands;
- 
- import gg.airplane.AirplaneCommand;
- import gg.airplane.flare.FlareCommand;
-+import gg.airplane.structs.TrackQueue;
- import net.minecraft.server.MinecraftServer;
- 
- public class AirplaneCommands {
-     public static void init() {
-         MinecraftServer.getServer().server.getCommandMap().register("airplane", "Airplane", new AirplaneCommand());
-         MinecraftServer.getServer().server.getCommandMap().register("flare", "Airplane", new FlareCommand());
-+        TrackQueue.TrackQueueDebugCommand.register();
-     }
- }
-diff --git a/src/main/java/gg/airplane/structs/TrackQueue.java b/src/main/java/gg/airplane/structs/TrackQueue.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..4419fbe94041f4b8a0ea848880798289d063b8e2
---- /dev/null
-+++ b/src/main/java/gg/airplane/structs/TrackQueue.java
-@@ -0,0 +1,109 @@
-+package gg.airplane.structs;
-+
-+import com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet;
-+import net.minecraft.server.level.WorldServer;
-+import net.minecraft.world.level.chunk.Chunk;
-+import net.minecraft.server.MinecraftServer;
-+import org.apache.logging.log4j.Level;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+
-+import java.util.concurrent.ConcurrentLinkedQueue;
-+import java.util.concurrent.ForkJoinPool;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+/**
-+ * Helper class to handle processing a track queue.
-+ */
-+public class TrackQueue {
-+
-+    public static class TrackQueueDebugCommand extends Command {
-+        protected TrackQueueDebugCommand() {
-+            super("trackqueuedebug");
-+        }
-+
-+        public static void register() {
-+            MinecraftServer.getServer().server.getCommandMap().register("trackqueuedebug", "Airplane", new TrackQueueDebugCommand());
-+        }
-+
-+        @Override
-+        public boolean execute(CommandSender sender, String commandLabel, String[] args) {
-+            if (!sender.isOp()) {
-+                return false;
-+            }
-+            for (WorldServer world : MinecraftServer.getServer().getWorlds()) {
-+                IteratorSafeOrderedReferenceSet<Chunk> chunks = world.getChunkProvider().entityTickingChunks;
-+                sender.sendMessage(world.getWorld().getName() + ": " + chunks.size() + " / " + chunks.getListSize() + " (iterators: " + chunks.iteratorCount + ")");
-+            }
-+            return true;
-+        }
-+    }
-+
-+    private final IteratorSafeOrderedReferenceSet<Chunk> chunks;
-+    private final ForkJoinPool pool = new ForkJoinPool(Math.max(4, Runtime.getRuntime().availableProcessors() >> 2));
-+    private final AtomicInteger taskIndex = new AtomicInteger();
-+
-+    private final ConcurrentLinkedQueue<Runnable> mainThreadTasks;
-+
-+    public TrackQueue(IteratorSafeOrderedReferenceSet<Chunk> chunks, ConcurrentLinkedQueue<Runnable> mainThreadTasks) {
-+        this.chunks = chunks;
-+        this.mainThreadTasks = mainThreadTasks;
-+    }
-+
-+    public void start() {
-+        int iterator = this.chunks.createRawIterator();
-+        if (iterator == -1) {
-+            return;
-+        }
-+        try {
-+            this.taskIndex.set(iterator);
-+
-+            for (int i = 0; i < this.pool.getParallelism(); i++) {
-+                this.pool.execute(this::run);
-+            }
-+
-+            while (this.taskIndex.get() < this.chunks.getListSize()) {
-+                this.runMainThreadTasks();
-+                this.handleTask(); // assist
-+            }
-+            this.runMainThreadTasks(); // finish tasks
-+        } finally {
-+            this.chunks.finishRawIterator();
-+        }
-+    }
-+
-+    private void runMainThreadTasks() {
-+        Runnable task;
-+        while ((task = this.mainThreadTasks.poll()) != null) {
-+            try {
-+                task.run();
-+            } catch (Throwable t) {
-+                MinecraftServer.LOGGER.log(Level.WARN, "Tasks failed while ticking track queue", t);
-+            }
-+        }
-+
-+    }
-+
-+    private void run() {
-+        while (handleTask());
-+    }
-+
-+    private boolean handleTask() {
-+        int index;
-+        while ((index = this.taskIndex.getAndIncrement()) < this.chunks.getListSize()) {
-+            Chunk chunk = this.chunks.rawGet(index);
-+            if (chunk != null) {
-+                try {
-+                    chunk.entityTracker.run();
-+                } catch (Throwable t) {
-+                    MinecraftServer.LOGGER.log(Level.WARN, "Ticking tracker failed", t);
-+                }
-+
-+                return true;
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-+}
-diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index 207a9c3928aad7c6e89a120b54d87e003ebd232c..424cd048f905cd0ed3f7a4545a26ffde8da1f91f 100644
---- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-@@ -388,7 +388,7 @@ public class ChunkProviderServer extends IChunkProvider {
-     }
- 
-     final com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<Chunk> tickingChunks = new com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<>(4096, 0.75f, 4096, 0.15, true);
--    final com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<Chunk> entityTickingChunks = new com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<>(4096, 0.75f, 4096, 0.15, true);
-+    public final com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<Chunk> entityTickingChunks = new com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<>(4096, 0.75f, 4096, 0.15, true); // Airplane - public for debug
-     // Tuinity end
- 
-     public ChunkProviderServer(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, ChunkGenerator chunkgenerator, int i, boolean flag, WorldLoadListener worldloadlistener, Supplier<WorldPersistentData> supplier) {
-diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index fb61b6ac167b34486282a24e598020fb96081f28..b2e21e7034ad83a4ba1c99f860be5a0f5ee6a75f 100644
---- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -182,7 +182,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public NetworkManager networkManager; // Paper
-     public final MinecraftServer server;
-     public final PlayerInteractManager playerInteractManager;
--    public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
-+    public final Deque<Integer> removeQueue = new java.util.concurrent.ConcurrentLinkedDeque<>(); // Paper // Airplane concurrent deque
-     private final AdvancementDataPlayer advancementDataPlayer;
-     private final ServerStatisticManager serverStatisticManager;
-     private float lastHealthScored = Float.MIN_VALUE;
-diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-index 67ca28463f5add7c18f7f16b918c3f36f8feeeda..37e64e24ca3a90370cdf12e5ff9cd1fceede796b 100644
---- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-+++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-@@ -75,6 +75,10 @@ public class EntityTrackerEntry {
-      * Requested in https://github.com/PaperMC/Paper/issues/1537 to allow intercepting packets
-      */
-     public void sendPlayerPacket(EntityPlayer player, Packet packet) {
-+        if (!gg.airplane.AirplaneConfig.entityTrackerAsyncPackets && !org.bukkit.Bukkit.isPrimaryThread()) {
-+            this.b.chunkProvider.playerChunkMap.trackerEnsureMain(() -> sendPlayerPacket(player, packet));
-+            return;
-+        }
-         player.playerConnection.sendPacket(packet);
-     }
- 
-@@ -103,7 +107,7 @@ public class EntityTrackerEntry {
- 
-     public final void tick() { this.a(); } // Paper - OBFHELPER
-     public void a() {
--        com.tuinity.tuinity.util.TickThread.softEnsureTickThread("Tracker update"); // Tuinity
-+        //com.tuinity.tuinity.util.TickThread.softEnsureTickThread("Tracker update"); // Tuinity // Airplane - allow multithreaded
-         List<Entity> list = this.tracker.passengers; // Paper - do not copy list
- 
-         if (!list.equals(this.p)) {
-@@ -116,6 +120,8 @@ public class EntityTrackerEntry {
-             ItemStack itemstack = entityitemframe.getItem();
- 
-             if (this.tickCounter % 10 == 0 && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
-+                // Airplane start - process maps on main
-+                this.b.chunkProvider.playerChunkMap.trackerEnsureMain(() -> {
-                 WorldMap worldmap = ItemWorldMap.getSavedMap(itemstack, this.b);
-                 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
- 
-@@ -129,6 +135,8 @@ public class EntityTrackerEntry {
-                         entityplayer.playerConnection.sendPacket(packet);
-                     }
-                 }
-+                });
-+                // Airplane end
-             }
- 
-             this.c();
-@@ -263,18 +271,25 @@ public class EntityTrackerEntry {
-             // CraftBukkit start - Create PlayerVelocity event
-             boolean cancelled = false;
- 
--            if (this.tracker instanceof EntityPlayer) {
-+            if (this.tracker instanceof EntityPlayer && PlayerVelocityEvent.getHandlerList().getRegisteredListeners().length > 0) { // Airplane - ensure there's listeners
-+                // Airplane start - run on main thread
-+                this.b.chunkProvider.playerChunkMap.trackerEnsureMain(() -> {
-                 Player player = (Player) this.tracker.getBukkitEntity();
-                 org.bukkit.util.Vector velocity = player.getVelocity();
- 
-                 PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity.clone());
-                 this.tracker.world.getServer().getPluginManager().callEvent(event);
- 
--                if (event.isCancelled()) {
--                    cancelled = true;
--                } else if (!velocity.equals(event.getVelocity())) {
-+                if (!event.isCancelled() && !velocity.equals(event.getVelocity())) {
-                     player.setVelocity(event.getVelocity());
-                 }
-+                if (!event.isCancelled()) {
-+                    this.broadcastIncludingSelf(new PacketPlayOutEntityVelocity(this.tracker)); // duplicate from !cancelled below
-+                }
-+
-+                });
-+                cancelled = true; // don't broadcast until the event has finished
-+                // Airplane end
-             }
- 
-             if (!cancelled) {
-@@ -358,7 +373,9 @@ public class EntityTrackerEntry {
-             if (!list.isEmpty()) {
-                 consumer.accept(new PacketPlayOutEntityEquipment(this.tracker.getId(), list));
-             }
-+            this.b.chunkProvider.playerChunkMap.trackerEnsureMain(() -> { // Airplane
-             ((EntityLiving) this.tracker).updateEquipment(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
-+            }); // Airplane
-         }
- 
-         // CraftBukkit start - Fix for nonsensical head yaw
-@@ -436,6 +453,10 @@ public class EntityTrackerEntry {
-     // Paper end
- 
-     private void broadcastIncludingSelf(Packet<?> packet) {
-+        if (!gg.airplane.AirplaneConfig.entityTrackerAsyncPackets && !org.bukkit.Bukkit.isPrimaryThread()) {
-+            this.b.chunkProvider.playerChunkMap.trackerEnsureMain(() -> broadcastIncludingSelf(packet));
-+            return;
-+        }
-         this.f.accept(packet);
-         if (this.tracker instanceof EntityPlayer) {
-             ((EntityPlayer) this.tracker).playerConnection.sendPacket(packet);
-diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 914c7a1b18151f29183cfe9474313ce18e7c4ae2..737851cde7752e7cccf226f1868a38d6411bfb31 100644
---- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-@@ -769,6 +769,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-         return this.updatingChunks.getVisibleAsync(i);
-         // Tuinity end - Don't copy
-     }
-+    // Airplane start - since neither map can be updated during tracker tick, it's safe to allow direct retrieval here
-+    private PlayerChunk trackerGetVisibleChunk(long i) {
-+        return this.updatingChunks.getVisibleAsync(i);
-+    }
-+    // Airplane end
- 
-     protected final IntSupplier getPrioritySupplier(long i) { return c(i); } // Paper - OBFHELPER
-     protected IntSupplier c(long i) {
-@@ -2164,10 +2169,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-         entity.tracker = null; // Paper - We're no longer tracked
-     }
- 
-+    // Airplane start - tools to ensure main thread
-+    private final java.util.concurrent.ConcurrentLinkedQueue<Runnable> trackerMainQueue = new java.util.concurrent.ConcurrentLinkedQueue<>();
-+    private gg.airplane.structs.TrackQueue trackQueue;
-+
-+    void trackerEnsureMain(Runnable runnable) {
-+        if (this.world.serverThread == Thread.currentThread()) {
-+            runnable.run();
-+        } else {
-+            this.trackerMainQueue.add(runnable);
-+        }
-+    }
-+    // Airplane end
-+
-     // Paper start - optimised tracker
-     private final void processTrackQueue() {
-         this.world.timings.tracker1.startTiming();
-         try {
-+            // Airplane start - multithreaded tracker
-+            if (this.trackQueue == null) this.trackQueue = new gg.airplane.structs.TrackQueue(this.world.getChunkProvider().entityTickingChunks, trackerMainQueue);
-+            if (gg.airplane.AirplaneConfig.multithreadedEntityTracker) {
-+                this.trackQueue.start();
-+                return;
-+            }
-+            // Airplane end
-             com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet.Iterator<Chunk> iterator = this.world.getChunkProvider().entityTickingChunks.iterator();
-             try {
-             while (iterator.hasNext()) {
-@@ -2433,7 +2458,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
-     public class EntityTracker {
- 
-         final EntityTrackerEntry trackerEntry; // Paper - private -> package private
--        private final Entity tracker;
-+        public final Entity tracker; // Airplane - public for chunk
-         private final int trackingDistance;
-         private SectionPosition e;
-         // Paper start
-@@ -2452,7 +2477,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
-         // Paper start - use distance map to optimise tracker
-         com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> lastTrackerCandidates;
- 
--        final void updatePlayers(com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> newTrackerCandidates) {
-+        public synchronized final void tickEntry() { this.trackerEntry.tick(); } // Airplane - move entry tick into sync block
-+
-+        public synchronized final void updatePlayers(com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> newTrackerCandidates) { // Airplane
-             com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> oldTrackerCandidates = this.lastTrackerCandidates;
-             this.lastTrackerCandidates = newTrackerCandidates;
- 
-@@ -2493,7 +2520,13 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
-             return this.tracker.getId();
-         }
- 
--        public void broadcast(Packet<?> packet) {
-+        public synchronized void broadcast(Packet<?> packet) { // Airplane - synchronized for tracked player
-+            // Airplane start
-+            if (!gg.airplane.AirplaneConfig.entityTrackerAsyncPackets && !org.bukkit.Bukkit.isPrimaryThread()) {
-+                trackerEnsureMain(() -> broadcast(packet));
-+                return;
-+            }
-+            // Airplane end
-             Iterator iterator = this.trackedPlayers.iterator();
- 
-             while (iterator.hasNext()) {
-@@ -2505,6 +2538,12 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
-         }
- 
-         public void broadcastIncludingSelf(Packet<?> packet) {
-+            // Airplane start
-+            if (!gg.airplane.AirplaneConfig.entityTrackerAsyncPackets && !org.bukkit.Bukkit.isPrimaryThread()) {
-+                trackerEnsureMain(() -> broadcastIncludingSelf(packet));
-+                return;
-+            }
-+            // Airplane end
-             this.broadcast(packet);
-             if (this.tracker instanceof EntityPlayer) {
-                 ((EntityPlayer) this.tracker).playerConnection.sendPacket(packet);
-@@ -2531,8 +2570,8 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
- 
-         }
- 
--        public void updatePlayer(EntityPlayer entityplayer) {
--            org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot
-+        public synchronized void updatePlayer(EntityPlayer entityplayer) { // Airplane - sync for access to map
-+            //org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot // Airplane - allow sync for tracker
-             if (entityplayer != this.tracker) {
-                 // Paper start - remove allocation of Vec3D here
-                 //Vec3D vec3d = entityplayer.getPositionVector().d(this.tracker.getPositionVector()); // MC-155077, SPIGOT-5113
-@@ -2553,7 +2592,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
-                          */
-                         int x = this.tracker.chunkX, z = this.tracker.chunkZ;
-                         long chunkcoordintpair = ChunkCoordIntPair.pair(x, z);
--                        PlayerChunk playerchunk = PlayerChunkMap.this.getVisibleChunk(chunkcoordintpair);
-+                        PlayerChunk playerchunk = PlayerChunkMap.this.trackerGetVisibleChunk(chunkcoordintpair); // Airplane
- 
-                         if (playerchunk != null && playerchunk.getSendingChunk() != null && PlayerChunkMap.this.playerChunkManager.isChunkSent(entityplayer, MathHelper.floor(this.tracker.locX()) >> 4, MathHelper.floor(this.tracker.locZ()) >> 4)) { // Paper - no-tick view distance // Tuinity - don't broadcast in chunks the player hasn't received
-                             flag1 = PlayerChunkMap.someDistanceCalculation(x, z, entityplayer, false) <= PlayerChunkMap.this.viewDistance;
-diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
-index 8f5809756b4fb358f1207c1d61c5cbe6df3fff00..2e8eb0bb8fb4f7ce6b92fe01a81327da30e614ae 100644
---- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
-@@ -111,6 +111,26 @@ public class Chunk implements IChunkAccess {
-     }
-     // Airplane end
- 
-+    // Airplane start - entity tracker runnable
-+    // prevents needing to allocate new lambda in processTrackQueue
-+    public final Runnable entityTracker = new Runnable() {
-+        @Override
-+        public void run() {
-+            Entity[] entities = Chunk.this.entities.getRawData();
-+            for (int i = 0, len = Chunk.this.entities.size(); i < len; ++i) {
-+                Entity entity = entities[i];
-+                if (entity != null) {
-+                    PlayerChunkMap.EntityTracker tracker = ((WorldServer) Chunk.this.getWorld()).getChunkProvider().playerChunkMap.trackedEntities.get(entity.getId());
-+                    if (tracker != null) {
-+                        tracker.updatePlayers(tracker.tracker.getPlayersInTrackRange());
-+                        tracker.tickEntry();
-+                    }
-+                }
-+            }
-+        }
-+    };
-+    // Airplane end
-+
-     public Chunk(World world, ChunkCoordIntPair chunkcoordintpair, BiomeStorage biomestorage) {
-         this(world, chunkcoordintpair, biomestorage, ChunkConverter.a, TickListEmpty.b(), TickListEmpty.b(), 0L, (ChunkSection[]) null, (Consumer) null);
-     }
diff --git a/patches/server/0004-Rebrand.patch b/patches/server/0003-Rebrand.patch
similarity index 100%
rename from patches/server/0004-Rebrand.patch
rename to patches/server/0003-Rebrand.patch
diff --git a/patches/server/0005-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
similarity index 100%
rename from patches/server/0005-Purpur-config-files.patch
rename to patches/server/0004-Purpur-config-files.patch
diff --git a/patches/server/0006-Timings-stuff.patch b/patches/server/0005-Timings-stuff.patch
similarity index 100%
rename from patches/server/0006-Timings-stuff.patch
rename to patches/server/0005-Timings-stuff.patch
diff --git a/patches/server/0007-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch
similarity index 100%
rename from patches/server/0007-Barrels-and-enderchests-6-rows.patch
rename to patches/server/0006-Barrels-and-enderchests-6-rows.patch
diff --git a/patches/server/0008-Advancement-API.patch b/patches/server/0007-Advancement-API.patch
similarity index 100%
rename from patches/server/0008-Advancement-API.patch
rename to patches/server/0007-Advancement-API.patch
diff --git a/patches/server/0009-Llama-API.patch b/patches/server/0008-Llama-API.patch
similarity index 100%
rename from patches/server/0009-Llama-API.patch
rename to patches/server/0008-Llama-API.patch
diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0009-AFK-API.patch
similarity index 98%
rename from patches/server/0010-AFK-API.patch
rename to patches/server/0009-AFK-API.patch
index 74b581bf4..b6d4d855b 100644
--- a/patches/server/0010-AFK-API.patch
+++ b/patches/server/0009-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index b2e21e7034ad83a4ba1c99f860be5a0f5ee6a75f..598b30244e74a56d62dc4ace5362225447860a0a 100644
+index fb61b6ac167b34486282a24e598020fb96081f28..c42a2813b40152079786dde33231d945f3144580 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -2071,8 +2071,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -86,7 +86,7 @@ index 51bb2502e4efb052f55de6eabce07f59e936c9d9..4f1b055dfe38f6a48763f75c1795dcd6
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 159c38618d7745ea513ad179b1217d76c2c4897a..15349a7bddcad5a4a6db07a8aa6ae8d06163b1f6 100644
+index 53320d1d134305c0b37442dfca9931629a6d196d..1f4e45f6e70032bfeeafe30d038e14e052e6ad9d 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -399,6 +399,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0011-Bring-back-server-name.patch b/patches/server/0010-Bring-back-server-name.patch
similarity index 100%
rename from patches/server/0011-Bring-back-server-name.patch
rename to patches/server/0010-Bring-back-server-name.patch
diff --git a/patches/server/0012-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch
similarity index 100%
rename from patches/server/0012-Configurable-server-mod-name.patch
rename to patches/server/0011-Configurable-server-mod-name.patch
diff --git a/patches/server/0013-LivingEntity-safeFallDistance.patch b/patches/server/0012-LivingEntity-safeFallDistance.patch
similarity index 100%
rename from patches/server/0013-LivingEntity-safeFallDistance.patch
rename to patches/server/0012-LivingEntity-safeFallDistance.patch
diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch
similarity index 100%
rename from patches/server/0014-Lagging-threshold.patch
rename to patches/server/0013-Lagging-threshold.patch
diff --git a/patches/server/0015-ItemFactory-getMonsterEgg.patch b/patches/server/0014-ItemFactory-getMonsterEgg.patch
similarity index 100%
rename from patches/server/0015-ItemFactory-getMonsterEgg.patch
rename to patches/server/0014-ItemFactory-getMonsterEgg.patch
diff --git a/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/server/0017-EMC-MonsterEggSpawnEvent.patch b/patches/server/0016-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/server/0017-EMC-MonsterEggSpawnEvent.patch
rename to patches/server/0016-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0017-Player-invulnerabilities.patch
similarity index 95%
rename from patches/server/0018-Player-invulnerabilities.patch
rename to patches/server/0017-Player-invulnerabilities.patch
index 7f93ac533..19bcf3c1d 100644
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0017-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 598b30244e74a56d62dc4ace5362225447860a0a..f59d7e245aa3768004c7f82837a7482260a53406 100644
+index c42a2813b40152079786dde33231d945f3144580..6e3a3a50e01c41b40451bce05015714b5a7fe1e3 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -284,6 +284,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,7 +67,7 @@ index 598b30244e74a56d62dc4ace5362225447860a0a..f59d7e245aa3768004c7f82837a74822
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 15349a7bddcad5a4a6db07a8aa6ae8d06163b1f6..37663436c1ffed4552cdcdac7a5c09fe9b632fee 100644
+index 1f4e45f6e70032bfeeafe30d038e14e052e6ad9d..568fea41d12f2817b09768ff3b03f76930ad676c 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1896,6 +1896,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,7 +79,7 @@ index 15349a7bddcad5a4a6db07a8aa6ae8d06163b1f6..37663436c1ffed4552cdcdac7a5c09fe
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c705bf1e651a764d56b87ebc5a86a938d8bd34bb..9360d35581c6961a768973cc31341381ee26e234 100644
+index b5043eabe63fe703a321cff6c0f6449cf729cd0e..456d87ffb2303867ac1e586078b4f81c059b0e74 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1009,6 +1009,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0019-Anvil-API.patch b/patches/server/0018-Anvil-API.patch
similarity index 100%
rename from patches/server/0019-Anvil-API.patch
rename to patches/server/0018-Anvil-API.patch
diff --git a/patches/server/0020-Configurable-villager-brain-ticks.patch b/patches/server/0019-Configurable-villager-brain-ticks.patch
similarity index 100%
rename from patches/server/0020-Configurable-villager-brain-ticks.patch
rename to patches/server/0019-Configurable-villager-brain-ticks.patch
diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch
similarity index 98%
rename from patches/server/0021-Alternative-Keepalive-Handling.patch
rename to patches/server/0020-Alternative-Keepalive-Handling.patch
index 210c1d15c..82cbc1239 100644
--- a/patches/server/0021-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0020-Alternative-Keepalive-Handling.patch
@@ -17,7 +17,7 @@ index b4c37287362907b8507d156b978ba5b9d961bb7b..9e6e6636539702507abb78515e002819
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 37663436c1ffed4552cdcdac7a5c09fe9b632fee..f5ada346a11ac3becda4b87416beebd680ca16fa 100644
+index 568fea41d12f2817b09768ff3b03f76930ad676c..54327914233580282ee86e46712d1ba0d176bcc4 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -233,6 +233,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0022-Silk-touch-spawners.patch b/patches/server/0021-Silk-touch-spawners.patch
similarity index 100%
rename from patches/server/0022-Silk-touch-spawners.patch
rename to patches/server/0021-Silk-touch-spawners.patch
diff --git a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0022-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 100%
rename from patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0022-MC-168772-Fix-Add-turtle-egg-block-options.patch
diff --git a/patches/server/0024-Fix-vanilla-command-permission-handler.patch b/patches/server/0023-Fix-vanilla-command-permission-handler.patch
similarity index 100%
rename from patches/server/0024-Fix-vanilla-command-permission-handler.patch
rename to patches/server/0023-Fix-vanilla-command-permission-handler.patch
diff --git a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch
similarity index 100%
rename from patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0024-Logger-settings-suppressing-pointless-logs.patch
diff --git a/patches/server/0026-Disable-outdated-build-check.patch b/patches/server/0025-Disable-outdated-build-check.patch
similarity index 100%
rename from patches/server/0026-Disable-outdated-build-check.patch
rename to patches/server/0025-Disable-outdated-build-check.patch
diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0026-Giants-AI-settings.patch
similarity index 100%
rename from patches/server/0027-Giants-AI-settings.patch
rename to patches/server/0026-Giants-AI-settings.patch
diff --git a/patches/server/0028-Illusioners-AI-settings.patch b/patches/server/0027-Illusioners-AI-settings.patch
similarity index 100%
rename from patches/server/0028-Illusioners-AI-settings.patch
rename to patches/server/0027-Illusioners-AI-settings.patch
diff --git a/patches/server/0029-Zombie-horse-naturally-spawn.patch b/patches/server/0028-Zombie-horse-naturally-spawn.patch
similarity index 100%
rename from patches/server/0029-Zombie-horse-naturally-spawn.patch
rename to patches/server/0028-Zombie-horse-naturally-spawn.patch
diff --git a/patches/server/0030-Charged-creeper-naturally-spawn.patch b/patches/server/0029-Charged-creeper-naturally-spawn.patch
similarity index 100%
rename from patches/server/0030-Charged-creeper-naturally-spawn.patch
rename to patches/server/0029-Charged-creeper-naturally-spawn.patch
diff --git a/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 100%
rename from patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch
diff --git a/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0033-Make-Iron-Golems-Swim.patch b/patches/server/0032-Make-Iron-Golems-Swim.patch
similarity index 100%
rename from patches/server/0033-Make-Iron-Golems-Swim.patch
rename to patches/server/0032-Make-Iron-Golems-Swim.patch
diff --git a/patches/server/0034-Dont-send-useless-entity-packets.patch b/patches/server/0033-Dont-send-useless-entity-packets.patch
similarity index 95%
rename from patches/server/0034-Dont-send-useless-entity-packets.patch
rename to patches/server/0033-Dont-send-useless-entity-packets.patch
index 052206a8c..aaca9df2a 100644
--- a/patches/server/0034-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0033-Dont-send-useless-entity-packets.patch
@@ -26,10 +26,10 @@ index 0eed10a6c4e0c7245f219d19ed1e2e5c94364db9..2b54a5f3347f788b751892105f888663
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-index 37e64e24ca3a90370cdf12e5ff9cd1fceede796b..f63ec5fa5a1cb34f4809a06a29d01603efb178f1 100644
+index 67ca28463f5add7c18f7f16b918c3f36f8feeeda..53e773c14689967d5b12467bf209eefb05f7a812 100644
 --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-@@ -208,6 +208,7 @@ public class EntityTrackerEntry {
+@@ -200,6 +200,7 @@ public class EntityTrackerEntry {
                          this.o = 0;
                          packet1 = new PacketPlayOutEntityTeleport(this.tracker);
                      }
@@ -37,7 +37,7 @@ index 37e64e24ca3a90370cdf12e5ff9cd1fceede796b..f63ec5fa5a1cb34f4809a06a29d01603
                  }
  
                  if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
-@@ -301,6 +302,22 @@ public class EntityTrackerEntry {
+@@ -286,6 +287,22 @@ public class EntityTrackerEntry {
  
      }
  
diff --git a/patches/server/0035-Tulips-change-fox-type.patch b/patches/server/0034-Tulips-change-fox-type.patch
similarity index 100%
rename from patches/server/0035-Tulips-change-fox-type.patch
rename to patches/server/0034-Tulips-change-fox-type.patch
diff --git a/patches/server/0036-Breedable-Polar-Bears.patch b/patches/server/0035-Breedable-Polar-Bears.patch
similarity index 100%
rename from patches/server/0036-Breedable-Polar-Bears.patch
rename to patches/server/0035-Breedable-Polar-Bears.patch
diff --git a/patches/server/0037-Chickens-can-retaliate.patch b/patches/server/0036-Chickens-can-retaliate.patch
similarity index 100%
rename from patches/server/0037-Chickens-can-retaliate.patch
rename to patches/server/0036-Chickens-can-retaliate.patch
diff --git a/patches/server/0038-Add-option-to-set-armorstand-step-height.patch b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
similarity index 100%
rename from patches/server/0038-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0037-Add-option-to-set-armorstand-step-height.patch
diff --git a/patches/server/0039-Cat-spawning-options.patch b/patches/server/0038-Cat-spawning-options.patch
similarity index 100%
rename from patches/server/0039-Cat-spawning-options.patch
rename to patches/server/0038-Cat-spawning-options.patch
diff --git a/patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
similarity index 100%
rename from patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
rename to patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
diff --git a/patches/server/0041-Cows-eat-mushrooms.patch b/patches/server/0040-Cows-eat-mushrooms.patch
similarity index 100%
rename from patches/server/0041-Cows-eat-mushrooms.patch
rename to patches/server/0040-Cows-eat-mushrooms.patch
diff --git a/patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0043-Pigs-give-saddle-back.patch b/patches/server/0042-Pigs-give-saddle-back.patch
similarity index 100%
rename from patches/server/0043-Pigs-give-saddle-back.patch
rename to patches/server/0042-Pigs-give-saddle-back.patch
diff --git a/patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
similarity index 100%
rename from patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
diff --git a/patches/server/0045-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch
similarity index 100%
rename from patches/server/0045-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0044-Ender-dragon-always-drop-full-exp.patch
diff --git a/patches/server/0046-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch
similarity index 100%
rename from patches/server/0046-Signs-editable-on-right-click.patch
rename to patches/server/0045-Signs-editable-on-right-click.patch
diff --git a/patches/server/0047-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch
similarity index 96%
rename from patches/server/0047-Signs-allow-color-codes.patch
rename to patches/server/0046-Signs-allow-color-codes.patch
index 2d6e0522d..7d01b0480 100644
--- a/patches/server/0047-Signs-allow-color-codes.patch
+++ b/patches/server/0046-Signs-allow-color-codes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index f59d7e245aa3768004c7f82837a7482260a53406..c337b22a2f8ce5c76a1699956f6c06721046e814 100644
+index 6e3a3a50e01c41b40451bce05015714b5a7fe1e3..43900bb788f4baef420de0782c77d74dd7310f6e 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1579,6 +1579,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index f59d7e245aa3768004c7f82837a7482260a53406..c337b22a2f8ce5c76a1699956f6c0672
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index f5ada346a11ac3becda4b87416beebd680ca16fa..4f094f026b118775cae84024b2ba6c33e14784e6 100644
+index 54327914233580282ee86e46712d1ba0d176bcc4..6451d5a6d491959ea537d11d0dde077578fed381 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -3073,6 +3073,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0048-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 100%
rename from patches/server/0048-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
diff --git a/patches/server/0049-Minecart-settings-and-WASD-controls.patch b/patches/server/0048-Minecart-settings-and-WASD-controls.patch
similarity index 99%
rename from patches/server/0049-Minecart-settings-and-WASD-controls.patch
rename to patches/server/0048-Minecart-settings-and-WASD-controls.patch
index 6129cb8a3..dd2459642 100644
--- a/patches/server/0049-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0048-Minecart-settings-and-WASD-controls.patch
@@ -22,7 +22,7 @@ index 3c51ee00aa53e561c02bb779c7115d8475d70ed7..47381b2a804f1e2296d654933d77c2da
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index c337b22a2f8ce5c76a1699956f6c06721046e814..7fd6c93e7c7cd8f86d06710d39e4431e001bd97b 100644
+index 43900bb788f4baef420de0782c77d74dd7310f6e..01d4aa706f5c1cf35210bbdbf25b4687d110eaa1 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1132,6 +1132,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0050-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
similarity index 100%
rename from patches/server/0050-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
diff --git a/patches/server/0051-Players-should-not-cram-to-death.patch b/patches/server/0050-Players-should-not-cram-to-death.patch
similarity index 91%
rename from patches/server/0051-Players-should-not-cram-to-death.patch
rename to patches/server/0050-Players-should-not-cram-to-death.patch
index a45127b45..359d45791 100644
--- a/patches/server/0051-Players-should-not-cram-to-death.patch
+++ b/patches/server/0050-Players-should-not-cram-to-death.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 7fd6c93e7c7cd8f86d06710d39e4431e001bd97b..0f6760c6922be4a4322ebbc6212b0d88494f5a52 100644
+index 01d4aa706f5c1cf35210bbdbf25b4687d110eaa1..257265a036a62c7d5fbcff17a10a41198ed880a4 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1556,7 +1556,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0052-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 100%
rename from patches/server/0052-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
diff --git a/patches/server/0053-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0053-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0054-Fix-the-dead-lagging-the-server.patch b/patches/server/0053-Fix-the-dead-lagging-the-server.patch
similarity index 100%
rename from patches/server/0054-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0053-Fix-the-dead-lagging-the-server.patch
diff --git a/patches/server/0055-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Skip-events-if-there-s-no-listeners.patch
similarity index 100%
rename from patches/server/0055-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0054-Skip-events-if-there-s-no-listeners.patch
diff --git a/patches/server/0056-Add-permission-for-F3-N-debug.patch b/patches/server/0055-Add-permission-for-F3-N-debug.patch
similarity index 89%
rename from patches/server/0056-Add-permission-for-F3-N-debug.patch
rename to patches/server/0055-Add-permission-for-F3-N-debug.patch
index 1c43ba78a..baea78df5 100644
--- a/patches/server/0056-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0055-Add-permission-for-F3-N-debug.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9360d35581c6961a768973cc31341381ee26e234..c742647c0c5e3e4925e4ee6d195a54a85435e65e 100644
+index 456d87ffb2303867ac1e586078b4f81c059b0e74..92d696ee1812e8cfb8a853b5254db3ef5e4d2266 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1168,6 +1168,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0057-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 100%
rename from patches/server/0057-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
diff --git a/patches/server/0058-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch
similarity index 100%
rename from patches/server/0058-Configurable-TPS-Catchup.patch
rename to patches/server/0057-Configurable-TPS-Catchup.patch
diff --git a/patches/server/0059-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 100%
rename from patches/server/0059-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
diff --git a/patches/server/0060-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
similarity index 100%
rename from patches/server/0060-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
diff --git a/patches/server/0061-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
similarity index 100%
rename from patches/server/0061-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
rename to patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
diff --git a/patches/server/0062-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
similarity index 100%
rename from patches/server/0062-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
rename to patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
diff --git a/patches/server/0063-Villagers-follow-emerald-blocks.patch b/patches/server/0062-Villagers-follow-emerald-blocks.patch
similarity index 100%
rename from patches/server/0063-Villagers-follow-emerald-blocks.patch
rename to patches/server/0062-Villagers-follow-emerald-blocks.patch
diff --git a/patches/server/0064-Allow-leashing-villagers.patch b/patches/server/0063-Allow-leashing-villagers.patch
similarity index 100%
rename from patches/server/0064-Allow-leashing-villagers.patch
rename to patches/server/0063-Allow-leashing-villagers.patch
diff --git a/patches/server/0065-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 100%
rename from patches/server/0065-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch
diff --git a/patches/server/0066-Implement-infinite-lava.patch b/patches/server/0065-Implement-infinite-lava.patch
similarity index 100%
rename from patches/server/0066-Implement-infinite-lava.patch
rename to patches/server/0065-Implement-infinite-lava.patch
diff --git a/patches/server/0067-Make-lava-flow-speed-configurable.patch b/patches/server/0066-Make-lava-flow-speed-configurable.patch
similarity index 100%
rename from patches/server/0067-Make-lava-flow-speed-configurable.patch
rename to patches/server/0066-Make-lava-flow-speed-configurable.patch
diff --git a/patches/server/0068-Add-player-death-exp-control-options.patch b/patches/server/0067-Add-player-death-exp-control-options.patch
similarity index 100%
rename from patches/server/0068-Add-player-death-exp-control-options.patch
rename to patches/server/0067-Add-player-death-exp-control-options.patch
diff --git a/patches/server/0069-Add-canSaveToDisk-to-Entity.patch b/patches/server/0068-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0069-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0068-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0070-Configurable-void-damage-height.patch b/patches/server/0069-Configurable-void-damage-height.patch
similarity index 100%
rename from patches/server/0070-Configurable-void-damage-height.patch
rename to patches/server/0069-Configurable-void-damage-height.patch
diff --git a/patches/server/0071-Dispenser-curse-of-binding-protection.patch b/patches/server/0070-Dispenser-curse-of-binding-protection.patch
similarity index 100%
rename from patches/server/0071-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0070-Dispenser-curse-of-binding-protection.patch
diff --git a/patches/server/0072-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 100%
rename from patches/server/0072-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch
diff --git a/patches/server/0073-Add-obfhelpers-for-plugin-use.patch b/patches/server/0072-Add-obfhelpers-for-plugin-use.patch
similarity index 100%
rename from patches/server/0073-Add-obfhelpers-for-plugin-use.patch
rename to patches/server/0072-Add-obfhelpers-for-plugin-use.patch
diff --git a/patches/server/0074-Mending-mends-most-damages-equipment-first.patch b/patches/server/0073-Mending-mends-most-damages-equipment-first.patch
similarity index 100%
rename from patches/server/0074-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0073-Mending-mends-most-damages-equipment-first.patch
diff --git a/patches/server/0075-Add-5-second-tps-average-in-tps.patch b/patches/server/0074-Add-5-second-tps-average-in-tps.patch
similarity index 100%
rename from patches/server/0075-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0074-Add-5-second-tps-average-in-tps.patch
diff --git a/patches/server/0076-Implement-elytra-settings.patch b/patches/server/0075-Implement-elytra-settings.patch
similarity index 100%
rename from patches/server/0076-Implement-elytra-settings.patch
rename to patches/server/0075-Implement-elytra-settings.patch
diff --git a/patches/server/0077-Item-entity-immunities.patch b/patches/server/0076-Item-entity-immunities.patch
similarity index 96%
rename from patches/server/0077-Item-entity-immunities.patch
rename to patches/server/0076-Item-entity-immunities.patch
index e79764a26..96cbf6748 100644
--- a/patches/server/0077-Item-entity-immunities.patch
+++ b/patches/server/0076-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-index f63ec5fa5a1cb34f4809a06a29d01603efb178f1..b773480baef218d0aab2f524e7e305c18443517d 100644
+index 53e773c14689967d5b12467bf209eefb05f7a812..04c4012d2f57025c28607c12b71cd1737ed7cac5 100644
 --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 @@ -31,6 +31,7 @@ import net.minecraft.world.entity.EntityLiving;
@@ -25,7 +25,7 @@ index f63ec5fa5a1cb34f4809a06a29d01603efb178f1..b773480baef218d0aab2f524e7e305c1
      // Paper start
      private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
  
-@@ -142,6 +143,15 @@ public class EntityTrackerEntry {
+@@ -134,6 +135,15 @@ public class EntityTrackerEntry {
              this.c();
          }
  
@@ -42,16 +42,16 @@ index f63ec5fa5a1cb34f4809a06a29d01603efb178f1..b773480baef218d0aab2f524e7e305c1
              int i;
              int j;
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 737851cde7752e7cccf226f1868a38d6411bfb31..ae32fe66a70d583993fe81de4c95b7b2fe8a6fc8 100644
+index 914c7a1b18151f29183cfe9474313ce18e7c4ae2..12c0a0cebc9db542a654ff2a2826f1bcf4a72baa 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-@@ -2457,7 +2457,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2432,7 +2432,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class EntityTracker {
  
 -        final EntityTrackerEntry trackerEntry; // Paper - private -> package private
-+        public final EntityTrackerEntry trackerEntry; // Paper - private -> public
-         public final Entity tracker; // Airplane - public for chunk
++        public final EntityTrackerEntry trackerEntry; // Paper - private -> package private // Purpur -> public
+         private final Entity tracker;
          private final int trackingDistance;
          private SectionPosition e;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
diff --git a/patches/server/0078-Add-ping-command.patch b/patches/server/0077-Add-ping-command.patch
similarity index 100%
rename from patches/server/0078-Add-ping-command.patch
rename to patches/server/0077-Add-ping-command.patch
diff --git a/patches/server/0079-Configurable-jockey-options.patch b/patches/server/0078-Configurable-jockey-options.patch
similarity index 100%
rename from patches/server/0079-Configurable-jockey-options.patch
rename to patches/server/0078-Configurable-jockey-options.patch
diff --git a/patches/server/0080-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/server/0080-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/server/0081-Add-phantom-spawning-options.patch b/patches/server/0080-Add-phantom-spawning-options.patch
similarity index 100%
rename from patches/server/0081-Add-phantom-spawning-options.patch
rename to patches/server/0080-Add-phantom-spawning-options.patch
diff --git a/patches/server/0082-Implement-bed-explosion-options.patch b/patches/server/0081-Implement-bed-explosion-options.patch
similarity index 100%
rename from patches/server/0082-Implement-bed-explosion-options.patch
rename to patches/server/0081-Implement-bed-explosion-options.patch
diff --git a/patches/server/0083-Implement-respawn-anchor-explosion-options.patch b/patches/server/0082-Implement-respawn-anchor-explosion-options.patch
similarity index 100%
rename from patches/server/0083-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0082-Implement-respawn-anchor-explosion-options.patch
diff --git a/patches/server/0084-Add-allow-water-in-end-world-option.patch b/patches/server/0083-Add-allow-water-in-end-world-option.patch
similarity index 100%
rename from patches/server/0084-Add-allow-water-in-end-world-option.patch
rename to patches/server/0083-Add-allow-water-in-end-world-option.patch
diff --git a/patches/server/0085-Allow-color-codes-in-books.patch b/patches/server/0084-Allow-color-codes-in-books.patch
similarity index 96%
rename from patches/server/0085-Allow-color-codes-in-books.patch
rename to patches/server/0084-Allow-color-codes-in-books.patch
index a9a4c0b81..e3028bf3c 100644
--- a/patches/server/0085-Allow-color-codes-in-books.patch
+++ b/patches/server/0084-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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 4f094f026b118775cae84024b2ba6c33e14784e6..c4ef3fef4db2326a531694e6798bab6103c7061c 100644
+index 6451d5a6d491959ea537d11d0dde077578fed381..e63e7f30db64d30840037d996c153822ce80fbbd 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1211,7 +1211,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0086-Entity-lifespan.patch b/patches/server/0085-Entity-lifespan.patch
similarity index 98%
rename from patches/server/0086-Entity-lifespan.patch
rename to patches/server/0085-Entity-lifespan.patch
index 6f7ffe99d..4d7387092 100644
--- a/patches/server/0086-Entity-lifespan.patch
+++ b/patches/server/0085-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index c4ef3fef4db2326a531694e6798bab6103c7061c..92437cf4413ea76ef139b007adf2b76c2729dad2 100644
+index e63e7f30db64d30840037d996c153822ce80fbbd..1c7579a1426c831484fe095d13169c2c47906843 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2458,6 +2458,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0087-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 97%
rename from patches/server/0087-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index b03c0c880..45dee0221 100644
--- a/patches/server/0087-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 0f6760c6922be4a4322ebbc6212b0d88494f5a52..53c2bb5af825255e8c786bf02052f41c5d3e270b 100644
+index 257265a036a62c7d5fbcff17a10a41198ed880a4..da708df0dc50ea02441f9db2bfd52f04d9a8e3da 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -2556,4 +2556,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0088-Squid-EAR-immunity.patch b/patches/server/0087-Squid-EAR-immunity.patch
similarity index 100%
rename from patches/server/0088-Squid-EAR-immunity.patch
rename to patches/server/0087-Squid-EAR-immunity.patch
diff --git a/patches/server/0089-Configurable-end-spike-seed.patch b/patches/server/0088-Configurable-end-spike-seed.patch
similarity index 100%
rename from patches/server/0089-Configurable-end-spike-seed.patch
rename to patches/server/0088-Configurable-end-spike-seed.patch
diff --git a/patches/server/0090-Configurable-dungeon-seed.patch b/patches/server/0089-Configurable-dungeon-seed.patch
similarity index 100%
rename from patches/server/0090-Configurable-dungeon-seed.patch
rename to patches/server/0089-Configurable-dungeon-seed.patch
diff --git a/patches/server/0091-Phantoms-burn-in-light.patch b/patches/server/0090-Phantoms-burn-in-light.patch
similarity index 100%
rename from patches/server/0091-Phantoms-burn-in-light.patch
rename to patches/server/0090-Phantoms-burn-in-light.patch
diff --git a/patches/server/0092-Configurable-villager-breeding.patch b/patches/server/0091-Configurable-villager-breeding.patch
similarity index 100%
rename from patches/server/0092-Configurable-villager-breeding.patch
rename to patches/server/0091-Configurable-villager-breeding.patch
diff --git a/patches/server/0093-Redstone-deactivates-spawners.patch b/patches/server/0092-Redstone-deactivates-spawners.patch
similarity index 100%
rename from patches/server/0093-Redstone-deactivates-spawners.patch
rename to patches/server/0092-Redstone-deactivates-spawners.patch
diff --git a/patches/server/0094-Totems-work-in-inventory.patch b/patches/server/0093-Totems-work-in-inventory.patch
similarity index 100%
rename from patches/server/0094-Totems-work-in-inventory.patch
rename to patches/server/0093-Totems-work-in-inventory.patch
diff --git a/patches/server/0095-Populator-seed-controls.patch b/patches/server/0094-Populator-seed-controls.patch
similarity index 100%
rename from patches/server/0095-Populator-seed-controls.patch
rename to patches/server/0094-Populator-seed-controls.patch
diff --git a/patches/server/0096-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0095-Add-vindicator-johnny-spawn-chance.patch
similarity index 100%
rename from patches/server/0096-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0095-Add-vindicator-johnny-spawn-chance.patch
diff --git a/patches/server/0097-Add-option-to-disable-mushroom-and-note-block-update.patch b/patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch
similarity index 100%
rename from patches/server/0097-Add-option-to-disable-mushroom-and-note-block-update.patch
rename to patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch
diff --git a/patches/server/0098-Dispensers-place-anvils-option.patch b/patches/server/0097-Dispensers-place-anvils-option.patch
similarity index 100%
rename from patches/server/0098-Dispensers-place-anvils-option.patch
rename to patches/server/0097-Dispensers-place-anvils-option.patch
diff --git a/patches/server/0099-Allow-anvil-colors.patch b/patches/server/0098-Allow-anvil-colors.patch
similarity index 100%
rename from patches/server/0099-Allow-anvil-colors.patch
rename to patches/server/0098-Allow-anvil-colors.patch
diff --git a/patches/server/0100-Add-no-random-tick-block-list.patch b/patches/server/0099-Add-no-random-tick-block-list.patch
similarity index 100%
rename from patches/server/0100-Add-no-random-tick-block-list.patch
rename to patches/server/0099-Add-no-random-tick-block-list.patch
diff --git a/patches/server/0101-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 100%
rename from patches/server/0101-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch
diff --git a/patches/server/0102-Short-enderman-height.patch b/patches/server/0101-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0102-Short-enderman-height.patch
rename to patches/server/0101-Short-enderman-height.patch
diff --git a/patches/server/0103-Stop-squids-floating-on-top-of-water.patch b/patches/server/0102-Stop-squids-floating-on-top-of-water.patch
similarity index 100%
rename from patches/server/0103-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0102-Stop-squids-floating-on-top-of-water.patch
diff --git a/patches/server/0104-Ridables.patch b/patches/server/0103-Ridables.patch
similarity index 99%
rename from patches/server/0104-Ridables.patch
rename to patches/server/0103-Ridables.patch
index 31616d053..6da401c69 100644
--- a/patches/server/0104-Ridables.patch
+++ b/patches/server/0103-Ridables.patch
@@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..8b66d1215a6eef1302b5ecb46a4b3d50
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 53c2bb5af825255e8c786bf02052f41c5d3e270b..af0253aecc8f3a4125b37aed4548c13b7ad6260a 100644
+index da708df0dc50ea02441f9db2bfd52f04d9a8e3da..867a6b7fe1788b20f8d0f4f1e42dd52bfc6a8c2a 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -642,6 +642,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -100,7 +100,7 @@ index 9fce5ff2a7980a02510fdc5d1e45d39336d1542a..535cd9faeeb8072b395bff7a3f7ca095
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 92437cf4413ea76ef139b007adf2b76c2729dad2..07541f23ee853dae137440129e600d345774cd90 100644
+index 1c7579a1426c831484fe095d13169c2c47906843..59eedbe9d249fd09673393651a8be76232ab16e9 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2467,6 +2467,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0105-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0104-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server/0105-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0104-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server/0106-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0106-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0107-Entities-can-use-portals-configuration.patch b/patches/server/0106-Entities-can-use-portals-configuration.patch
similarity index 100%
rename from patches/server/0107-Entities-can-use-portals-configuration.patch
rename to patches/server/0106-Entities-can-use-portals-configuration.patch
diff --git a/patches/server/0108-LivingEntity-broadcastItemBreak.patch b/patches/server/0107-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0108-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0107-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0109-Customizable-wither-health-and-healing.patch b/patches/server/0108-Customizable-wither-health-and-healing.patch
similarity index 100%
rename from patches/server/0109-Customizable-wither-health-and-healing.patch
rename to patches/server/0108-Customizable-wither-health-and-healing.patch
diff --git a/patches/server/0110-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 100%
rename from patches/server/0110-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch
diff --git a/patches/server/0111-Raid-cooldown-setting.patch b/patches/server/0110-Raid-cooldown-setting.patch
similarity index 100%
rename from patches/server/0111-Raid-cooldown-setting.patch
rename to patches/server/0110-Raid-cooldown-setting.patch
diff --git a/patches/server/0112-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch
similarity index 100%
rename from patches/server/0112-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch
diff --git a/patches/server/0113-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/server/0113-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/server/0114-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0114-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0115-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0114-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0115-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0114-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0116-Flying-squids-Oh-my.patch b/patches/server/0115-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server/0116-Flying-squids-Oh-my.patch
rename to patches/server/0115-Flying-squids-Oh-my.patch
diff --git a/patches/server/0117-Infinity-bow-settings.patch b/patches/server/0116-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server/0117-Infinity-bow-settings.patch
rename to patches/server/0116-Infinity-bow-settings.patch
diff --git a/patches/server/0118-Stonecutter-damage.patch b/patches/server/0117-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0118-Stonecutter-damage.patch
rename to patches/server/0117-Stonecutter-damage.patch
diff --git a/patches/server/0119-Configurable-daylight-cycle.patch b/patches/server/0118-Configurable-daylight-cycle.patch
similarity index 100%
rename from patches/server/0119-Configurable-daylight-cycle.patch
rename to patches/server/0118-Configurable-daylight-cycle.patch
diff --git a/patches/server/0120-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0120-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0121-Infinite-fuel-furnace.patch b/patches/server/0120-Infinite-fuel-furnace.patch
similarity index 100%
rename from patches/server/0121-Infinite-fuel-furnace.patch
rename to patches/server/0120-Infinite-fuel-furnace.patch
diff --git a/patches/server/0122-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0121-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0122-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0121-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0123-Add-tablist-suffix-option-for-afk.patch b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch
similarity index 96%
rename from patches/server/0123-Add-tablist-suffix-option-for-afk.patch
rename to patches/server/0122-Add-tablist-suffix-option-for-afk.patch
index f84593dc7..2e79efc1b 100644
--- a/patches/server/0123-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index af0253aecc8f3a4125b37aed4548c13b7ad6260a..38254784de3165e8546e1fcd4f780741abb78558 100644
+index 867a6b7fe1788b20f8d0f4f1e42dd52bfc6a8c2a..3f29cc87faa85f857c5fe2b8457d7c96d05515bc 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -2122,7 +2122,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0124-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 100%
rename from patches/server/0124-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
diff --git a/patches/server/0125-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 100%
rename from patches/server/0125-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch
diff --git a/patches/server/0126-Make-entity-breeding-times-configurable.patch b/patches/server/0125-Make-entity-breeding-times-configurable.patch
similarity index 100%
rename from patches/server/0126-Make-entity-breeding-times-configurable.patch
rename to patches/server/0125-Make-entity-breeding-times-configurable.patch
diff --git a/patches/server/0127-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from patches/server/0127-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/patches/server/0128-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 100%
rename from patches/server/0128-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
diff --git a/patches/server/0129-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 100%
rename from patches/server/0129-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch
diff --git a/patches/server/0130-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 100%
rename from patches/server/0130-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
diff --git a/patches/server/0131-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 100%
rename from patches/server/0131-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
diff --git a/patches/server/0132-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0131-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 100%
rename from patches/server/0132-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/server/0131-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
diff --git a/patches/server/0133-Add-configurable-snowball-damage.patch b/patches/server/0132-Add-configurable-snowball-damage.patch
similarity index 100%
rename from patches/server/0133-Add-configurable-snowball-damage.patch
rename to patches/server/0132-Add-configurable-snowball-damage.patch
diff --git a/patches/server/0134-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch
similarity index 100%
rename from patches/server/0134-Zombie-break-door-minimum-difficulty-option.patch
rename to patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch
diff --git a/patches/server/0135-Add-demo-command.patch b/patches/server/0134-Add-demo-command.patch
similarity index 100%
rename from patches/server/0135-Add-demo-command.patch
rename to patches/server/0134-Add-demo-command.patch
diff --git a/patches/server/0136-Left-handed-API.patch b/patches/server/0135-Left-handed-API.patch
similarity index 100%
rename from patches/server/0136-Left-handed-API.patch
rename to patches/server/0135-Left-handed-API.patch
diff --git a/patches/server/0137-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/server/0136-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
similarity index 100%
rename from patches/server/0137-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
rename to patches/server/0136-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
diff --git a/patches/server/0138-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch
similarity index 100%
rename from patches/server/0138-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch
diff --git a/patches/server/0139-Add-boat-fall-damage-config.patch b/patches/server/0138-Add-boat-fall-damage-config.patch
similarity index 97%
rename from patches/server/0139-Add-boat-fall-damage-config.patch
rename to patches/server/0138-Add-boat-fall-damage-config.patch
index e4a43e216..a8f9012a3 100644
--- a/patches/server/0139-Add-boat-fall-damage-config.patch
+++ b/patches/server/0138-Add-boat-fall-damage-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 38254784de3165e8546e1fcd4f780741abb78558..8010b0c68b99c2e8986d01a4635e1a37f4313dbe 100644
+index 3f29cc87faa85f857c5fe2b8457d7c96d05515bc..a1d5662911ee3a038da427bf2e0b69a11f187149 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1141,7 +1141,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0140-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch
similarity index 100%
rename from patches/server/0140-Config-migration-disable-saving-projectiles-to-disk-.patch
rename to patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch
diff --git a/patches/server/0141-Snow-Golem-rate-of-fire-config.patch b/patches/server/0140-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server/0141-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0140-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server/0142-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0141-PaperPR-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0142-PaperPR-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0141-PaperPR-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0143-EMC-Configurable-disable-give-dropping.patch b/patches/server/0142-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0143-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0142-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0144-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch
similarity index 100%
rename from patches/server/0144-Config-migration-climbing-should-not-bypass-cramming.patch
rename to patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch
diff --git a/patches/server/0145-Lobotomize-stuck-villagers.patch b/patches/server/0144-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/server/0145-Lobotomize-stuck-villagers.patch
rename to patches/server/0144-Lobotomize-stuck-villagers.patch
diff --git a/patches/server/0146-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server/0146-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server/0147-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server/0147-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server/0148-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0147-Spread-out-and-optimise-player-list-ticks.patch
similarity index 97%
rename from patches/server/0148-Spread-out-and-optimise-player-list-ticks.patch
rename to patches/server/0147-Spread-out-and-optimise-player-list-ticks.patch
index 31a9dd026..528f599df 100644
--- a/patches/server/0148-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server/0147-Spread-out-and-optimise-player-list-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c742647c0c5e3e4925e4ee6d195a54a85435e65e..8307b44718198f6f2325454f72bd296c33cba58a 100644
+index 92d696ee1812e8cfb8a853b5254db3ef5e4d2266..1f07751bf67b9fd1a0f19ebc8d05fd16a6c24322 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -151,7 +151,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0149-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 100%
rename from patches/server/0149-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch
diff --git a/patches/server/0150-Configurable-default-wolf-collar-color.patch b/patches/server/0149-Configurable-default-wolf-collar-color.patch
similarity index 100%
rename from patches/server/0150-Configurable-default-wolf-collar-color.patch
rename to patches/server/0149-Configurable-default-wolf-collar-color.patch
diff --git a/patches/server/0151-Configurable-entity-base-attributes.patch b/patches/server/0150-Configurable-entity-base-attributes.patch
similarity index 100%
rename from patches/server/0151-Configurable-entity-base-attributes.patch
rename to patches/server/0150-Configurable-entity-base-attributes.patch
diff --git a/patches/server/0152-Phantom-flames-on-swoop.patch b/patches/server/0151-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server/0152-Phantom-flames-on-swoop.patch
rename to patches/server/0151-Phantom-flames-on-swoop.patch
diff --git a/patches/server/0153-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server/0153-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server/0154-Implement-TPSBar.patch b/patches/server/0153-Implement-TPSBar.patch
similarity index 98%
rename from patches/server/0154-Implement-TPSBar.patch
rename to patches/server/0153-Implement-TPSBar.patch
index 6094ad5be..b8d6c31a8 100644
--- a/patches/server/0154-Implement-TPSBar.patch
+++ b/patches/server/0153-Implement-TPSBar.patch
@@ -42,7 +42,7 @@ index a76219e59c24862b9c1e09e4a2a29cf2a6260514..4f7fed0418df17b80cb41e16bb1978c5
          }
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8307b44718198f6f2325454f72bd296c33cba58a..c1f86c5cb6cf4c42dbc972f9ec14efa8452bad91 100644
+index 1f07751bf67b9fd1a0f19ebc8d05fd16a6c24322..33ef9699fdcf5dfd2ecaa53cb6388adb13da1697 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -598,6 +598,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0155-Striders-give-saddle-back.patch b/patches/server/0154-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server/0155-Striders-give-saddle-back.patch
rename to patches/server/0154-Striders-give-saddle-back.patch
diff --git a/patches/server/0156-PlayerBookTooLargeEvent.patch b/patches/server/0155-PlayerBookTooLargeEvent.patch
similarity index 96%
rename from patches/server/0156-PlayerBookTooLargeEvent.patch
rename to patches/server/0155-PlayerBookTooLargeEvent.patch
index 8a815c6ef..aa684ec4d 100644
--- a/patches/server/0156-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0155-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 07541f23ee853dae137440129e600d345774cd90..5a2f84cd1456b072084e2db53a24c9863cb75563 100644
+index 59eedbe9d249fd09673393651a8be76232ab16e9..f55485094a5b676d8051d1f8d3151340bf176b33 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1123,6 +1123,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0157-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/server/0157-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/server/0158-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0157-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0158-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0157-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0159-Add-MC-4-fix-back.patch b/patches/server/0158-Add-MC-4-fix-back.patch
similarity index 100%
rename from patches/server/0159-Add-MC-4-fix-back.patch
rename to patches/server/0158-Add-MC-4-fix-back.patch
diff --git a/patches/server/0160-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 100%
rename from patches/server/0160-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch
diff --git a/patches/server/0161-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0161-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0162-Add-EntityTeleportHinderedEvent.patch b/patches/server/0161-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/server/0162-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0161-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/server/0163-Add-StructureGenerateEvent.patch b/patches/server/0162-Add-StructureGenerateEvent.patch
similarity index 100%
rename from patches/server/0163-Add-StructureGenerateEvent.patch
rename to patches/server/0162-Add-StructureGenerateEvent.patch
diff --git a/patches/server/0164-Farmland-trampling-changes.patch b/patches/server/0163-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0164-Farmland-trampling-changes.patch
rename to patches/server/0163-Farmland-trampling-changes.patch
diff --git a/patches/server/0165-Movement-options-for-armor-stands.patch b/patches/server/0164-Movement-options-for-armor-stands.patch
similarity index 100%
rename from patches/server/0165-Movement-options-for-armor-stands.patch
rename to patches/server/0164-Movement-options-for-armor-stands.patch
diff --git a/patches/server/0166-Fix-stuck-in-portals.patch b/patches/server/0165-Fix-stuck-in-portals.patch
similarity index 96%
rename from patches/server/0166-Fix-stuck-in-portals.patch
rename to patches/server/0165-Fix-stuck-in-portals.patch
index a744a3775..419f6e292 100644
--- a/patches/server/0166-Fix-stuck-in-portals.patch
+++ b/patches/server/0165-Fix-stuck-in-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 8010b0c68b99c2e8986d01a4635e1a37f4313dbe..ea9523fc977ec4a96bf113c33d0f9643f0cf7419 100644
+index a1d5662911ee3a038da427bf2e0b69a11f187149..9c520e7600986b7b7df3af96a715c91c5347f30d 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0167-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/0167-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/0168-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/0168-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0167-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0169-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/0169-Config-to-always-tame-in-Creative.patch
rename to patches/server/0168-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0170-End-crystal-explosion-options.patch b/patches/server/0169-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0170-End-crystal-explosion-options.patch
rename to patches/server/0169-End-crystal-explosion-options.patch
diff --git a/patches/server/0171-Add-unsafe-Entity-serialization-API.patch b/patches/server/0170-Add-unsafe-Entity-serialization-API.patch
similarity index 100%
rename from patches/server/0171-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0170-Add-unsafe-Entity-serialization-API.patch
diff --git a/patches/server/0172-Add-ghast-allow-griefing-option.patch b/patches/server/0171-Add-ghast-allow-griefing-option.patch
similarity index 100%
rename from patches/server/0172-Add-ghast-allow-griefing-option.patch
rename to patches/server/0171-Add-ghast-allow-griefing-option.patch
diff --git a/patches/server/0173-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/0173-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
diff --git a/patches/server/0174-Dont-run-with-scissors.patch b/patches/server/0173-Dont-run-with-scissors.patch
similarity index 96%
rename from patches/server/0174-Dont-run-with-scissors.patch
rename to patches/server/0173-Dont-run-with-scissors.patch
index d62102241..7fba08d0f 100644
--- a/patches/server/0174-Dont-run-with-scissors.patch
+++ b/patches/server/0173-Dont-run-with-scissors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 5a2f84cd1456b072084e2db53a24c9863cb75563..40ad7f050b7f11f2810b07970c9e29354525de98 100644
+index f55485094a5b676d8051d1f8d3151340bf176b33..03a61aa91191b44284e9b4d02f2c57eaf2de7105 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1547,6 +1547,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/patches/server/0175-One-Punch-Man.patch b/patches/server/0174-One-Punch-Man.patch
similarity index 100%
rename from patches/server/0175-One-Punch-Man.patch
rename to patches/server/0174-One-Punch-Man.patch
diff --git a/patches/server/0176-Add-config-for-snow-on-blue-ice.patch b/patches/server/0175-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0176-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0175-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0176-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0176-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0177-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 96%
rename from patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0177-Config-to-ignore-nearby-mobs-when-sleeping.patch
index 62adf4ee4..80bc5392f 100644
--- a/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0177-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index ea9523fc977ec4a96bf113c33d0f9643f0cf7419..9e2c11fb728af209207627331c0acc98314ca125 100644
+index 9c520e7600986b7b7df3af96a715c91c5347f30d..4ec18d28c0022614b0ef6900774ddd4bda814308 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1441,7 +1441,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch b/patches/server/0178-Config-for-Enderman-to-aggro-spawned-Endermites.patch
similarity index 100%
rename from patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch
rename to patches/server/0178-Config-for-Enderman-to-aggro-spawned-Endermites.patch
diff --git a/patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0179-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0179-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0181-Re-enable-timings-by-default.patch b/patches/server/0180-Re-enable-timings-by-default.patch
similarity index 100%
rename from patches/server/0181-Re-enable-timings-by-default.patch
rename to patches/server/0180-Re-enable-timings-by-default.patch
diff --git a/patches/server/0182-Tick-fluids-config.patch b/patches/server/0181-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0182-Tick-fluids-config.patch
rename to patches/server/0181-Tick-fluids-config.patch
diff --git a/patches/server/0183-Config-to-disable-Llama-caravans.patch b/patches/server/0182-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0183-Config-to-disable-Llama-caravans.patch
rename to patches/server/0182-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0183-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0184-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0183-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0185-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0184-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0185-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0184-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0186-Sneak-to-bulk-process-composter.patch b/patches/server/0185-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0186-Sneak-to-bulk-process-composter.patch
rename to patches/server/0185-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0187-Config-for-skipping-night.patch b/patches/server/0186-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0187-Config-for-skipping-night.patch
rename to patches/server/0186-Config-for-skipping-night.patch
diff --git a/patches/server/0188-Add-config-for-villager-trading.patch b/patches/server/0187-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0188-Add-config-for-villager-trading.patch
rename to patches/server/0187-Add-config-for-villager-trading.patch
diff --git a/patches/server/0189-Allow-infinity-on-crossbows.patch b/patches/server/0188-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0189-Allow-infinity-on-crossbows.patch
rename to patches/server/0188-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0190-Drowning-Settings.patch b/patches/server/0189-Drowning-Settings.patch
similarity index 100%
rename from patches/server/0190-Drowning-Settings.patch
rename to patches/server/0189-Drowning-Settings.patch
diff --git a/patches/server/0191-Break-individual-slabs-when-sneaking.patch b/patches/server/0190-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0191-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0190-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0191-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0191-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0192-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0192-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0194-Option-to-make-doors-require-redstone.patch b/patches/server/0193-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0194-Option-to-make-doors-require-redstone.patch
rename to patches/server/0193-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0195-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0194-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0195-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0194-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0196-Configurable-sponge-absorption.patch b/patches/server/0195-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0196-Configurable-sponge-absorption.patch
rename to patches/server/0195-Configurable-sponge-absorption.patch
diff --git a/patches/server/0197-Projectile-offset-config.patch b/patches/server/0196-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0197-Projectile-offset-config.patch
rename to patches/server/0196-Projectile-offset-config.patch
diff --git a/patches/server/0198-Config-for-powered-rail-activation-distance.patch b/patches/server/0197-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0198-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0197-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0199-Piglin-portal-spawn-modifier.patch b/patches/server/0198-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0199-Piglin-portal-spawn-modifier.patch
rename to patches/server/0198-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0200-Config-to-change-max-number-of-bees.patch b/patches/server/0199-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0200-Config-to-change-max-number-of-bees.patch
rename to patches/server/0199-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0201-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0200-Configurable-damage-settings-for-magma-blocks.patch
similarity index 100%
rename from patches/server/0201-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0200-Configurable-damage-settings-for-magma-blocks.patch
diff --git a/patches/server/0202-Config-for-wither-explosion-radius.patch b/patches/server/0201-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0202-Config-for-wither-explosion-radius.patch
rename to patches/server/0201-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0203-Add-credits-command.patch b/patches/server/0202-Add-credits-command.patch
similarity index 100%
rename from patches/server/0203-Add-credits-command.patch
rename to patches/server/0202-Add-credits-command.patch
diff --git a/patches/server/0204-Gamemode-extra-permissions.patch b/patches/server/0203-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0204-Gamemode-extra-permissions.patch
rename to patches/server/0203-Gamemode-extra-permissions.patch