From e481692afdb08c4486866bc856919c585d6d9646 Mon Sep 17 00:00:00 2001
From: Jake <jake.m.potrebic@gmail.com>
Date: Tue, 23 Nov 2021 17:09:49 -0800
Subject: [PATCH] move extra plugins patch up & more work

---
 ...option-to-load-extra-plugin-jars-no.patch} | 46 +++++++++---------
 ...7-Adventure.patch => 0008-Adventure.patch} | 48 ++++++++++---------
 ...=> 0009-Player-affects-spawning-API.patch} |  0
 ...hod.patch => 0010-Add-getTPS-method.patch} |  8 ++--
 ...0.patch => 0011-Version-Command-2.0.patch} |  0
 ...API.patch => 0012-Entity-Origin-API.patch} |  0
 ...=> 0013-Add-PlayerLocaleChangeEvent.patch} |  0
 ...patch => 0014-Add-view-distance-API.patch} |  0
 ...patch => 0015-Add-BeaconEffectEvent.patch} |  0
 ...=> 0016-Add-PlayerInitialSpawnEvent.patch} |  0
 ...y-disable-plugins-that-fail-to-load.patch} |  2 +-
 ...ch => 0018-Expose-server-CommandMap.patch} |  8 ++--
 ...ord-chat-API-from-spigot-subclasses.patch} |  8 ++--
 ... 0020-Add-exception-reporting-event.patch} | 10 ++--
 ...-sendMessage-methods-to-CommandSend.patch} |  0
 ...rverListPingEvent-flagging-as-Async.patch} |  0
 ...0023-Player-Tab-List-and-Title-APIs.patch} |  0
 ...orking-with-arrows-stuck-in-living-.patch} |  0
 ... => 0025-Complete-resource-pack-API.patch} |  0
 ...=> 0026-Use-ASM-for-event-executors.patch} |  2 +-
 ... => 0027-Add-a-call-helper-to-Event.patch} |  0
 ...er-name-to-commands.yml-replacement.patch} |  0
 ...load-permissions.yml-and-require-co.patch} | 12 ++---
 ...-Custom-replacement-for-eaten-items.patch} |  0
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...t.patch => 0032-EntityPathfindEvent.patch} |  0
 ...ynchronization-in-MetadataStoreBase.patch} |  0
 ...-MetadataStoreBase.removeAll-Plugin.patch} |  0
 ...035-Add-PlayerUseUnknownEntityEvent.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...patch => 0037-Arrow-pickup-rule-API.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...ble-API.patch => 0039-LootTable-API.patch} |  0
 ...nt.patch => 0040-Add-EntityZapEvent.patch} |  0
 ...Misc-Utils.patch => 0041-Misc-Utils.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  8 ++--
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  0
 ... => 0044-Add-ProjectileCollideEvent.patch} |  0
 ...045-Add-String-based-Action-Bar-API.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...nt.patch => 0047-IllegalPacketEvent.patch} |  0
 ...API-s.patch => 0048-Fireworks-API-s.patch} |  0
 ... 0049-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...rldBorder-isInBounds-Location-check.patch} |  0
 ...-option-to-prevent-player-names-fro.patch} |  8 ++--
 ...patch => 0054-Fix-upstream-javadocs.patch} |  8 ++--
 ....patch => 0055-Item-canEntityPickup.patch} |  0
 ...> 0056-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0057-Add-UnknownCommandEvent.patch} |  0
 ...tch => 0058-Basic-PlayerProfile-API.patch} |  8 ++--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ... 0060-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0061-Entity-fromMobSpawner.patch} |  0
 ...patch => 0062-Profile-Lookup-Events.patch} |  0
 ...3-Improve-the-Saddle-API-for-Horses.patch} |  0
 ... => 0064-Add-getI18NDisplayName-API.patch} |  0
 ...=> 0065-ensureServerConversions-API.patch} |  0
 ...0066-Make-plugins-list-alphabetical.patch} |  0
 ...atch => 0067-LivingEntity-setKiller.patch} |  0
 ...=> 0068-ProfileWhitelistVerifyEvent.patch} |  0
 ...ow-plugins-to-use-SLF4J-for-logging.patch} |  0
 ...fixes-in-implementation-logging-con.patch} |  0
 ...t.patch => 0071-Add-PlayerJumpEvent.patch} |  0
 ...r-plugins-modifying-the-parent-of-t.patch} |  0
 ... => 0073-Add-PlayerArmorChangeEvent.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  2 +-
 ...patch => 0075-AsyncTabCompleteEvent.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  2 +-
 ...ay-warning-on-deprecated-recipe-API.patch} |  0
 ...=> 0078-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0079-ExperienceOrbMergeEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...patch => 0081-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0084-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0086-Add-ArmorStand-Item-Meta.patch} |  0
 ...pers.patch => 0087-Optimize-Hoppers.patch} |  0
 ... 0088-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...d-extended-PaperServerListPingEvent.patch} |  0
 ...=> 0091-Player.setPlayerProfile-API.patch} |  0
 ...patch => 0092-getPlayerUniqueId-API.patch} |  8 ++--
 ...support-to-PaperServerListPingEvent.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...5-Add-Ban-Methods-to-Player-Objects.patch} |  0
 ...t.patch => 0096-EndermanEscapeEvent.patch} |  0
 ...h => 0097-Enderman.teleportRandomly.patch} |  0
 ...ional-world.getNearbyEntities-API-s.patch} |  0
 ... => 0099-Location.isChunkLoaded-API.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0101-EndermanAttackPlayerEvent.patch} |  0
 ...ose-Plugin-Class-Loaders-on-Disable.patch} |  6 +--
 ...tch => 0103-WitchConsumePotionEvent.patch} |  0
 ...patch => 0104-WitchThrowPotionEvent.patch} |  0
 ...on.toBlockLocation-toCenterLocation.patch} |  0
 ... => 0106-PotionEffect-clone-methods.patch} |  0
 ...patch => 0107-WitchReadyPotionEvent.patch} |  0
 ...108-ItemStack-getMaxItemUseDuration.patch} |  0
 ...9-Add-EntityTeleportEndGatewayEvent.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  0
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  0
 ...dd-getNearbyXXX-methods-to-Location.patch} |  0
 ...patch => 0113-PlayerReadyArrowEvent.patch} |  0
 ...14-Add-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0115-Expand-Explosions-API.patch} |  0
 ...I-additions-for-quantity-flags-lore.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0118-RangedEntity-API.patch} |  0
 ...> 0119-Add-World.getEntity-UUID-API.patch} |  0
 ...0120-InventoryCloseEvent-Reason-API.patch} |  0
 ...21-Allow-setting-the-vex-s-summoner.patch} |  0
 ...I.patch => 0122-Entity-getChunk-API.patch} |  0
 ...d-an-asterisk-to-legacy-API-plugins.patch} |  2 +-
 ...ts.patch => 0124-EnderDragon-Events.patch} |  0
 ...atch => 0125-PlayerElytraBoostEvent.patch} |  0
 ...=> 0126-PlayerLaunchProjectileEvent.patch} |  0
 ...atch => 0127-EntityTransformedEvent.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  0
 ...tch => 0129-SkeletonHorse-Additions.patch} |  0
 ...30-Expand-Location-Manipulation-API.patch} |  0
 ...patch => 0131-Expand-ArmorStand-API.patch} |  0
 ...vent.patch => 0132-AnvilDamageEvent.patch} |  0
 ...eadlock-risk-in-firing-async-events.patch} | 12 ++---
 ...h => 0134-Add-hand-to-bucket-events.patch} |  0
 ...ent.patch => 0135-Add-TNTPrimeEvent.patch} |  0
 ...ide-Chunk-Coordinates-as-a-Long-API.patch} |  0
 ...=> 0137-Make-EnderDragon-extend-Mob.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...ots-for-Timings-Tile-Entity-reports.patch} |  0
 ...locks-to-be-accessed-via-a-long-key.patch} |  0
 ...tch => 0141-Slime-Pathfinder-Events.patch} |  0
 ...ch => 0142-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0143-Add-More-Creeper-API.patch} |  0
 ...=> 0144-Inventory-removeItemAnySlot.patch} |  0
 ....patch => 0145-isChunkGenerated-API.patch} |  0
 ...constructor-and-getChangedBlockData.patch} |  0
 ...-API.patch => 0147-Async-Chunks-API.patch} |  4 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0150-Improve-death-events.patch} |  0
 ...I.patch => 0151-Mob-Pathfinding-API.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...urrency-Improvements-to-Permissions.patch} |  0
 ...Add-ItemStackRecipeChoice-Draft-API.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...atch => 0156-Material-API-additions.patch} |  0
 ...ags.patch => 0157-Add-Material-Tags.patch} |  0
 ....patch => 0158-PreSpawnerSpawnEvent.patch} |  0
 ...59-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0160-Add-sun-related-API.patch} |  0
 ...-Johnny.patch => 0161-Here-s-Johnny.patch} |  0
 ...Turtle-API.patch => 0162-Turtle-API.patch} |  0
 ...=> 0163-Add-spectator-target-events.patch} |  0
 ...PI.patch => 0164-Add-more-Witch-API.patch} |  0
 ...ult-permission-message-configurable.patch} |  8 ++--
 ...ion-supression-of-EntityDismount-Ve.patch} |  0
 ...I.patch => 0167-Add-more-Zombie-API.patch} |  0
 ...served-channel-check-to-be-sensible.patch} |  0
 ...0169-Add-PlayerConnectionCloseEvent.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 .../0171-BlockDestroyEvent.patch}             |  0
 ...option-to-load-extra-plugin-jars-no.patch} | 16 +++----
 ...1-Adventure.patch => 0012-Adventure.patch} | 24 +++++-----
 ...ctus-bamboo-and-reed-growth-heights.patch} |  0
 ...igurable-baby-zombie-movement-speed.patch} |  0
 ...15-Configurable-fishing-time-ranges.patch} |  0
 ...-mobs-to-jump-and-take-water-damage.patch} |  0
 ...despawn-distances-for-living-entiti.patch} |  0
 ...-Allow-for-toggling-of-spawn-chunks.patch} |  0
 ...k-and-tnt-entities-at-the-specified.patch} |  0
 ...ent-crashes-server-lists-and-Mojang.patch} |  6 +--
 ...0021-Implement-Paper-VersionChecker.patch} |  0
 ...-version-history-to-version-command.patch} |  0
 ...=> 0023-Player-affects-spawning-API.patch} |  0
 ...e-invalid-mob-spawner-tile-entities.patch} |  0
 ...25-Further-improve-server-tick-loop.patch} |  4 +-
 ...26-Only-refresh-abilities-if-needed.patch} |  0
 ...API.patch => 0027-Entity-Origin-API.patch} |  0
 ...vent-tile-entity-and-entity-crashes.patch} |  0
 ...figurable-top-of-nether-void-damage.patch} |  0
 ...-before-converting-and-renaming-pla.patch} |  0
 ... => 0031-Always-tick-falling-blocks.patch} |  0
 ...ch => 0032-Configurable-end-credits.patch} |  0
 ...explosions-processing-dead-entities.patch} |  0
 ...s.patch => 0034-Optimize-explosions.patch} |  0
 ...=> 0035-Disable-explosion-knockback.patch} |  0
 ...under.patch => 0036-Disable-thunder.patch} |  0
 ....patch => 0037-Disable-ice-and-snow.patch} |  0
 ...-Configurable-mob-spawner-tick-rate.patch} |  0
 ...9-Implement-PlayerLocaleChangeEvent.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...patch => 0041-Add-BeaconEffectEvent.patch} |  0
 ...igurable-container-update-tick-rate.patch} |  0
 ...0043-Use-UserCache-for-player-heads.patch} |  0
 ...> 0044-Disable-spigot-tick-limiters.patch} |  0
 ...=> 0045-Add-PlayerInitialSpawnEvent.patch} |  0
 ...rable-Disabling-Cat-Chest-Detection.patch} |  0
 ...7-Ensure-commands-are-not-ran-async.patch} |  4 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  0
 ...ch => 0049-Expose-server-CommandMap.patch} |  4 +-
 ...-informative-in-maxHealth-exception.patch} |  0
 ...> 0051-Ensure-inv-drag-is-in-bounds.patch} |  0
 ...0052-Player-Tab-List-and-Title-APIs.patch} |  0
 ...d-configurable-portal-search-radius.patch} |  0
 ...patch => 0054-Add-velocity-warnings.patch} |  2 +-
 ...le-inter-world-teleportation-safety.patch} |  0
 ... 0056-Add-exception-reporting-event.patch} |  2 +-
 ...don-t-need-to-when-cerealising-text.patch} |  0
 ...reboards-for-non-players-by-default.patch} |  0
 ...orking-with-arrows-stuck-in-living-.patch} |  0
 ....patch => 0060-Chunk-Save-Reattempt.patch} |  0
 ... => 0061-Complete-resource-pack-API.patch} |  0
 ...ding-permissions.yml-before-plugins.patch} |  6 +--
 ...low-Reloading-of-Custom-Permissions.patch} |  4 +-
 ...h => 0064-Remove-Metadata-on-reload.patch} |  4 +-
 ...65-Handle-Item-Meta-Inconsistencies.patch} |  0
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  0
 ...atch => 0067-Add-World-Util-Methods.patch} |  0
 ...-Custom-replacement-for-eaten-items.patch} |  0
 ...h-absorb-values-and-repair-bad-data.patch} |  0
 ...70-Use-a-Shared-Random-for-Entities.patch} |  0
 ...e-spawn-chances-for-skeleton-horses.patch} |  0
 ...ocation-getType-and-getBlockData-fo.patch} |  0
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  0
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...5-Configurable-Chunk-Inhabited-Time.patch} |  0
 ...t.patch => 0076-EntityPathfindEvent.patch} |  0
 ...gionFileCache-and-make-configurable.patch} |  0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  0
 ...079-Add-PlayerUseUnknownEntityEvent.patch} |  0
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  0
 ...-BlockPlaceEvent-triggering-physics.patch} |  0
 ...its.patch => 0082-Optimize-DataBits.patch} |  0
 ...illa-per-world-scoreboard-coloring-.patch} |  0
 ...d-for-setting-passengers-on-players.patch} |  0
 ... 0085-Configurable-Player-Collision.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...> 0087-Configurable-RCON-IP-address.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...to-configure-frosted_ice-properties.patch} |  0
 ...possibility-for-getServer-singleton.patch} |  0
 ...tem-frames-performance-and-bug-fixe.patch} |  0
 ...API-Replenishable-Lootables-Feature.patch} |  0
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  0
 ...em-property-for-disabling-watchdoge.patch} |  0
 ...0095-Optimize-UserCache-Thread-Safe.patch} |  0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  0
 ...-redstone-torch-rapid-clock-removal.patch} |  0
 ...h => 0098-Add-server-name-parameter.patch} |  8 ++--
 ...n-Wither-Death-sounds-to-same-world.patch} |  0
 ...tch => 0100-Fix-Old-Sign-Conversion.patch} |  0
 ...locking-on-Network-Manager-creation.patch} |  0
 ...-profiles-that-have-no-UUID-and-no-.patch} |  0
 ...etting-for-proxy-online-mode-status.patch} |  4 +-
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  0
 ...6-Configurable-flying-kick-messages.patch} |  0
 ...k-reference-on-Craft-Entity-removal.patch} |  0
 ...ion-to-remove-corrupt-tile-entities.patch} |  0
 ...nt.patch => 0109-Add-EntityZapEvent.patch} |  0
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  0
 ...11-Cache-user-authenticator-threads.patch} |  2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  0
 ...-Don-t-let-fishinghooks-use-portals.patch} |  0
 ... => 0115-Add-ProjectileCollideEvent.patch} |  0
 ...ent-Pathfinding-out-of-World-Border.patch} |  0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  0
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  0
 ... => 0120-Optimize-ItemStack.isEmpty.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...=> 0122-String-based-Action-Bar-API.patch} |  0
 ...3-Properly-fix-item-duplication-bug.patch} |  0
 ...-API-s.patch => 0124-Firework-API-s.patch} |  0
 ... 0125-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...h => 0127-Enforce-Sync-Player-Saves.patch} |  0
 ...low-entities-to-ride-themselves-572.patch} |  0
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...patch => 0130-Cap-Entity-Collisions.patch} |  0
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...> 0132-Do-not-let-armorstands-drown.patch} |  0
 ...e-async-calls-to-restart-the-server.patch} |  0
 ...e-parrots-stay-on-shoulders-despite.patch} |  0
 ...-option-to-prevent-player-names-fro.patch} |  4 +-
 ...leAppender-for-console-improvements.patch} | 12 ++---
 ...rable-option-to-disable-creeper-lin.patch} |  0
 ....patch => 0138-Item-canEntityPickup.patch} |  0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0140-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0141-Add-UnknownCommandEvent.patch} |  4 +-
 ...tch => 0142-Basic-PlayerProfile-API.patch} |  4 +-
 ... 0143-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0144-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  2 +-
 ...patch => 0146-Entity-fromMobSpawner.patch} |  0
 ...7-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...plement-ensureServerConversions-API.patch} |  0
 ...> 0149-Implement-getI18NDisplayName.patch} |  0
 ...=> 0150-ProfileWhitelistVerifyEvent.patch} |  0
 ...ch => 0151-Fix-this-stupid-bullshit.patch} |  4 +-
 ...atch => 0152-LivingEntity-setKiller.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  0
 ...a-custom-authentication-servers-dow.patch} |  2 +-
 ...-prefixes-using-Log4J-configuration.patch} |  0
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0158-Add-PlayerJumpEvent.patch} |  0
 ...-handle-PacketPlayInKeepAlive-async.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  0
 ...t-serverside-behavior-of-keepalives.patch} |  0
 ...Effects-only-to-players-who-can-see.patch} |  0
 ... => 0163-Add-PlayerArmorChangeEvent.patch} |  0
 ...om-being-processed-when-the-player-.patch} |  2 +-
 ...5-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0168-AsyncTabCompleteEvent.patch} |  4 +-
 ...=> 0169-PlayerPickupExperienceEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...patch => 0172-PreCreatureSpawnEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0174-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0176-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0178-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  2 +-
 ...=> 0183-Player.setPlayerProfile-API.patch} |  2 +-
 ...patch => 0184-getPlayerUniqueId-API.patch} |  4 +-
 ... 0185-Improved-Async-Task-Scheduler.patch} |  0
 ... => 0186-Upstream-config-migrations.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...9-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  0
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0193-EndermanEscapeEvent.patch} |  0
 ...h => 0194-Enderman.teleportRandomly.patch} |  0
 ...195-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...h => 0198-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0199-WitchConsumePotionEvent.patch} |  0
 ...patch => 0200-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0202-WitchReadyPotionEvent.patch} |  0
 ...203-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0206-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  0
 ...=> 0210-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0211-PlayerReadyArrowEvent.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0213-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0215-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0218-InventoryCloseEvent-Reason-API.patch} |  0
 ...tch => 0219-Vex-get-setSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...-to-keep-logging-IO-off-main-thread.patch} |  0
 ...more-information-to-Entity.toString.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...ts.patch => 0225-EnderDragon-Events.patch} |  0
 ...atch => 0226-PlayerElytraBoostEvent.patch} |  0
 ...=> 0227-PlayerLaunchProjectileEvent.patch} |  0
 ...0228-Improve-BlockPosition-inlining.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  0
 ...-Vanished-players-don-t-have-rights.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  0
 ...tch => 0232-SkeletonHorse-Additions.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...4-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0235-AnvilDamageEvent.patch} |  0
 ...h => 0236-Add-hand-to-bucket-events.patch} |  0
 ...ent.patch => 0237-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  6 +--
 ...0243-Make-EnderDragon-implement-Mob.patch} |  0
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...fault-mob-spawn-range-and-water-ani.patch} |  0
 ...tch => 0249-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...51-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0252-Optimize-MappedRegistry.patch} |  0
 ...ch => 0253-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0254-Add-More-Creeper-API.patch} |  0
 ...=> 0255-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...7-Asynchronous-chunk-IO-and-loading.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0260-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0262-Mob-Pathfinding-API.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  0
 ...ning-from-loading-generating-chunks.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0269-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0271-Hook-into-CB-plugin-rewrites.patch} |  0
 ....patch => 0272-PreSpawnerSpawnEvent.patch} |  0
 ...73-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0274-Add-sun-related-API.patch} |  0
 ...-Johnny.patch => 0275-Here-s-Johnny.patch} |  0
 ...Turtle-API.patch => 0276-Turtle-API.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  6 +--
 ...PI.patch => 0280-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  0
 ...3-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0286-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0288-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0289-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  0
 ...ult-permission-message-configurable.patch} |  4 +-
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  0
 ...I.patch => 0295-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0296-Book-Size-Limits.patch} |  0
 ...0297-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 .../0303-BlockDestroyEvent.patch}             |  4 +-
 458 files changed, 192 insertions(+), 190 deletions(-)
 rename patches/{unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch => api/0007-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (87%)
 rename patches/api/{0007-Adventure.patch => 0008-Adventure.patch} (99%)
 rename patches/api/{0008-Player-affects-spawning-API.patch => 0009-Player-affects-spawning-API.patch} (100%)
 rename patches/api/{0009-Add-getTPS-method.patch => 0010-Add-getTPS-method.patch} (80%)
 rename patches/api/{0010-Version-Command-2.0.patch => 0011-Version-Command-2.0.patch} (100%)
 rename patches/api/{0011-Entity-Origin-API.patch => 0012-Entity-Origin-API.patch} (100%)
 rename patches/api/{0012-Add-PlayerLocaleChangeEvent.patch => 0013-Add-PlayerLocaleChangeEvent.patch} (100%)
 rename patches/api/{0013-Add-view-distance-API.patch => 0014-Add-view-distance-API.patch} (100%)
 rename patches/api/{0014-Add-BeaconEffectEvent.patch => 0015-Add-BeaconEffectEvent.patch} (100%)
 rename patches/api/{0015-Add-PlayerInitialSpawnEvent.patch => 0016-Add-PlayerInitialSpawnEvent.patch} (100%)
 rename patches/api/{0016-Automatically-disable-plugins-that-fail-to-load.patch => 0017-Automatically-disable-plugins-that-fail-to-load.patch} (91%)
 rename patches/api/{0017-Expose-server-CommandMap.patch => 0018-Expose-server-CommandMap.patch} (81%)
 rename patches/api/{0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (93%)
 rename patches/api/{0019-Add-exception-reporting-event.patch => 0020-Add-exception-reporting-event.patch} (98%)
 rename patches/api/{0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch => 0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch} (100%)
 rename patches/api/{0021-Fix-ServerListPingEvent-flagging-as-Async.patch => 0022-Fix-ServerListPingEvent-flagging-as-Async.patch} (100%)
 rename patches/api/{0022-Player-Tab-List-and-Title-APIs.patch => 0023-Player-Tab-List-and-Title-APIs.patch} (100%)
 rename patches/api/{0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (100%)
 rename patches/api/{0024-Complete-resource-pack-API.patch => 0025-Complete-resource-pack-API.patch} (100%)
 rename patches/api/{0025-Use-ASM-for-event-executors.patch => 0026-Use-ASM-for-event-executors.patch} (99%)
 rename patches/api/{0026-Add-a-call-helper-to-Event.patch => 0027-Add-a-call-helper-to-Event.patch} (100%)
 rename patches/api/{0027-Add-sender-name-to-commands.yml-replacement.patch => 0028-Add-sender-name-to-commands.yml-replacement.patch} (100%)
 rename patches/api/{0028-Add-command-to-reload-permissions.yml-and-require-co.patch => 0029-Add-command-to-reload-permissions.yml-and-require-co.patch} (90%)
 rename patches/api/{0029-Custom-replacement-for-eaten-items.patch => 0030-Custom-replacement-for-eaten-items.patch} (100%)
 rename patches/api/{0030-Entity-AddTo-RemoveFrom-World-Events.patch => 0031-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename patches/api/{0031-EntityPathfindEvent.patch => 0032-EntityPathfindEvent.patch} (100%)
 rename patches/api/{0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch => 0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch} (100%)
 rename patches/api/{0033-Add-MetadataStoreBase.removeAll-Plugin.patch => 0034-Add-MetadataStoreBase.removeAll-Plugin.patch} (100%)
 rename patches/api/{0034-Add-PlayerUseUnknownEntityEvent.patch => 0035-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename patches/api/{0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/api/{0036-Arrow-pickup-rule-API.patch => 0037-Arrow-pickup-rule-API.patch} (100%)
 rename patches/api/{0037-EntityRegainHealthEvent-isFastRegen-API.patch => 0038-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename patches/api/{0038-LootTable-API.patch => 0039-LootTable-API.patch} (100%)
 rename patches/api/{0039-Add-EntityZapEvent.patch => 0040-Add-EntityZapEvent.patch} (100%)
 rename patches/api/{0040-Misc-Utils.patch => 0041-Misc-Utils.patch} (100%)
 rename patches/api/{0041-Allow-Reloading-of-Command-Aliases.patch => 0042-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename patches/api/{0042-Add-source-to-PlayerExpChangeEvent.patch => 0043-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/api/{0043-Add-ProjectileCollideEvent.patch => 0044-Add-ProjectileCollideEvent.patch} (100%)
 rename patches/api/{0044-Add-String-based-Action-Bar-API.patch => 0045-Add-String-based-Action-Bar-API.patch} (100%)
 rename patches/api/{0045-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0046-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/api/{0046-IllegalPacketEvent.patch => 0047-IllegalPacketEvent.patch} (100%)
 rename patches/api/{0047-Fireworks-API-s.patch => 0048-Fireworks-API-s.patch} (100%)
 rename patches/api/{0048-PlayerTeleportEndGatewayEvent.patch => 0049-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/api/{0049-Provide-E-TE-Chunk-count-stat-methods.patch => 0050-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename patches/api/{0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename patches/api/{0051-Expose-WorldBorder-isInBounds-Location-check.patch => 0052-Expose-WorldBorder-isInBounds-Location-check.patch} (100%)
 rename patches/api/{0052-Add-configuration-option-to-prevent-player-names-fro.patch => 0053-Add-configuration-option-to-prevent-player-names-fro.patch} (88%)
 rename patches/api/{0053-Fix-upstream-javadocs.patch => 0054-Fix-upstream-javadocs.patch} (94%)
 rename patches/api/{0054-Item-canEntityPickup.patch => 0055-Item-canEntityPickup.patch} (100%)
 rename patches/api/{0055-PlayerAttemptPickupItemEvent.patch => 0056-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/api/{0056-Add-UnknownCommandEvent.patch => 0057-Add-UnknownCommandEvent.patch} (100%)
 rename patches/api/{0057-Basic-PlayerProfile-API.patch => 0058-Basic-PlayerProfile-API.patch} (97%)
 rename patches/api/{0058-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0059-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/api/{0059-Shoulder-Entities-Release-API.patch => 0060-Shoulder-Entities-Release-API.patch} (100%)
 rename patches/api/{0060-Entity-fromMobSpawner.patch => 0061-Entity-fromMobSpawner.patch} (100%)
 rename patches/api/{0061-Profile-Lookup-Events.patch => 0062-Profile-Lookup-Events.patch} (100%)
 rename patches/api/{0062-Improve-the-Saddle-API-for-Horses.patch => 0063-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/api/{0063-Add-getI18NDisplayName-API.patch => 0064-Add-getI18NDisplayName-API.patch} (100%)
 rename patches/api/{0064-ensureServerConversions-API.patch => 0065-ensureServerConversions-API.patch} (100%)
 rename patches/api/{0065-Make-plugins-list-alphabetical.patch => 0066-Make-plugins-list-alphabetical.patch} (100%)
 rename patches/api/{0066-LivingEntity-setKiller.patch => 0067-LivingEntity-setKiller.patch} (100%)
 rename patches/api/{0067-ProfileWhitelistVerifyEvent.patch => 0068-ProfileWhitelistVerifyEvent.patch} (100%)
 rename patches/api/{0068-Allow-plugins-to-use-SLF4J-for-logging.patch => 0069-Allow-plugins-to-use-SLF4J-for-logging.patch} (100%)
 rename patches/api/{0069-Handle-plugin-prefixes-in-implementation-logging-con.patch => 0070-Handle-plugin-prefixes-in-implementation-logging-con.patch} (100%)
 rename patches/api/{0070-Add-PlayerJumpEvent.patch => 0071-Add-PlayerJumpEvent.patch} (100%)
 rename patches/api/{0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch => 0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch} (100%)
 rename patches/api/{0072-Add-PlayerArmorChangeEvent.patch => 0073-Add-PlayerArmorChangeEvent.patch} (100%)
 rename patches/api/{0073-API-to-get-a-BlockState-without-a-snapshot.patch => 0074-API-to-get-a-BlockState-without-a-snapshot.patch} (91%)
 rename patches/api/{0074-AsyncTabCompleteEvent.patch => 0075-AsyncTabCompleteEvent.patch} (100%)
 rename patches/api/{0075-Expose-client-protocol-version-and-virtual-host.patch => 0076-Expose-client-protocol-version-and-virtual-host.patch} (96%)
 rename patches/api/{0076-Display-warning-on-deprecated-recipe-API.patch => 0077-Display-warning-on-deprecated-recipe-API.patch} (100%)
 rename patches/api/{0077-PlayerPickupExperienceEvent.patch => 0078-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/api/{0078-ExperienceOrbMergeEvent.patch => 0079-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/api/{0079-Ability-to-apply-mending-to-XP-API.patch => 0080-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename patches/api/{0080-PreCreatureSpawnEvent.patch => 0081-PreCreatureSpawnEvent.patch} (100%)
 rename patches/api/{0081-PlayerNaturallySpawnCreaturesEvent.patch => 0082-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename patches/api/{0082-Add-setPlayerProfile-API-for-Skulls.patch => 0083-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/api/{0083-Fill-Profile-Property-Events.patch => 0084-Fill-Profile-Property-Events.patch} (100%)
 rename patches/api/{0084-PlayerAdvancementCriterionGrantEvent.patch => 0085-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/api/{0085-Add-ArmorStand-Item-Meta.patch => 0086-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/api/{0086-Optimize-Hoppers.patch => 0087-Optimize-Hoppers.patch} (100%)
 rename patches/api/{0087-Tameable-getOwnerUniqueId-API.patch => 0088-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/api/{0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename patches/api/{0089-Add-extended-PaperServerListPingEvent.patch => 0090-Add-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/api/{0090-Player.setPlayerProfile-API.patch => 0091-Player.setPlayerProfile-API.patch} (100%)
 rename patches/api/{0091-getPlayerUniqueId-API.patch => 0092-getPlayerUniqueId-API.patch} (87%)
 rename patches/api/{0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch => 0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch} (100%)
 rename patches/api/{0093-Add-method-to-open-already-placed-sign.patch => 0094-Add-method-to-open-already-placed-sign.patch} (100%)
 rename patches/api/{0094-Add-Ban-Methods-to-Player-Objects.patch => 0095-Add-Ban-Methods-to-Player-Objects.patch} (100%)
 rename patches/api/{0095-EndermanEscapeEvent.patch => 0096-EndermanEscapeEvent.patch} (100%)
 rename patches/api/{0096-Enderman.teleportRandomly.patch => 0097-Enderman.teleportRandomly.patch} (100%)
 rename patches/api/{0097-Additional-world.getNearbyEntities-API-s.patch => 0098-Additional-world.getNearbyEntities-API-s.patch} (100%)
 rename patches/api/{0098-Location.isChunkLoaded-API.patch => 0099-Location.isChunkLoaded-API.patch} (100%)
 rename patches/api/{0099-Expand-World.spawnParticle-API-and-add-Builder.patch => 0100-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename patches/api/{0100-EndermanAttackPlayerEvent.patch => 0101-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/api/{0101-Close-Plugin-Class-Loaders-on-Disable.patch => 0102-Close-Plugin-Class-Loaders-on-Disable.patch} (94%)
 rename patches/api/{0102-WitchConsumePotionEvent.patch => 0103-WitchConsumePotionEvent.patch} (100%)
 rename patches/api/{0103-WitchThrowPotionEvent.patch => 0104-WitchThrowPotionEvent.patch} (100%)
 rename patches/api/{0104-Location.toBlockLocation-toCenterLocation.patch => 0105-Location.toBlockLocation-toCenterLocation.patch} (100%)
 rename patches/api/{0105-PotionEffect-clone-methods.patch => 0106-PotionEffect-clone-methods.patch} (100%)
 rename patches/api/{0106-WitchReadyPotionEvent.patch => 0107-WitchReadyPotionEvent.patch} (100%)
 rename patches/api/{0107-ItemStack-getMaxItemUseDuration.patch => 0108-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/api/{0108-Add-EntityTeleportEndGatewayEvent.patch => 0109-Add-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/api/{0109-Make-shield-blocking-delay-configurable.patch => 0110-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/api/{0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (100%)
 rename patches/api/{0111-Add-getNearbyXXX-methods-to-Location.patch => 0112-Add-getNearbyXXX-methods-to-Location.patch} (100%)
 rename patches/api/{0112-PlayerReadyArrowEvent.patch => 0113-PlayerReadyArrowEvent.patch} (100%)
 rename patches/api/{0113-Add-EntityKnockbackByEntityEvent.patch => 0114-Add-EntityKnockbackByEntityEvent.patch} (100%)
 rename patches/api/{0114-Expand-Explosions-API.patch => 0115-Expand-Explosions-API.patch} (100%)
 rename patches/api/{0115-ItemStack-API-additions-for-quantity-flags-lore.patch => 0116-ItemStack-API-additions-for-quantity-flags-lore.patch} (100%)
 rename patches/api/{0116-LivingEntity-Hand-Raised-Item-Use-API.patch => 0117-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/api/{0117-RangedEntity-API.patch => 0118-RangedEntity-API.patch} (100%)
 rename patches/api/{0118-Add-World.getEntity-UUID-API.patch => 0119-Add-World.getEntity-UUID-API.patch} (100%)
 rename patches/api/{0119-InventoryCloseEvent-Reason-API.patch => 0120-InventoryCloseEvent-Reason-API.patch} (100%)
 rename patches/api/{0120-Allow-setting-the-vex-s-summoner.patch => 0121-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename patches/api/{0121-Entity-getChunk-API.patch => 0122-Entity-getChunk-API.patch} (100%)
 rename patches/api/{0122-Add-an-asterisk-to-legacy-API-plugins.patch => 0123-Add-an-asterisk-to-legacy-API-plugins.patch} (97%)
 rename patches/api/{0123-EnderDragon-Events.patch => 0124-EnderDragon-Events.patch} (100%)
 rename patches/api/{0124-PlayerElytraBoostEvent.patch => 0125-PlayerElytraBoostEvent.patch} (100%)
 rename patches/api/{0125-PlayerLaunchProjectileEvent.patch => 0126-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/api/{0126-EntityTransformedEvent.patch => 0127-EntityTransformedEvent.patch} (100%)
 rename patches/api/{0127-Allow-disabling-armour-stand-ticking.patch => 0128-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/api/{0128-SkeletonHorse-Additions.patch => 0129-SkeletonHorse-Additions.patch} (100%)
 rename patches/api/{0129-Expand-Location-Manipulation-API.patch => 0130-Expand-Location-Manipulation-API.patch} (100%)
 rename patches/api/{0130-Expand-ArmorStand-API.patch => 0131-Expand-ArmorStand-API.patch} (100%)
 rename patches/api/{0131-AnvilDamageEvent.patch => 0132-AnvilDamageEvent.patch} (100%)
 rename patches/api/{0132-Remove-deadlock-risk-in-firing-async-events.patch => 0133-Remove-deadlock-risk-in-firing-async-events.patch} (92%)
 rename patches/api/{0133-Add-hand-to-bucket-events.patch => 0134-Add-hand-to-bucket-events.patch} (100%)
 rename patches/api/{0134-Add-TNTPrimeEvent.patch => 0135-Add-TNTPrimeEvent.patch} (100%)
 rename patches/api/{0135-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0136-Provide-Chunk-Coordinates-as-a-Long-API.patch} (100%)
 rename patches/api/{0136-Make-EnderDragon-extend-Mob.patch => 0137-Make-EnderDragon-extend-Mob.patch} (100%)
 rename patches/api/{0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/api/{0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (100%)
 rename patches/api/{0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (100%)
 rename patches/api/{0140-Slime-Pathfinder-Events.patch => 0141-Slime-Pathfinder-Events.patch} (100%)
 rename patches/api/{0141-Add-PhantomPreSpawnEvent.patch => 0142-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/api/{0142-Add-More-Creeper-API.patch => 0143-Add-More-Creeper-API.patch} (100%)
 rename patches/api/{0143-Inventory-removeItemAnySlot.patch => 0144-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/api/{0144-isChunkGenerated-API.patch => 0145-isChunkGenerated-API.patch} (100%)
 rename patches/api/{0145-Add-source-block-constructor-and-getChangedBlockData.patch => 0146-Add-source-block-constructor-and-getChangedBlockData.patch} (100%)
 rename patches/api/{0146-Async-Chunks-API.patch => 0147-Async-Chunks-API.patch} (99%)
 rename patches/api/{0147-Add-ray-tracing-methods-to-LivingEntity.patch => 0148-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/api/{0148-Expose-attack-cooldown-methods-for-Player.patch => 0149-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/api/{0149-Improve-death-events.patch => 0150-Improve-death-events.patch} (100%)
 rename patches/api/{0150-Mob-Pathfinding-API.patch => 0151-Mob-Pathfinding-API.patch} (100%)
 rename patches/api/{0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/api/{0152-Performance-Concurrency-Improvements-to-Permissions.patch => 0153-Performance-Concurrency-Improvements-to-Permissions.patch} (100%)
 rename patches/api/{0153-Add-ItemStackRecipeChoice-Draft-API.patch => 0154-Add-ItemStackRecipeChoice-Draft-API.patch} (100%)
 rename patches/api/{0154-Implement-furnace-cook-speed-multiplier-API.patch => 0155-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/api/{0155-Material-API-additions.patch => 0156-Material-API-additions.patch} (100%)
 rename patches/api/{0156-Add-Material-Tags.patch => 0157-Add-Material-Tags.patch} (100%)
 rename patches/api/{0157-PreSpawnerSpawnEvent.patch => 0158-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/api/{0158-Add-LivingEntity-getTargetEntity.patch => 0159-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/api/{0159-Add-sun-related-API.patch => 0160-Add-sun-related-API.patch} (100%)
 rename patches/api/{0160-Here-s-Johnny.patch => 0161-Here-s-Johnny.patch} (100%)
 rename patches/api/{0161-Turtle-API.patch => 0162-Turtle-API.patch} (100%)
 rename patches/api/{0162-Add-spectator-target-events.patch => 0163-Add-spectator-target-events.patch} (100%)
 rename patches/api/{0163-Add-more-Witch-API.patch => 0164-Add-more-Witch-API.patch} (100%)
 rename patches/api/{0164-Make-the-default-permission-message-configurable.patch => 0165-Make-the-default-permission-message-configurable.patch} (89%)
 rename patches/api/{0165-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0166-Support-cancellation-supression-of-EntityDismount-Ve.patch} (100%)
 rename patches/api/{0166-Add-more-Zombie-API.patch => 0167-Add-more-Zombie-API.patch} (100%)
 rename patches/api/{0167-Change-the-reserved-channel-check-to-be-sensible.patch => 0168-Change-the-reserved-channel-check-to-be-sensible.patch} (100%)
 rename patches/api/{0168-Add-PlayerConnectionCloseEvent.patch => 0169-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/api/{0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/{unapplied/api/0170-BlockDestroyEvent.patch => api/0171-BlockDestroyEvent.patch} (100%)
 rename patches/{unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch => server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (87%)
 rename patches/server/{0011-Adventure.patch => 0012-Adventure.patch} (99%)
 rename patches/server/{0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch => 0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch} (100%)
 rename patches/server/{0013-Configurable-baby-zombie-movement-speed.patch => 0014-Configurable-baby-zombie-movement-speed.patch} (100%)
 rename patches/server/{0014-Configurable-fishing-time-ranges.patch => 0015-Configurable-fishing-time-ranges.patch} (100%)
 rename patches/server/{0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch => 0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch} (100%)
 rename patches/server/{0016-Add-configurable-despawn-distances-for-living-entiti.patch => 0017-Add-configurable-despawn-distances-for-living-entiti.patch} (100%)
 rename patches/server/{0017-Allow-for-toggling-of-spawn-chunks.patch => 0018-Allow-for-toggling-of-spawn-chunks.patch} (100%)
 rename patches/server/{0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (100%)
 rename patches/server/{0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (97%)
 rename patches/server/{0020-Implement-Paper-VersionChecker.patch => 0021-Implement-Paper-VersionChecker.patch} (100%)
 rename patches/server/{0021-Add-version-history-to-version-command.patch => 0022-Add-version-history-to-version-command.patch} (100%)
 rename patches/server/{0022-Player-affects-spawning-API.patch => 0023-Player-affects-spawning-API.patch} (100%)
 rename patches/server/{0023-Remove-invalid-mob-spawner-tile-entities.patch => 0024-Remove-invalid-mob-spawner-tile-entities.patch} (100%)
 rename patches/server/{0024-Further-improve-server-tick-loop.patch => 0025-Further-improve-server-tick-loop.patch} (98%)
 rename patches/server/{0025-Only-refresh-abilities-if-needed.patch => 0026-Only-refresh-abilities-if-needed.patch} (100%)
 rename patches/server/{0026-Entity-Origin-API.patch => 0027-Entity-Origin-API.patch} (100%)
 rename patches/server/{0027-Prevent-tile-entity-and-entity-crashes.patch => 0028-Prevent-tile-entity-and-entity-crashes.patch} (100%)
 rename patches/server/{0028-Configurable-top-of-nether-void-damage.patch => 0029-Configurable-top-of-nether-void-damage.patch} (100%)
 rename patches/server/{0029-Check-online-mode-before-converting-and-renaming-pla.patch => 0030-Check-online-mode-before-converting-and-renaming-pla.patch} (100%)
 rename patches/server/{0030-Always-tick-falling-blocks.patch => 0031-Always-tick-falling-blocks.patch} (100%)
 rename patches/server/{0031-Configurable-end-credits.patch => 0032-Configurable-end-credits.patch} (100%)
 rename patches/server/{0032-Fix-lag-from-explosions-processing-dead-entities.patch => 0033-Fix-lag-from-explosions-processing-dead-entities.patch} (100%)
 rename patches/server/{0033-Optimize-explosions.patch => 0034-Optimize-explosions.patch} (100%)
 rename patches/server/{0034-Disable-explosion-knockback.patch => 0035-Disable-explosion-knockback.patch} (100%)
 rename patches/server/{0035-Disable-thunder.patch => 0036-Disable-thunder.patch} (100%)
 rename patches/server/{0036-Disable-ice-and-snow.patch => 0037-Disable-ice-and-snow.patch} (100%)
 rename patches/server/{0037-Configurable-mob-spawner-tick-rate.patch => 0038-Configurable-mob-spawner-tick-rate.patch} (100%)
 rename patches/server/{0038-Implement-PlayerLocaleChangeEvent.patch => 0039-Implement-PlayerLocaleChangeEvent.patch} (100%)
 rename patches/server/{0039-Per-Player-View-Distance-API-placeholders.patch => 0040-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename patches/server/{0040-Add-BeaconEffectEvent.patch => 0041-Add-BeaconEffectEvent.patch} (100%)
 rename patches/server/{0041-Configurable-container-update-tick-rate.patch => 0042-Configurable-container-update-tick-rate.patch} (100%)
 rename patches/server/{0042-Use-UserCache-for-player-heads.patch => 0043-Use-UserCache-for-player-heads.patch} (100%)
 rename patches/server/{0043-Disable-spigot-tick-limiters.patch => 0044-Disable-spigot-tick-limiters.patch} (100%)
 rename patches/server/{0044-Add-PlayerInitialSpawnEvent.patch => 0045-Add-PlayerInitialSpawnEvent.patch} (100%)
 rename patches/server/{0045-Configurable-Disabling-Cat-Chest-Detection.patch => 0046-Configurable-Disabling-Cat-Chest-Detection.patch} (100%)
 rename patches/server/{0046-Ensure-commands-are-not-ran-async.patch => 0047-Ensure-commands-are-not-ran-async.patch} (97%)
 rename patches/server/{0047-All-chunks-are-slime-spawn-chunks-toggle.patch => 0048-All-chunks-are-slime-spawn-chunks-toggle.patch} (100%)
 rename patches/server/{0048-Expose-server-CommandMap.patch => 0049-Expose-server-CommandMap.patch} (78%)
 rename patches/server/{0049-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0050-Be-a-bit-more-informative-in-maxHealth-exception.patch} (100%)
 rename patches/server/{0050-Ensure-inv-drag-is-in-bounds.patch => 0051-Ensure-inv-drag-is-in-bounds.patch} (100%)
 rename patches/server/{0051-Player-Tab-List-and-Title-APIs.patch => 0052-Player-Tab-List-and-Title-APIs.patch} (100%)
 rename patches/server/{0052-Add-configurable-portal-search-radius.patch => 0053-Add-configurable-portal-search-radius.patch} (100%)
 rename patches/server/{0053-Add-velocity-warnings.patch => 0054-Add-velocity-warnings.patch} (98%)
 rename patches/server/{0054-Configurable-inter-world-teleportation-safety.patch => 0055-Configurable-inter-world-teleportation-safety.patch} (100%)
 rename patches/server/{0055-Add-exception-reporting-event.patch => 0056-Add-exception-reporting-event.patch} (99%)
 rename patches/server/{0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (100%)
 rename patches/server/{0057-Disable-Scoreboards-for-non-players-by-default.patch => 0058-Disable-Scoreboards-for-non-players-by-default.patch} (100%)
 rename patches/server/{0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (100%)
 rename patches/server/{0059-Chunk-Save-Reattempt.patch => 0060-Chunk-Save-Reattempt.patch} (100%)
 rename patches/server/{0060-Complete-resource-pack-API.patch => 0061-Complete-resource-pack-API.patch} (100%)
 rename patches/server/{0061-Default-loading-permissions.yml-before-plugins.patch => 0062-Default-loading-permissions.yml-before-plugins.patch} (92%)
 rename patches/server/{0062-Allow-Reloading-of-Custom-Permissions.patch => 0063-Allow-Reloading-of-Custom-Permissions.patch} (90%)
 rename patches/server/{0063-Remove-Metadata-on-reload.patch => 0064-Remove-Metadata-on-reload.patch} (88%)
 rename patches/server/{0064-Handle-Item-Meta-Inconsistencies.patch => 0065-Handle-Item-Meta-Inconsistencies.patch} (100%)
 rename patches/server/{0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (100%)
 rename patches/server/{0066-Add-World-Util-Methods.patch => 0067-Add-World-Util-Methods.patch} (100%)
 rename patches/server/{0067-Custom-replacement-for-eaten-items.patch => 0068-Custom-replacement-for-eaten-items.patch} (100%)
 rename patches/server/{0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (100%)
 rename patches/server/{0069-Use-a-Shared-Random-for-Entities.patch => 0070-Use-a-Shared-Random-for-Entities.patch} (100%)
 rename patches/server/{0070-Configurable-spawn-chances-for-skeleton-horses.patch => 0071-Configurable-spawn-chances-for-skeleton-horses.patch} (100%)
 rename patches/server/{0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (100%)
 rename patches/server/{0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (100%)
 rename patches/server/{0073-Entity-AddTo-RemoveFrom-World-Events.patch => 0074-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename patches/server/{0074-Configurable-Chunk-Inhabited-Time.patch => 0075-Configurable-Chunk-Inhabited-Time.patch} (100%)
 rename patches/server/{0075-EntityPathfindEvent.patch => 0076-EntityPathfindEvent.patch} (100%)
 rename patches/server/{0076-Sanitise-RegionFileCache-and-make-configurable.patch => 0077-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename patches/server/{0077-Do-not-load-chunks-for-Pathfinding.patch => 0078-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0078-Add-PlayerUseUnknownEntityEvent.patch => 0079-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename patches/server/{0079-Configurable-Grass-Spread-Tick-Rate.patch => 0080-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename patches/server/{0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename patches/server/{0081-Optimize-DataBits.patch => 0082-Optimize-DataBits.patch} (100%)
 rename patches/server/{0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0083-Workaround-for-setting-passengers-on-players.patch => 0084-Workaround-for-setting-passengers-on-players.patch} (100%)
 rename patches/server/{0084-Configurable-Player-Collision.patch => 0085-Configurable-Player-Collision.patch} (100%)
 rename patches/server/{0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0086-Configurable-RCON-IP-address.patch => 0087-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0087-EntityRegainHealthEvent-isFastRegen-API.patch => 0088-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename patches/server/{0088-Add-ability-to-configure-frosted_ice-properties.patch => 0089-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0089-remove-null-possibility-for-getServer-singleton.patch => 0090-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename patches/server/{0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename patches/server/{0091-LootTable-API-Replenishable-Lootables-Feature.patch => 0092-LootTable-API-Replenishable-Lootables-Feature.patch} (100%)
 rename patches/server/{0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename patches/server/{0093-System-property-for-disabling-watchdoge.patch => 0094-System-property-for-disabling-watchdoge.patch} (100%)
 rename patches/server/{0094-Optimize-UserCache-Thread-Safe.patch => 0095-Optimize-UserCache-Thread-Safe.patch} (100%)
 rename patches/server/{0095-Optional-TNT-doesn-t-move-in-water.patch => 0096-Optional-TNT-doesn-t-move-in-water.patch} (100%)
 rename patches/server/{0096-Faster-redstone-torch-rapid-clock-removal.patch => 0097-Faster-redstone-torch-rapid-clock-removal.patch} (100%)
 rename patches/server/{0097-Add-server-name-parameter.patch => 0098-Add-server-name-parameter.patch} (76%)
 rename patches/server/{0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (100%)
 rename patches/server/{0099-Fix-Old-Sign-Conversion.patch => 0100-Fix-Old-Sign-Conversion.patch} (100%)
 rename patches/server/{0100-Avoid-blocking-on-Network-Manager-creation.patch => 0101-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename patches/server/{0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename patches/server/{0102-Add-setting-for-proxy-online-mode-status.patch => 0103-Add-setting-for-proxy-online-mode-status.patch} (96%)
 rename patches/server/{0103-Optimise-BlockState-s-hashCode-equals.patch => 0104-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0104-Configurable-packet-in-spam-threshold.patch => 0105-Configurable-packet-in-spam-threshold.patch} (100%)
 rename patches/server/{0105-Configurable-flying-kick-messages.patch => 0106-Configurable-flying-kick-messages.patch} (100%)
 rename patches/server/{0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (100%)
 rename patches/server/{0107-Option-to-remove-corrupt-tile-entities.patch => 0108-Option-to-remove-corrupt-tile-entities.patch} (100%)
 rename patches/server/{0108-Add-EntityZapEvent.patch => 0109-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (100%)
 rename patches/server/{0110-Cache-user-authenticator-threads.patch => 0111-Cache-user-authenticator-threads.patch} (97%)
 rename patches/server/{0111-Allow-Reloading-of-Command-Aliases.patch => 0112-Allow-Reloading-of-Command-Aliases.patch} (90%)
 rename patches/server/{0112-Add-source-to-PlayerExpChangeEvent.patch => 0113-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/server/{0113-Don-t-let-fishinghooks-use-portals.patch => 0114-Don-t-let-fishinghooks-use-portals.patch} (100%)
 rename patches/server/{0114-Add-ProjectileCollideEvent.patch => 0115-Add-ProjectileCollideEvent.patch} (100%)
 rename patches/server/{0115-Prevent-Pathfinding-out-of-World-Border.patch => 0116-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0116-Optimize-World.isLoaded-BlockPosition-Z.patch => 0117-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename patches/server/{0117-Bound-Treasure-Maps-to-World-Border.patch => 0118-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename patches/server/{0118-Configurable-Cartographer-Treasure-Maps.patch => 0119-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0119-Optimize-ItemStack.isEmpty.patch => 0120-Optimize-ItemStack.isEmpty.patch} (100%)
 rename patches/server/{0120-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0121-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/server/{0121-String-based-Action-Bar-API.patch => 0122-String-based-Action-Bar-API.patch} (100%)
 rename patches/server/{0122-Properly-fix-item-duplication-bug.patch => 0123-Properly-fix-item-duplication-bug.patch} (100%)
 rename patches/server/{0123-Firework-API-s.patch => 0124-Firework-API-s.patch} (100%)
 rename patches/server/{0124-PlayerTeleportEndGatewayEvent.patch => 0125-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0125-Provide-E-TE-Chunk-count-stat-methods.patch => 0126-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename patches/server/{0126-Enforce-Sync-Player-Saves.patch => 0127-Enforce-Sync-Player-Saves.patch} (100%)
 rename patches/server/{0127-Don-t-allow-entities-to-ride-themselves-572.patch => 0128-Don-t-allow-entities-to-ride-themselves-572.patch} (100%)
 rename patches/server/{0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename patches/server/{0129-Cap-Entity-Collisions.patch => 0130-Cap-Entity-Collisions.patch} (100%)
 rename patches/server/{0130-Remove-CraftScheduler-Async-Task-Debugger.patch => 0131-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0131-Do-not-let-armorstands-drown.patch => 0132-Do-not-let-armorstands-drown.patch} (100%)
 rename patches/server/{0132-Properly-handle-async-calls-to-restart-the-server.patch => 0133-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename patches/server/{0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (100%)
 rename patches/server/{0134-Add-configuration-option-to-prevent-player-names-fro.patch => 0135-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename patches/server/{0135-Use-TerminalConsoleAppender-for-console-improvements.patch => 0136-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename patches/server/{0136-provide-a-configurable-option-to-disable-creeper-lin.patch => 0137-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0137-Item-canEntityPickup.patch => 0138-Item-canEntityPickup.patch} (100%)
 rename patches/server/{0138-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0139-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0139-PlayerAttemptPickupItemEvent.patch => 0140-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0140-Add-UnknownCommandEvent.patch => 0141-Add-UnknownCommandEvent.patch} (87%)
 rename patches/server/{0141-Basic-PlayerProfile-API.patch => 0142-Basic-PlayerProfile-API.patch} (99%)
 rename patches/server/{0142-Shoulder-Entities-Release-API.patch => 0143-Shoulder-Entities-Release-API.patch} (100%)
 rename patches/server/{0143-Profile-Lookup-Events.patch => 0144-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0144-Block-player-logins-during-server-shutdown.patch => 0145-Block-player-logins-during-server-shutdown.patch} (92%)
 rename patches/server/{0145-Entity-fromMobSpawner.patch => 0146-Entity-fromMobSpawner.patch} (100%)
 rename patches/server/{0146-Improve-the-Saddle-API-for-Horses.patch => 0147-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0147-Implement-ensureServerConversions-API.patch => 0148-Implement-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0148-Implement-getI18NDisplayName.patch => 0149-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0149-ProfileWhitelistVerifyEvent.patch => 0150-ProfileWhitelistVerifyEvent.patch} (100%)
 rename patches/server/{0150-Fix-this-stupid-bullshit.patch => 0151-Fix-this-stupid-bullshit.patch} (95%)
 rename patches/server/{0151-LivingEntity-setKiller.patch => 0152-LivingEntity-setKiller.patch} (100%)
 rename patches/server/{0152-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0153-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename patches/server/{0154-Allow-specifying-a-custom-authentication-servers-dow.patch => 0155-Allow-specifying-a-custom-authentication-servers-dow.patch} (96%)
 rename patches/server/{0155-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0156-Handle-plugin-prefixes-using-Log4J-configuration.patch} (100%)
 rename patches/server/{0156-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0157-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0157-Add-PlayerJumpEvent.patch => 0158-Add-PlayerJumpEvent.patch} (100%)
 rename patches/server/{0158-handle-PacketPlayInKeepAlive-async.patch => 0159-handle-PacketPlayInKeepAlive-async.patch} (100%)
 rename patches/server/{0159-Expose-client-protocol-version-and-virtual-host.patch => 0160-Expose-client-protocol-version-and-virtual-host.patch} (100%)
 rename patches/server/{0160-revert-serverside-behavior-of-keepalives.patch => 0161-revert-serverside-behavior-of-keepalives.patch} (100%)
 rename patches/server/{0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename patches/server/{0162-Add-PlayerArmorChangeEvent.patch => 0163-Add-PlayerArmorChangeEvent.patch} (100%)
 rename patches/server/{0163-Prevent-logins-from-being-processed-when-the-player-.patch => 0164-Prevent-logins-from-being-processed-when-the-player-.patch} (92%)
 rename patches/server/{0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (100%)
 rename patches/server/{0165-use-CB-BlockState-implementations-for-captured-block.patch => 0166-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename patches/server/{0166-API-to-get-a-BlockState-without-a-snapshot.patch => 0167-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0167-AsyncTabCompleteEvent.patch => 0168-AsyncTabCompleteEvent.patch} (98%)
 rename patches/server/{0168-PlayerPickupExperienceEvent.patch => 0169-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0169-Ability-to-apply-mending-to-XP-API.patch => 0170-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename patches/server/{0170-PlayerNaturallySpawnCreaturesEvent.patch => 0171-PlayerNaturallySpawnCreaturesEvent.patch} (97%)
 rename patches/server/{0171-PreCreatureSpawnEvent.patch => 0172-PreCreatureSpawnEvent.patch} (100%)
 rename patches/server/{0172-Add-setPlayerProfile-API-for-Skulls.patch => 0173-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0173-Fill-Profile-Property-Events.patch => 0174-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0174-PlayerAdvancementCriterionGrantEvent.patch => 0175-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0175-Add-ArmorStand-Item-Meta.patch => 0176-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0176-Extend-Player-Interact-cancellation.patch => 0177-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0177-Tameable-getOwnerUniqueId-API.patch => 0178-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename patches/server/{0179-Disable-Explicit-Network-Manager-Flushing.patch => 0180-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0180-Implement-extended-PaperServerListPingEvent.patch => 0181-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/server/{0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename patches/server/{0182-Player.setPlayerProfile-API.patch => 0183-Player.setPlayerProfile-API.patch} (98%)
 rename patches/server/{0183-getPlayerUniqueId-API.patch => 0184-getPlayerUniqueId-API.patch} (90%)
 rename patches/server/{0184-Improved-Async-Task-Scheduler.patch => 0185-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0185-Upstream-config-migrations.patch => 0186-Upstream-config-migrations.patch} (100%)
 rename patches/server/{0186-Make-legacy-ping-handler-more-reliable.patch => 0187-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0187-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0188-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0188-Flag-to-disable-the-channel-limit.patch => 0189-Flag-to-disable-the-channel-limit.patch} (100%)
 rename patches/server/{0189-Add-method-to-open-already-placed-sign.patch => 0190-Add-method-to-open-already-placed-sign.patch} (100%)
 rename patches/server/{0190-Configurable-sprint-interruption-on-attack.patch => 0191-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename patches/server/{0192-EndermanEscapeEvent.patch => 0193-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0193-Enderman.teleportRandomly.patch => 0194-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0194-Block-Enderpearl-Travel-Exploit.patch => 0195-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename patches/server/{0195-Expand-World.spawnParticle-API-and-add-Builder.patch => 0196-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename patches/server/{0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0197-EndermanAttackPlayerEvent.patch => 0198-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0198-WitchConsumePotionEvent.patch => 0199-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0199-WitchThrowPotionEvent.patch => 0200-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0201-WitchReadyPotionEvent.patch => 0202-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0202-ItemStack-getMaxItemUseDuration.patch => 0203-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0203-Implement-EntityTeleportEndGatewayEvent.patch => 0204-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0205-Fix-CraftEntity-hashCode.patch => 0206-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0206-Configurable-Alternative-LootPool-Luck-Formula.patch => 0207-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0207-Print-Error-details-when-failing-to-save-player-data.patch => 0208-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0208-Make-shield-blocking-delay-configurable.patch => 0209-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/server/{0209-Improve-EntityShootBowEvent.patch => 0210-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0210-PlayerReadyArrowEvent.patch => 0211-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0211-Implement-EntityKnockbackByEntityEvent.patch => 0212-Implement-EntityKnockbackByEntityEvent.patch} (100%)
 rename patches/server/{0212-Expand-Explosions-API.patch => 0213-Expand-Explosions-API.patch} (100%)
 rename patches/server/{0213-LivingEntity-Hand-Raised-Item-Use-API.patch => 0214-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0214-RangedEntity-API.patch => 0215-RangedEntity-API.patch} (100%)
 rename patches/server/{0215-Add-config-to-disable-ender-dragon-legacy-check.patch => 0216-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0216-Implement-World.getEntity-UUID-API.patch => 0217-Implement-World.getEntity-UUID-API.patch} (100%)
 rename patches/server/{0217-InventoryCloseEvent-Reason-API.patch => 0218-InventoryCloseEvent-Reason-API.patch} (100%)
 rename patches/server/{0218-Vex-get-setSummoner-API.patch => 0219-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename patches/server/{0220-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0221-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename patches/server/{0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0222-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (100%)
 rename patches/server/{0222-add-more-information-to-Entity.toString.patch => 0223-add-more-information-to-Entity.toString.patch} (100%)
 rename patches/server/{0223-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0224-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename patches/server/{0224-EnderDragon-Events.patch => 0225-EnderDragon-Events.patch} (100%)
 rename patches/server/{0225-PlayerElytraBoostEvent.patch => 0226-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0226-PlayerLaunchProjectileEvent.patch => 0227-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0227-Improve-BlockPosition-inlining.patch => 0228-Improve-BlockPosition-inlining.patch} (100%)
 rename patches/server/{0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename patches/server/{0229-Vanished-players-don-t-have-rights.patch => 0230-Vanished-players-don-t-have-rights.patch} (100%)
 rename patches/server/{0230-Allow-disabling-armour-stand-ticking.patch => 0231-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/server/{0231-SkeletonHorse-Additions.patch => 0232-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0232-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0233-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0233-Implement-Expanded-ArmorStand-API.patch => 0234-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0234-AnvilDamageEvent.patch => 0235-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0235-Add-hand-to-bucket-events.patch => 0236-Add-hand-to-bucket-events.patch} (100%)
 rename patches/server/{0236-Add-TNTPrimeEvent.patch => 0237-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0237-Break-up-and-make-tab-spam-limits-configurable.patch => 0238-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename patches/server/{0238-MC-135506-Experience-should-save-as-Integers.patch => 0239-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename patches/server/{0239-Fix-client-rendering-skulls-from-same-user.patch => 0240-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename patches/server/{0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename patches/server/{0241-Add-Early-Warning-Feature-to-WatchDog.patch => 0242-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename patches/server/{0242-Make-EnderDragon-implement-Mob.patch => 0243-Make-EnderDragon-implement-Mob.patch} (100%)
 rename patches/server/{0243-Use-ConcurrentHashMap-in-JsonList.patch => 0244-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0244-Use-a-Queue-for-Queueing-Commands.patch => 0245-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0245-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0246-Optimize-BlockPosition-helper-methods.patch => 0247-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0247-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (100%)
 rename patches/server/{0248-Slime-Pathfinder-Events.patch => 0249-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0249-Configurable-speed-for-water-flowing-over-lava.patch => 0250-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0250-Optimize-CraftBlockData-Creation.patch => 0251-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0251-Optimize-MappedRegistry.patch => 0252-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0252-Add-PhantomPreSpawnEvent.patch => 0253-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0253-Add-More-Creeper-API.patch => 0254-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0254-Inventory-removeItemAnySlot.patch => 0255-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0255-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0256-Asynchronous-chunk-IO-and-loading.patch => 0257-Asynchronous-chunk-IO-and-loading.patch} (100%)
 rename patches/server/{0257-Add-ray-tracing-methods-to-LivingEntity.patch => 0258-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0258-Expose-attack-cooldown-methods-for-Player.patch => 0259-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0259-Improve-death-events.patch => 0260-Improve-death-events.patch} (100%)
 rename patches/server/{0260-Allow-chests-to-be-placed-with-NBT-data.patch => 0261-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0261-Mob-Pathfinding-API.patch => 0262-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0263-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0264-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0264-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0265-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0266-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0266-Implement-furnace-cook-speed-multiplier-API.patch => 0267-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0267-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0268-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0268-Honor-EntityAgeable.ageLock.patch => 0269-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0269-Configurable-connection-throttle-kick-message.patch => 0270-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0270-Hook-into-CB-plugin-rewrites.patch => 0271-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0271-PreSpawnerSpawnEvent.patch => 0272-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0272-Add-LivingEntity-getTargetEntity.patch => 0273-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/server/{0273-Add-sun-related-API.patch => 0274-Add-sun-related-API.patch} (100%)
 rename patches/server/{0274-Here-s-Johnny.patch => 0275-Here-s-Johnny.patch} (100%)
 rename patches/server/{0275-Turtle-API.patch => 0276-Turtle-API.patch} (100%)
 rename patches/server/{0276-Call-player-spectator-target-events-and-improve-impl.patch => 0277-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0278-Add-Velocity-IP-Forwarding-Support.patch => 0279-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename patches/server/{0279-Add-more-Witch-API.patch => 0280-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0280-Check-Drowned-for-Villager-Aggression-Config.patch => 0281-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0281-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0282-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename patches/server/{0282-Reset-players-airTicks-on-respawn.patch => 0283-Reset-players-airTicks-on-respawn.patch} (100%)
 rename patches/server/{0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0285-Optimize-World-Time-Updates.patch => 0286-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0286-Restore-custom-InventoryHolder-support.patch => 0287-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0287-Use-Vanilla-Minecart-Speeds.patch => 0288-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0288-Fix-SpongeAbsortEvent-handling.patch => 0289-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0289-Don-t-allow-digging-into-unloaded-chunks.patch => 0290-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename patches/server/{0290-Make-the-default-permission-message-configurable.patch => 0291-Make-the-default-permission-message-configurable.patch} (95%)
 rename patches/server/{0291-Prevent-rayTrace-from-loading-chunks.patch => 0292-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0292-Handle-Large-Packets-disconnecting-client.patch => 0293-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0293-force-entity-dismount-during-teleportation.patch => 0294-force-entity-dismount-during-teleportation.patch} (100%)
 rename patches/server/{0294-Add-more-Zombie-API.patch => 0295-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0295-Book-Size-Limits.patch => 0296-Book-Size-Limits.patch} (100%)
 rename patches/server/{0296-Add-PlayerConnectionCloseEvent.patch => 0297-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0297-Prevent-Enderman-from-loading-chunks.patch => 0298-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/server/{0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0300-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename patches/server/{0301-Block-Entity-remove-from-being-called-on-Players.patch => 0302-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/{unapplied/server/0306-BlockDestroyEvent.patch => server/0303-BlockDestroyEvent.patch} (93%)

diff --git a/patches/unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0007-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 87%
rename from patches/unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/api/0007-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 2ca48ec230..5a86927bf3 100644
--- a/patches/unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0007-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0593d5487f411d34edc3d3b15213db4d86af1407..9aa6758e206f5105b6004bb415f04e4e9f8cb24b 100644
+index a238302f2a12194aa30a88867070705dc749b36b..cc42bfa74b41ef6d6374efa7b882f71677fb0824 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2071,6 +2071,20 @@ public final class Bukkit {
-         return server.getCurrentTick();
+@@ -73,6 +73,20 @@ public final class Bukkit {
+         return server;
      }
  
 +    /**
@@ -29,15 +29,15 @@ index 0593d5487f411d34edc3d3b15213db4d86af1407..9aa6758e206f5105b6004bb415f04e4e
 +    }
 +
      /**
-      * Checks if the server is in the process of being shutdown.
-      *
+      * Attempts to set the {@link Server} singleton.
+      * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0691ecbf954ae73df396b356f29a896c59ab680a..eab6b65bb018b4ec8709c8f61a1d7829b8f5316c 100644
+index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..1fb1d4f32af8150711ca766fcd7d0a0c177df7c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1818,6 +1818,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      */
-     int getCurrentTick();
+@@ -58,6 +58,18 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface Server extends PluginMessageRecipient {
  
 +    /**
 +     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
@@ -52,13 +52,13 @@ index 0691ecbf954ae73df396b356f29a896c59ab680a..eab6b65bb018b4ec8709c8f61a1d7829
 +    File getPluginsFolder();
 +
      /**
-      * Checks if the server is in the process of being shutdown.
-      *
+      * Used for all administrative messages, such as an operator using a
+      * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91f838be88 100644
+index 7548e40af8043c1b5716f2d7d0122833466854c4..83d3ee09cc6f91b095f6b8519a431ef70f2b67ec 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -115,6 +115,12 @@ public final class SimplePluginManager implements PluginManager {
+@@ -111,6 +111,12 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Plugin[] loadPlugins(@NotNull File directory) {
@@ -71,7 +71,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
          Validate.notNull(directory, "Directory cannot be null");
          Validate.isTrue(directory.isDirectory(), "Directory must be a directory");
  
-@@ -132,7 +138,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -128,7 +134,11 @@ public final class SimplePluginManager implements PluginManager {
          Map<String, Collection<String>> softDependencies = new HashMap<String, Collection<String>>();
  
          // This is where it figures out all possible plugins
@@ -84,7 +84,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
              PluginLoader loader = null;
              for (Pattern filter : filters) {
                  Matcher match = filter.matcher(file.getName());
-@@ -148,14 +158,14 @@ public final class SimplePluginManager implements PluginManager {
+@@ -144,14 +154,14 @@ public final class SimplePluginManager implements PluginManager {
                  description = loader.getPluginDescription(file);
                  String name = description.getName();
                  if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
@@ -102,7 +102,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                  continue;
              }
  
-@@ -166,7 +176,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -162,7 +172,7 @@ public final class SimplePluginManager implements PluginManager {
                      description.getName(),
                      file.getPath(),
                      replacedFile.getPath(),
@@ -111,7 +111,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                  ));
              }
  
-@@ -187,7 +197,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -183,7 +193,7 @@ public final class SimplePluginManager implements PluginManager {
                              file.getPath(),
                              provided,
                              pluginFile.getPath(),
@@ -120,7 +120,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                      ));
                  } else {
                      String replacedPlugin = pluginsProvided.put(provided, description.getName());
-@@ -269,7 +279,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -265,7 +275,7 @@ public final class SimplePluginManager implements PluginManager {
  
                              server.getLogger().log(
                                  Level.SEVERE,
@@ -129,7 +129,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                                  new UnknownDependencyException("Unknown dependency " + dependency + ". Please download and install " + dependency + " to run this plugin."));
                              break;
                          }
-@@ -308,11 +318,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -304,11 +314,11 @@ public final class SimplePluginManager implements PluginManager {
                              loadedPlugins.add(loadedPlugin.getName());
                              loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
                          } else {
@@ -143,7 +143,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                      }
                  }
              }
-@@ -339,11 +349,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -335,11 +345,11 @@ public final class SimplePluginManager implements PluginManager {
                                  loadedPlugins.add(loadedPlugin.getName());
                                  loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
                              } else {
@@ -157,7 +157,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                          }
                      }
                  }
-@@ -356,7 +366,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -352,7 +362,7 @@ public final class SimplePluginManager implements PluginManager {
                      while (failedPluginIterator.hasNext()) {
                          File file = failedPluginIterator.next();
                          failedPluginIterator.remove();
@@ -167,10 +167,10 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
                  }
              }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 80236a0934861902db7f15571d0d9b4902e70045..d2712f45dbcf26fabe8463d99f378bf422c66970 100644
+index cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..9700ed558e65260264279b92dc661f39a0d0209c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -94,7 +94,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -91,7 +91,7 @@ public final class JavaPluginLoader implements PluginLoader {
              throw new InvalidPluginException(ex);
          }
  
diff --git a/patches/api/0007-Adventure.patch b/patches/api/0008-Adventure.patch
similarity index 99%
rename from patches/api/0007-Adventure.patch
rename to patches/api/0008-Adventure.patch
index ddfa86865a..6abe116926 100644
--- a/patches/api/0007-Adventure.patch
+++ b/patches/api/0008-Adventure.patch
@@ -472,10 +472,10 @@ index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b958de6a17f 100644
+index cc42bfa74b41ef6d6374efa7b882f71677fb0824..ef06bd2972e0a4e7ffa0e91d2b0de5d7f8425edc 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -312,7 +312,9 @@ public final class Bukkit {
+@@ -326,7 +326,9 @@ public final class Bukkit {
       *
       * @param message the message
       * @return the number of players
@@ -485,7 +485,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -955,6 +957,19 @@ public final class Bukkit {
+@@ -969,6 +971,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -505,7 +505,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -964,6 +979,21 @@ public final class Bukkit {
+@@ -978,6 +993,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -527,7 +527,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1163,6 +1193,7 @@ public final class Bukkit {
+@@ -1177,6 +1207,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -535,7 +535,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1188,6 +1219,38 @@ public final class Bukkit {
+@@ -1202,6 +1233,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -574,7 +574,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1206,6 +1269,7 @@ public final class Bukkit {
+@@ -1220,6 +1283,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -582,7 +582,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1218,10 +1282,30 @@ public final class Bukkit {
+@@ -1232,10 +1296,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -613,7 +613,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      /**
       * Creates an empty merchant.
       *
-@@ -1229,7 +1313,20 @@ public final class Bukkit {
+@@ -1243,7 +1327,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -634,7 +634,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1309,22 +1406,47 @@ public final class Bukkit {
+@@ -1323,22 +1420,47 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -756,10 +756,10 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c87fb5d0a 100644
+index 1fb1d4f32af8150711ca766fcd7d0a0c177df7c4..4bea157f06924d80a850dd315152812975855fe9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -56,13 +56,13 @@ import org.jetbrains.annotations.Nullable;
+@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a server implementation.
   */
@@ -767,6 +767,8 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
 +public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
  
      /**
+      * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
+@@ -74,7 +74,7 @@ public interface Server extends PluginMessageRecipient {
       * Used for all administrative messages, such as an operator using a
       * command.
       * <p>
@@ -775,7 +777,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
       */
      public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
  
-@@ -70,7 +70,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -82,7 +82,7 @@ public interface Server extends PluginMessageRecipient {
       * Used for all announcement messages, such as informing users that a
       * player has joined.
       * <p>
@@ -784,7 +786,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
       */
      public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
  
-@@ -257,7 +257,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -269,7 +269,9 @@ public interface Server extends PluginMessageRecipient {
       *
       * @param message the message
       * @return the number of players
@@ -794,7 +796,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -809,8 +811,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -821,8 +823,33 @@ public interface Server extends PluginMessageRecipient {
       * @param permission the required permission {@link Permissible
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
@@ -828,7 +830,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -975,6 +1002,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -987,6 +1014,7 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -836,7 +838,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1000,6 +1028,36 @@ public interface Server extends PluginMessageRecipient {
+@@ -1012,6 +1040,36 @@ public interface Server extends PluginMessageRecipient {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -873,7 +875,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
      /**
-@@ -1014,6 +1072,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1026,6 +1084,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -896,7 +898,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1024,10 +1098,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1036,10 +1110,13 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -910,7 +912,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      /**
       * Creates an empty merchant.
       *
-@@ -1035,7 +1112,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1047,7 +1124,18 @@ public interface Server extends PluginMessageRecipient {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -929,7 +931,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1099,20 +1187,41 @@ public interface Server extends PluginMessageRecipient {
+@@ -1111,20 +1199,41 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -971,7 +973,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
      String getShutdownMessage();
  
      /**
-@@ -1489,7 +1598,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1501,7 +1610,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -981,7 +983,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1498,7 +1609,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1510,7 +1621,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
diff --git a/patches/api/0008-Player-affects-spawning-API.patch b/patches/api/0009-Player-affects-spawning-API.patch
similarity index 100%
rename from patches/api/0008-Player-affects-spawning-API.patch
rename to patches/api/0009-Player-affects-spawning-API.patch
diff --git a/patches/api/0009-Add-getTPS-method.patch b/patches/api/0010-Add-getTPS-method.patch
similarity index 80%
rename from patches/api/0009-Add-getTPS-method.patch
rename to patches/api/0010-Add-getTPS-method.patch
index 51a7b901d3..e689523512 100644
--- a/patches/api/0009-Add-getTPS-method.patch
+++ b/patches/api/0010-Add-getTPS-method.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b8e63b2c2870dd2eb9d31f51590b9b958de6a17f..06d84ca5ce794d264dc50b83283bc09e550b8cb7 100644
+index ef06bd2972e0a4e7ffa0e91d2b0de5d7f8425edc..fb2001968b4f7498da9ea7bbb79468c1e5383c0f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1671,6 +1671,17 @@ public final class Bukkit {
+@@ -1685,6 +1685,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index b8e63b2c2870dd2eb9d31f51590b9b958de6a17f..06d84ca5ce794d264dc50b83283bc09e
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f048278df8abb313a319136e8b697d9c87fb5d0a..c076053238cd6f1787834ee505497d66a17d3769 100644
+index 4bea157f06924d80a850dd315152812975855fe9..dfe7aa74fb4b49a2f3994571c041f1a5d9668841 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1414,6 +1414,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1426,6 +1426,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/patches/api/0010-Version-Command-2.0.patch b/patches/api/0011-Version-Command-2.0.patch
similarity index 100%
rename from patches/api/0010-Version-Command-2.0.patch
rename to patches/api/0011-Version-Command-2.0.patch
diff --git a/patches/api/0011-Entity-Origin-API.patch b/patches/api/0012-Entity-Origin-API.patch
similarity index 100%
rename from patches/api/0011-Entity-Origin-API.patch
rename to patches/api/0012-Entity-Origin-API.patch
diff --git a/patches/api/0012-Add-PlayerLocaleChangeEvent.patch b/patches/api/0013-Add-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/api/0012-Add-PlayerLocaleChangeEvent.patch
rename to patches/api/0013-Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/api/0013-Add-view-distance-API.patch b/patches/api/0014-Add-view-distance-API.patch
similarity index 100%
rename from patches/api/0013-Add-view-distance-API.patch
rename to patches/api/0014-Add-view-distance-API.patch
diff --git a/patches/api/0014-Add-BeaconEffectEvent.patch b/patches/api/0015-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/api/0014-Add-BeaconEffectEvent.patch
rename to patches/api/0015-Add-BeaconEffectEvent.patch
diff --git a/patches/api/0015-Add-PlayerInitialSpawnEvent.patch b/patches/api/0016-Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/api/0015-Add-PlayerInitialSpawnEvent.patch
rename to patches/api/0016-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch b/patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch
similarity index 91%
rename from patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
rename to patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch
index fcf406e1d2..9c2a682225 100644
--- a/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Automatically disable plugins that fail to load
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..a3bc4155536f612ee2ae38ec7f16b974bdd24ab2 100644
+index 9700ed558e65260264279b92dc661f39a0d0209c..451fce7223834169751679ce6dc22de3df24eae9 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -335,6 +335,10 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0017-Expose-server-CommandMap.patch b/patches/api/0018-Expose-server-CommandMap.patch
similarity index 81%
rename from patches/api/0017-Expose-server-CommandMap.patch
rename to patches/api/0018-Expose-server-CommandMap.patch
index f1bd7894bb..de71d57cfe 100644
--- a/patches/api/0017-Expose-server-CommandMap.patch
+++ b/patches/api/0018-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 06d84ca5ce794d264dc50b83283bc09e550b8cb7..7da8180e4408a233af334a13661ebbc6781318ec 100644
+index fb2001968b4f7498da9ea7bbb79468c1e5383c0f..93598a80a3f71d5e90fa9d7c93c01e1024c045c8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1855,6 +1855,19 @@ public final class Bukkit {
+@@ -1869,6 +1869,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 06d84ca5ce794d264dc50b83283bc09e550b8cb7..7da8180e4408a233af334a13661ebbc6
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c076053238cd6f1787834ee505497d66a17d3769..ad16ce2f62d6519efe8ec6da94aa2ae255521480 100644
+index dfe7aa74fb4b49a2f3994571c041f1a5d9668841..b476f473078512363a7142d82fbc28afaa4690ff 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1424,6 +1424,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1436,6 +1436,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  
diff --git a/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 93%
rename from patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index fae395839a..4c3bf26717 100644
--- a/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7da8180e4408a233af334a13661ebbc6781318ec..0b6299a586e25f97eb734e650728e50d19ad16ce 100644
+index 93598a80a3f71d5e90fa9d7c93c01e1024c045c8..f1612106fa284f9d69f4b8981e5e5efac22765b8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -319,6 +319,30 @@ public final class Bukkit {
+@@ -333,6 +333,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index 7da8180e4408a233af334a13661ebbc6781318ec..0b6299a586e25f97eb734e650728e50d
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ad16ce2f62d6519efe8ec6da94aa2ae255521480..797ff4d2b16fba1a423c8dc247fde0ad9199b5c1 100644
+index b476f473078512363a7142d82fbc28afaa4690ff..30252583c457a1afafa4172321e13673fb19c08f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -262,6 +262,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -274,6 +274,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
diff --git a/patches/api/0019-Add-exception-reporting-event.patch b/patches/api/0020-Add-exception-reporting-event.patch
similarity index 98%
rename from patches/api/0019-Add-exception-reporting-event.patch
rename to patches/api/0020-Add-exception-reporting-event.patch
index 0b5258ca98..7e3a242290 100644
--- a/patches/api/0019-Add-exception-reporting-event.patch
+++ b/patches/api/0020-Add-exception-reporting-event.patch
@@ -506,7 +506,7 @@ index f020cb04eba27a2e70fc7cf799ebbfb434b9d974..adfc7aae2c0f49bbcdd358e83b04a0cf
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c57fc647bf 100644
+index 83d3ee09cc6f91b095f6b8519a431ef70f2b67ec..1fbf690403eefe017b146c141c6d47d9b8d9d4bb 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -23,6 +23,10 @@ import java.util.WeakHashMap;
@@ -520,7 +520,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
  import org.apache.commons.lang.Validate;
  import org.bukkit.Server;
  import org.bukkit.World;
-@@ -478,7 +482,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -488,7 +492,8 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().enablePlugin(plugin);
              } catch (Throwable ex) {
@@ -530,7 +530,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
              }
  
              HandlerList.bakeAll();
-@@ -499,32 +504,37 @@ public final class SimplePluginManager implements PluginManager {
+@@ -509,32 +514,37 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
              } catch (Throwable ex) {
@@ -573,7 +573,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
              }
  
              try {
-@@ -537,6 +547,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -547,6 +557,13 @@ public final class SimplePluginManager implements PluginManager {
          }
      }
  
@@ -587,7 +587,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
      @Override
      public void clearPlugins() {
          synchronized (this) {
-@@ -600,7 +617,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -610,7 +627,13 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
diff --git a/patches/api/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 100%
rename from patches/api/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 100%
rename from patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
rename to patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/0022-Player-Tab-List-and-Title-APIs.patch b/patches/api/0023-Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/api/0022-Player-Tab-List-and-Title-APIs.patch
rename to patches/api/0023-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/0024-Complete-resource-pack-API.patch b/patches/api/0025-Complete-resource-pack-API.patch
similarity index 100%
rename from patches/api/0024-Complete-resource-pack-API.patch
rename to patches/api/0025-Complete-resource-pack-API.patch
diff --git a/patches/api/0025-Use-ASM-for-event-executors.patch b/patches/api/0026-Use-ASM-for-event-executors.patch
similarity index 99%
rename from patches/api/0025-Use-ASM-for-event-executors.patch
rename to patches/api/0026-Use-ASM-for-event-executors.patch
index c74174175e..a890aa8749 100644
--- a/patches/api/0025-Use-ASM-for-event-executors.patch
+++ b/patches/api/0026-Use-ASM-for-event-executors.patch
@@ -362,7 +362,7 @@ index a850f0780de05463fc0d3f9e15ff7f19d88b2aed..9026e108ccd3a88aee1267ee275137be
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index a3bc4155536f612ee2ae38ec7f16b974bdd24ab2..b7cd98f20de3421cd3b8a95cfa2155fa77afa8b1 100644
+index 451fce7223834169751679ce6dc22de3df24eae9..0cbac77e16fc36d805b79dd44837a38a79618c0b 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -291,21 +291,7 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0026-Add-a-call-helper-to-Event.patch b/patches/api/0027-Add-a-call-helper-to-Event.patch
similarity index 100%
rename from patches/api/0026-Add-a-call-helper-to-Event.patch
rename to patches/api/0027-Add-a-call-helper-to-Event.patch
diff --git a/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch
similarity index 100%
rename from patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch
rename to patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
similarity index 90%
rename from patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
rename to patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
index aefcac4105..7f906cf81b 100644
--- a/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0b6299a586e25f97eb734e650728e50d19ad16ce..308d9cd655c37e8a00bb053ecd2ba2450555158f 100644
+index f1612106fa284f9d69f4b8981e5e5efac22765b8..0a2fc619ec9f28b43920cedcd18b75edfa66a36b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1890,6 +1890,13 @@ public final class Bukkit {
+@@ -1904,6 +1904,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 0b6299a586e25f97eb734e650728e50d19ad16ce..308d9cd655c37e8a00bb053ecd2ba245
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 797ff4d2b16fba1a423c8dc247fde0ad9199b5c1..51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc 100644
+index 30252583c457a1afafa4172321e13673fb19c08f..07146beb9009e7f631905db0c86a4f4a048039da 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1670,4 +1670,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1682,4 +1682,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end
@@ -85,10 +85,10 @@ index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index c2c49ee9b5531bc4761d2da54cd707c57fc647bf..2d27dfb859c312d46a14d0356c7c3f227e965a67 100644
+index 1fbf690403eefe017b146c141c6d47d9b8d9d4bb..3ffe519b759f440f56f3054b0d3e4120b59f8c62 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -895,4 +895,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -905,4 +905,13 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
      }
diff --git a/patches/api/0029-Custom-replacement-for-eaten-items.patch b/patches/api/0030-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/api/0029-Custom-replacement-for-eaten-items.patch
rename to patches/api/0030-Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/0031-EntityPathfindEvent.patch b/patches/api/0032-EntityPathfindEvent.patch
similarity index 100%
rename from patches/api/0031-EntityPathfindEvent.patch
rename to patches/api/0032-EntityPathfindEvent.patch
diff --git a/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 100%
rename from patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 100%
rename from patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
rename to patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/0036-Arrow-pickup-rule-API.patch b/patches/api/0037-Arrow-pickup-rule-API.patch
similarity index 100%
rename from patches/api/0036-Arrow-pickup-rule-API.patch
rename to patches/api/0037-Arrow-pickup-rule-API.patch
diff --git a/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/0038-LootTable-API.patch b/patches/api/0039-LootTable-API.patch
similarity index 100%
rename from patches/api/0038-LootTable-API.patch
rename to patches/api/0039-LootTable-API.patch
diff --git a/patches/api/0039-Add-EntityZapEvent.patch b/patches/api/0040-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/api/0039-Add-EntityZapEvent.patch
rename to patches/api/0040-Add-EntityZapEvent.patch
diff --git a/patches/api/0040-Misc-Utils.patch b/patches/api/0041-Misc-Utils.patch
similarity index 100%
rename from patches/api/0040-Misc-Utils.patch
rename to patches/api/0041-Misc-Utils.patch
diff --git a/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
rename to patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
index d635ef31e5..18acabd480 100644
--- a/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e0840145a 100644
+index 0a2fc619ec9f28b43920cedcd18b75edfa66a36b..2c94d2adfe6de1ea4d7d6d8f169e19f3cc0a9f08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1897,6 +1897,15 @@ public final class Bukkit {
+@@ -1911,6 +1911,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc..c0bd764744b101856ef4fa068b5218688b156ecf 100644
+index 07146beb9009e7f631905db0c86a4f4a048039da..2b1c1fc275ce773f87a669c858ab00108cd0e39b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1672,4 +1672,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1684,4 +1684,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/0043-Add-ProjectileCollideEvent.patch b/patches/api/0044-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/api/0043-Add-ProjectileCollideEvent.patch
rename to patches/api/0044-Add-ProjectileCollideEvent.patch
diff --git a/patches/api/0044-Add-String-based-Action-Bar-API.patch b/patches/api/0045-Add-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/api/0044-Add-String-based-Action-Bar-API.patch
rename to patches/api/0045-Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/0046-IllegalPacketEvent.patch b/patches/api/0047-IllegalPacketEvent.patch
similarity index 100%
rename from patches/api/0046-IllegalPacketEvent.patch
rename to patches/api/0047-IllegalPacketEvent.patch
diff --git a/patches/api/0047-Fireworks-API-s.patch b/patches/api/0048-Fireworks-API-s.patch
similarity index 100%
rename from patches/api/0047-Fireworks-API-s.patch
rename to patches/api/0048-Fireworks-API-s.patch
diff --git a/patches/api/0048-PlayerTeleportEndGatewayEvent.patch b/patches/api/0049-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/api/0048-PlayerTeleportEndGatewayEvent.patch
rename to patches/api/0049-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 100%
rename from patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
rename to patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 88%
rename from patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
index 123d3d08e9..6b0c0e1396 100644
--- a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec50a5b7b1b 100644
+index 2c94d2adfe6de1ea4d7d6d8f169e19f3cc0a9f08..675f3d9c5213eb55cb10064c6df339e1d301989e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1906,6 +1906,16 @@ public final class Bukkit {
+@@ -1920,6 +1920,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec5
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0bd764744b101856ef4fa068b5218688b156ecf..2de18d69ad80fe872b36a4975b354cb144b3a302 100644
+index 2b1c1fc275ce773f87a669c858ab00108cd0e39b..50c0fc0eb2c3fb7aec23594453e1b51264b83758 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1674,4 +1674,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1686,4 +1686,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch
similarity index 94%
rename from patches/api/0053-Fix-upstream-javadocs.patch
rename to patches/api/0054-Fix-upstream-javadocs.patch
index 69aacfad4b..4e4097422b 100644
--- a/patches/api/0053-Fix-upstream-javadocs.patch
+++ b/patches/api/0054-Fix-upstream-javadocs.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb2394f238c45 100644
+index 675f3d9c5213eb55cb10064c6df339e1d301989e..94c7ede642fa11d9065b494745ca23c8657b0616 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1163,6 +1163,8 @@ public final class Bukkit {
+@@ -1177,6 +1177,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -19,10 +19,10 @@ index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb239
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2de18d69ad80fe872b36a4975b354cb144b3a302..d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90 100644
+index 50c0fc0eb2c3fb7aec23594453e1b51264b83758..5b38517a366d4e695b7d4ea7af8177660b79b32b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -980,6 +980,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -992,6 +992,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
diff --git a/patches/api/0054-Item-canEntityPickup.patch b/patches/api/0055-Item-canEntityPickup.patch
similarity index 100%
rename from patches/api/0054-Item-canEntityPickup.patch
rename to patches/api/0055-Item-canEntityPickup.patch
diff --git a/patches/api/0055-PlayerAttemptPickupItemEvent.patch b/patches/api/0056-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/api/0055-PlayerAttemptPickupItemEvent.patch
rename to patches/api/0056-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/0056-Add-UnknownCommandEvent.patch b/patches/api/0057-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/api/0056-Add-UnknownCommandEvent.patch
rename to patches/api/0057-Add-UnknownCommandEvent.patch
diff --git a/patches/api/0057-Basic-PlayerProfile-API.patch b/patches/api/0058-Basic-PlayerProfile-API.patch
similarity index 97%
rename from patches/api/0057-Basic-PlayerProfile-API.patch
rename to patches/api/0058-Basic-PlayerProfile-API.patch
index 82981fc9a7..0a24a0b781 100644
--- a/patches/api/0057-Basic-PlayerProfile-API.patch
+++ b/patches/api/0058-Basic-PlayerProfile-API.patch
@@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fa3cd5395ec29d7c51c792720acbb2394f238c45..6c7b1e172a9acc881ecade6543245e8a64e251f6 100644
+index 94c7ede642fa11d9065b494745ca23c8657b0616..621a6e09322de838a9d7de481a32f458e351d814 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1918,6 +1918,40 @@ public final class Bukkit {
+@@ -1932,6 +1932,40 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -312,10 +312,10 @@ index fa3cd5395ec29d7c51c792720acbb2394f238c45..6c7b1e172a9acc881ecade6543245e8a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90..8021598d78170ea1676cf21bac63858528398f53 100644
+index 5b38517a366d4e695b7d4ea7af8177660b79b32b..e9945187a8af2688dae2eeb007a2a16bd5e88560 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1685,5 +1685,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1697,5 +1697,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/0059-Shoulder-Entities-Release-API.patch b/patches/api/0060-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/api/0059-Shoulder-Entities-Release-API.patch
rename to patches/api/0060-Shoulder-Entities-Release-API.patch
diff --git a/patches/api/0060-Entity-fromMobSpawner.patch b/patches/api/0061-Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/api/0060-Entity-fromMobSpawner.patch
rename to patches/api/0061-Entity-fromMobSpawner.patch
diff --git a/patches/api/0061-Profile-Lookup-Events.patch b/patches/api/0062-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/api/0061-Profile-Lookup-Events.patch
rename to patches/api/0062-Profile-Lookup-Events.patch
diff --git a/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0063-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
rename to patches/api/0063-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/0063-Add-getI18NDisplayName-API.patch b/patches/api/0064-Add-getI18NDisplayName-API.patch
similarity index 100%
rename from patches/api/0063-Add-getI18NDisplayName-API.patch
rename to patches/api/0064-Add-getI18NDisplayName-API.patch
diff --git a/patches/api/0064-ensureServerConversions-API.patch b/patches/api/0065-ensureServerConversions-API.patch
similarity index 100%
rename from patches/api/0064-ensureServerConversions-API.patch
rename to patches/api/0065-ensureServerConversions-API.patch
diff --git a/patches/api/0065-Make-plugins-list-alphabetical.patch b/patches/api/0066-Make-plugins-list-alphabetical.patch
similarity index 100%
rename from patches/api/0065-Make-plugins-list-alphabetical.patch
rename to patches/api/0066-Make-plugins-list-alphabetical.patch
diff --git a/patches/api/0066-LivingEntity-setKiller.patch b/patches/api/0067-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/api/0066-LivingEntity-setKiller.patch
rename to patches/api/0067-LivingEntity-setKiller.patch
diff --git a/patches/api/0067-ProfileWhitelistVerifyEvent.patch b/patches/api/0068-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/api/0067-ProfileWhitelistVerifyEvent.patch
rename to patches/api/0068-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 100%
rename from patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
rename to patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 100%
rename from patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/0070-Add-PlayerJumpEvent.patch b/patches/api/0071-Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/api/0070-Add-PlayerJumpEvent.patch
rename to patches/api/0071-Add-PlayerJumpEvent.patch
diff --git a/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 100%
rename from patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/0072-Add-PlayerArmorChangeEvent.patch b/patches/api/0073-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/api/0072-Add-PlayerArmorChangeEvent.patch
rename to patches/api/0073-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 91%
rename from patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
index 26c4c4cc18..63960c3831 100644
--- a/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index da0964b1b6555ad50cb2ee47f13a7b9dfb1ab6aa..3ca05a6e86a5329cf452041eac476e3636eec34a 100644
+index ce1e1e6cc6740d568fbf859c7e2c014fab5a59cd..62ab55729e69bfac8eb4b40d877b945d95df27cd 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -271,6 +271,16 @@ public interface Block extends Metadatable {
diff --git a/patches/api/0074-AsyncTabCompleteEvent.patch b/patches/api/0075-AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/api/0074-AsyncTabCompleteEvent.patch
rename to patches/api/0075-AsyncTabCompleteEvent.patch
diff --git a/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
similarity index 96%
rename from patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
index 7d1caf10dc..24cb81811a 100644
--- a/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0dae92b41684e9c2ada74d8987f922db04a419ca..34445011ccd22753a345dfc1ff87e01d2432654c 100644
+index 4771a1537646217ad0836f7d5ed62940339b44c6..a0782b81e787630cb45b38a863f1e98506014735 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch
similarity index 100%
rename from patches/api/0076-Display-warning-on-deprecated-recipe-API.patch
rename to patches/api/0077-Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/0077-PlayerPickupExperienceEvent.patch b/patches/api/0078-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/api/0077-PlayerPickupExperienceEvent.patch
rename to patches/api/0078-PlayerPickupExperienceEvent.patch
diff --git a/patches/api/0078-ExperienceOrbMergeEvent.patch b/patches/api/0079-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/api/0078-ExperienceOrbMergeEvent.patch
rename to patches/api/0079-ExperienceOrbMergeEvent.patch
diff --git a/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/api/0079-Ability-to-apply-mending-to-XP-API.patch
rename to patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/0080-PreCreatureSpawnEvent.patch b/patches/api/0081-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/api/0080-PreCreatureSpawnEvent.patch
rename to patches/api/0081-PreCreatureSpawnEvent.patch
diff --git a/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/0083-Fill-Profile-Property-Events.patch b/patches/api/0084-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/api/0083-Fill-Profile-Property-Events.patch
rename to patches/api/0084-Fill-Profile-Property-Events.patch
diff --git a/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/api/0085-Add-ArmorStand-Item-Meta.patch b/patches/api/0086-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/api/0085-Add-ArmorStand-Item-Meta.patch
rename to patches/api/0086-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/0086-Optimize-Hoppers.patch b/patches/api/0087-Optimize-Hoppers.patch
similarity index 100%
rename from patches/api/0086-Optimize-Hoppers.patch
rename to patches/api/0087-Optimize-Hoppers.patch
diff --git a/patches/api/0087-Tameable-getOwnerUniqueId-API.patch b/patches/api/0088-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/api/0087-Tameable-getOwnerUniqueId-API.patch
rename to patches/api/0088-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/api/0089-Add-extended-PaperServerListPingEvent.patch b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/api/0089-Add-extended-PaperServerListPingEvent.patch
rename to patches/api/0090-Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/0090-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/api/0090-Player.setPlayerProfile-API.patch
rename to patches/api/0091-Player.setPlayerProfile-API.patch
diff --git a/patches/api/0091-getPlayerUniqueId-API.patch b/patches/api/0092-getPlayerUniqueId-API.patch
similarity index 87%
rename from patches/api/0091-getPlayerUniqueId-API.patch
rename to patches/api/0092-getPlayerUniqueId-API.patch
index 701f46719d..0172af8bdb 100644
--- a/patches/api/0091-getPlayerUniqueId-API.patch
+++ b/patches/api/0092-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6c7b1e172a9acc881ecade6543245e8a64e251f6..b0457e7740dda723b6eda481bcea3560d55333f1 100644
+index 621a6e09322de838a9d7de481a32f458e351d814..832b3f72c4a314dc0f38d412bdc999508f7d2b7b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -559,6 +559,20 @@ public final class Bukkit {
+@@ -573,6 +573,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 6c7b1e172a9acc881ecade6543245e8a64e251f6..b0457e7740dda723b6eda481bcea3560
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8021598d78170ea1676cf21bac63858528398f53..44a5e05fbc00aa878cd31879677d0aad779eb175 100644
+index e9945187a8af2688dae2eeb007a2a16bd5e88560..58e347f771b85c6bfbb06690f6a80fffaf1538f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -477,6 +477,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -489,6 +489,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public Player getPlayer(@NotNull UUID id);
  
diff --git a/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/0093-Add-method-to-open-already-placed-sign.patch b/patches/api/0094-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/api/0093-Add-method-to-open-already-placed-sign.patch
rename to patches/api/0094-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
similarity index 100%
rename from patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch
rename to patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/0095-EndermanEscapeEvent.patch b/patches/api/0096-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/api/0095-EndermanEscapeEvent.patch
rename to patches/api/0096-EndermanEscapeEvent.patch
diff --git a/patches/api/0096-Enderman.teleportRandomly.patch b/patches/api/0097-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/api/0096-Enderman.teleportRandomly.patch
rename to patches/api/0097-Enderman.teleportRandomly.patch
diff --git a/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch
similarity index 100%
rename from patches/api/0097-Additional-world.getNearbyEntities-API-s.patch
rename to patches/api/0098-Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/api/0098-Location.isChunkLoaded-API.patch b/patches/api/0099-Location.isChunkLoaded-API.patch
similarity index 100%
rename from patches/api/0098-Location.isChunkLoaded-API.patch
rename to patches/api/0099-Location.isChunkLoaded-API.patch
diff --git a/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/0100-EndermanAttackPlayerEvent.patch b/patches/api/0101-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/api/0100-EndermanAttackPlayerEvent.patch
rename to patches/api/0101-EndermanAttackPlayerEvent.patch
diff --git a/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 94%
rename from patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
rename to patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch
index ae4dc00ba4..b3ea4ce83f 100644
--- a/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -66,10 +66,10 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..0d1b20f2b5580ea5505ccc2f003925db
       * Gets a {@link Permission} from its fully qualified name
       *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 2d27dfb859c312d46a14d0356c7c3f227e965a67..7867243a8ed67416895cdcd949ac424f5d29d98b 100644
+index 3ffe519b759f440f56f3054b0d3e4120b59f8c62..c43d819bae5bc51bcf57a575bc22aee9d501c562 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -498,6 +498,21 @@ public final class SimplePluginManager implements PluginManager {
+@@ -508,6 +508,21 @@ public final class SimplePluginManager implements PluginManager {
          }
      }
  
@@ -92,7 +92,7 @@ index 2d27dfb859c312d46a14d0356c7c3f227e965a67..7867243a8ed67416895cdcd949ac424f
      public void disablePlugin(@NotNull final Plugin plugin) {
          if (plugin.isEnabled()) {
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index b7cd98f20de3421cd3b8a95cfa2155fa77afa8b1..7483ceff298cafa244bd99316a0338aa075267d4 100644
+index 0cbac77e16fc36d805b79dd44837a38a79618c0b..47b306929654855944b1e95f81c641dea6102096 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -366,6 +366,7 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0102-WitchConsumePotionEvent.patch b/patches/api/0103-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/api/0102-WitchConsumePotionEvent.patch
rename to patches/api/0103-WitchConsumePotionEvent.patch
diff --git a/patches/api/0103-WitchThrowPotionEvent.patch b/patches/api/0104-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/api/0103-WitchThrowPotionEvent.patch
rename to patches/api/0104-WitchThrowPotionEvent.patch
diff --git a/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch
similarity index 100%
rename from patches/api/0104-Location.toBlockLocation-toCenterLocation.patch
rename to patches/api/0105-Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/0105-PotionEffect-clone-methods.patch b/patches/api/0106-PotionEffect-clone-methods.patch
similarity index 100%
rename from patches/api/0105-PotionEffect-clone-methods.patch
rename to patches/api/0106-PotionEffect-clone-methods.patch
diff --git a/patches/api/0106-WitchReadyPotionEvent.patch b/patches/api/0107-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/api/0106-WitchReadyPotionEvent.patch
rename to patches/api/0107-WitchReadyPotionEvent.patch
diff --git a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/api/0107-ItemStack-getMaxItemUseDuration.patch
rename to patches/api/0108-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch
rename to patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/0109-Make-shield-blocking-delay-configurable.patch b/patches/api/0110-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/api/0109-Make-shield-blocking-delay-configurable.patch
rename to patches/api/0110-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 100%
rename from patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch
similarity index 100%
rename from patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch
rename to patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/0112-PlayerReadyArrowEvent.patch b/patches/api/0113-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/api/0112-PlayerReadyArrowEvent.patch
rename to patches/api/0113-PlayerReadyArrowEvent.patch
diff --git a/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch b/patches/api/0114-Add-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from patches/api/0113-Add-EntityKnockbackByEntityEvent.patch
rename to patches/api/0114-Add-EntityKnockbackByEntityEvent.patch
diff --git a/patches/api/0114-Expand-Explosions-API.patch b/patches/api/0115-Expand-Explosions-API.patch
similarity index 100%
rename from patches/api/0114-Expand-Explosions-API.patch
rename to patches/api/0115-Expand-Explosions-API.patch
diff --git a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 100%
rename from patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/api/0117-RangedEntity-API.patch b/patches/api/0118-RangedEntity-API.patch
similarity index 100%
rename from patches/api/0117-RangedEntity-API.patch
rename to patches/api/0118-RangedEntity-API.patch
diff --git a/patches/api/0118-Add-World.getEntity-UUID-API.patch b/patches/api/0119-Add-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/api/0118-Add-World.getEntity-UUID-API.patch
rename to patches/api/0119-Add-World.getEntity-UUID-API.patch
diff --git a/patches/api/0119-InventoryCloseEvent-Reason-API.patch b/patches/api/0120-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/api/0119-InventoryCloseEvent-Reason-API.patch
rename to patches/api/0120-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/api/0120-Allow-setting-the-vex-s-summoner.patch b/patches/api/0121-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from patches/api/0120-Allow-setting-the-vex-s-summoner.patch
rename to patches/api/0121-Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/0121-Entity-getChunk-API.patch b/patches/api/0122-Entity-getChunk-API.patch
similarity index 100%
rename from patches/api/0121-Entity-getChunk-API.patch
rename to patches/api/0122-Entity-getChunk-API.patch
diff --git a/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 97%
rename from patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
rename to patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
index 8a902c9104..236c34775b 100644
--- a/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -45,7 +45,7 @@ index 4de959bbd1270d7d6ea8e5e69521bcca6abe2138..1aa58c59e1e8738bbdc77752885ff3b1
              if (plugin.getDescription().getProvides().size() > 0) {
                  pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 7483ceff298cafa244bd99316a0338aa075267d4..4e8e828e70a9dde41d274440bef9d7c72f5891b3 100644
+index 47b306929654855944b1e95f81c641dea6102096..922bb2cbfaf1e4cd111b7ad286c867c4d9f47e05 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -306,7 +306,14 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0123-EnderDragon-Events.patch b/patches/api/0124-EnderDragon-Events.patch
similarity index 100%
rename from patches/api/0123-EnderDragon-Events.patch
rename to patches/api/0124-EnderDragon-Events.patch
diff --git a/patches/api/0124-PlayerElytraBoostEvent.patch b/patches/api/0125-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/api/0124-PlayerElytraBoostEvent.patch
rename to patches/api/0125-PlayerElytraBoostEvent.patch
diff --git a/patches/api/0125-PlayerLaunchProjectileEvent.patch b/patches/api/0126-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/api/0125-PlayerLaunchProjectileEvent.patch
rename to patches/api/0126-PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/0126-EntityTransformedEvent.patch b/patches/api/0127-EntityTransformedEvent.patch
similarity index 100%
rename from patches/api/0126-EntityTransformedEvent.patch
rename to patches/api/0127-EntityTransformedEvent.patch
diff --git a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch b/patches/api/0128-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/api/0127-Allow-disabling-armour-stand-ticking.patch
rename to patches/api/0128-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/0128-SkeletonHorse-Additions.patch b/patches/api/0129-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/api/0128-SkeletonHorse-Additions.patch
rename to patches/api/0129-SkeletonHorse-Additions.patch
diff --git a/patches/api/0129-Expand-Location-Manipulation-API.patch b/patches/api/0130-Expand-Location-Manipulation-API.patch
similarity index 100%
rename from patches/api/0129-Expand-Location-Manipulation-API.patch
rename to patches/api/0130-Expand-Location-Manipulation-API.patch
diff --git a/patches/api/0130-Expand-ArmorStand-API.patch b/patches/api/0131-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/api/0130-Expand-ArmorStand-API.patch
rename to patches/api/0131-Expand-ArmorStand-API.patch
diff --git a/patches/api/0131-AnvilDamageEvent.patch b/patches/api/0132-AnvilDamageEvent.patch
similarity index 100%
rename from patches/api/0131-AnvilDamageEvent.patch
rename to patches/api/0132-AnvilDamageEvent.patch
diff --git a/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch
similarity index 92%
rename from patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
rename to patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch
index 3f5f5d932c..f26cbee033 100644
--- a/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch
@@ -16,10 +16,10 @@ which results in a hard crash.
 This change removes the synchronize and adds some protection around enable/disable
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 7867243a8ed67416895cdcd949ac424f5d29d98b..a3027c1c6109bcb20d0468f6d0cd37182bb279ea 100644
+index c43d819bae5bc51bcf57a575bc22aee9d501c562..3457dd6a86f927dd38edd200121aad5364d8abd5 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -462,7 +462,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -472,7 +472,7 @@ public final class SimplePluginManager implements PluginManager {
       * @return true if the plugin is enabled, otherwise false
       */
      @Override
@@ -28,7 +28,7 @@ index 7867243a8ed67416895cdcd949ac424f5d29d98b..a3027c1c6109bcb20d0468f6d0cd3718
          if ((plugin != null) && (plugins.contains(plugin))) {
              return plugin.isEnabled();
          } else {
-@@ -471,7 +471,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -481,7 +481,7 @@ public final class SimplePluginManager implements PluginManager {
      }
  
      @Override
@@ -37,7 +37,7 @@ index 7867243a8ed67416895cdcd949ac424f5d29d98b..a3027c1c6109bcb20d0468f6d0cd3718
          if (!plugin.isEnabled()) {
              List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
  
-@@ -514,7 +514,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -524,7 +524,7 @@ public final class SimplePluginManager implements PluginManager {
      // Paper end
  
      @Override
@@ -46,7 +46,7 @@ index 7867243a8ed67416895cdcd949ac424f5d29d98b..a3027c1c6109bcb20d0468f6d0cd3718
          if (plugin.isEnabled()) {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
-@@ -583,6 +583,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -593,6 +593,7 @@ public final class SimplePluginManager implements PluginManager {
              defaultPerms.get(false).clear();
          }
      }
@@ -54,7 +54,7 @@ index 7867243a8ed67416895cdcd949ac424f5d29d98b..a3027c1c6109bcb20d0468f6d0cd3718
  
      /**
       * Calls an event with the given details.
-@@ -591,23 +592,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -601,23 +602,13 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public void callEvent(@NotNull Event event) {
diff --git a/patches/api/0133-Add-hand-to-bucket-events.patch b/patches/api/0134-Add-hand-to-bucket-events.patch
similarity index 100%
rename from patches/api/0133-Add-hand-to-bucket-events.patch
rename to patches/api/0134-Add-hand-to-bucket-events.patch
diff --git a/patches/api/0134-Add-TNTPrimeEvent.patch b/patches/api/0135-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/api/0134-Add-TNTPrimeEvent.patch
rename to patches/api/0135-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 100%
rename from patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/api/0136-Make-EnderDragon-extend-Mob.patch b/patches/api/0137-Make-EnderDragon-extend-Mob.patch
similarity index 100%
rename from patches/api/0136-Make-EnderDragon-extend-Mob.patch
rename to patches/api/0137-Make-EnderDragon-extend-Mob.patch
diff --git a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/api/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 100%
rename from patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to patches/api/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 100%
rename from patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to patches/api/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/api/0141-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/api/0140-Slime-Pathfinder-Events.patch
rename to patches/api/0141-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/api/0142-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/api/0141-Add-PhantomPreSpawnEvent.patch
rename to patches/api/0142-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/api/0143-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/api/0142-Add-More-Creeper-API.patch
rename to patches/api/0143-Add-More-Creeper-API.patch
diff --git a/patches/api/0143-Inventory-removeItemAnySlot.patch b/patches/api/0144-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/api/0143-Inventory-removeItemAnySlot.patch
rename to patches/api/0144-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0144-isChunkGenerated-API.patch b/patches/api/0145-isChunkGenerated-API.patch
similarity index 100%
rename from patches/api/0144-isChunkGenerated-API.patch
rename to patches/api/0145-isChunkGenerated-API.patch
diff --git a/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0146-Add-source-block-constructor-and-getChangedBlockData.patch
similarity index 100%
rename from patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch
rename to patches/api/0146-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/api/0147-Async-Chunks-API.patch
similarity index 99%
rename from patches/api/0146-Async-Chunks-API.patch
rename to patches/api/0147-Async-Chunks-API.patch
index 1a0153ff86..a5013f6db3 100644
--- a/patches/api/0146-Async-Chunks-API.patch
+++ b/patches/api/0147-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7f57fe55a13c57bfe833d8e83e2f71fb5e074f5e..fff4d4083a0065655192cff4ed61f4e80a2e7f75 100644
+index 59c796ec6b33b282d1f1ee769bc802a3fe7061b1..a0a4d0f143303bd449494ec1479db1e449836595 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -962,6 +962,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -495,7 +495,7 @@ index 7f57fe55a13c57bfe833d8e83e2f71fb5e074f5e..fff4d4083a0065655192cff4ed61f4e8
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0f1e456c8b278d0fb45871e6f57baf2c6234ed51..0207348eda9a5fcd3814e368a1bc61ae451a1aff 100644
+index c0d6dc1b584c34c541bf9a2549016b4e29818d45..23a3bf005a21cd417f9b2d8ecd64c2887d1e979e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -163,6 +163,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0148-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/api/0148-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0149-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/api/0149-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0149-Improve-death-events.patch b/patches/api/0150-Improve-death-events.patch
similarity index 100%
rename from patches/api/0149-Improve-death-events.patch
rename to patches/api/0150-Improve-death-events.patch
diff --git a/patches/api/0150-Mob-Pathfinding-API.patch b/patches/api/0151-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/api/0150-Mob-Pathfinding-API.patch
rename to patches/api/0151-Mob-Pathfinding-API.patch
diff --git a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
rename to patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
rename to patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0155-Material-API-additions.patch b/patches/api/0156-Material-API-additions.patch
similarity index 100%
rename from patches/api/0155-Material-API-additions.patch
rename to patches/api/0156-Material-API-additions.patch
diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
similarity index 100%
rename from patches/api/0156-Add-Material-Tags.patch
rename to patches/api/0157-Add-Material-Tags.patch
diff --git a/patches/api/0157-PreSpawnerSpawnEvent.patch b/patches/api/0158-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/api/0157-PreSpawnerSpawnEvent.patch
rename to patches/api/0158-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/api/0159-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/api/0158-Add-LivingEntity-getTargetEntity.patch
rename to patches/api/0159-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0159-Add-sun-related-API.patch b/patches/api/0160-Add-sun-related-API.patch
similarity index 100%
rename from patches/api/0159-Add-sun-related-API.patch
rename to patches/api/0160-Add-sun-related-API.patch
diff --git a/patches/api/0160-Here-s-Johnny.patch b/patches/api/0161-Here-s-Johnny.patch
similarity index 100%
rename from patches/api/0160-Here-s-Johnny.patch
rename to patches/api/0161-Here-s-Johnny.patch
diff --git a/patches/api/0161-Turtle-API.patch b/patches/api/0162-Turtle-API.patch
similarity index 100%
rename from patches/api/0161-Turtle-API.patch
rename to patches/api/0162-Turtle-API.patch
diff --git a/patches/api/0162-Add-spectator-target-events.patch b/patches/api/0163-Add-spectator-target-events.patch
similarity index 100%
rename from patches/api/0162-Add-spectator-target-events.patch
rename to patches/api/0163-Add-spectator-target-events.patch
diff --git a/patches/api/0163-Add-more-Witch-API.patch b/patches/api/0164-Add-more-Witch-API.patch
similarity index 100%
rename from patches/api/0163-Add-more-Witch-API.patch
rename to patches/api/0164-Add-more-Witch-API.patch
diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/api/0165-Make-the-default-permission-message-configurable.patch
similarity index 89%
rename from patches/api/0164-Make-the-default-permission-message-configurable.patch
rename to patches/api/0165-Make-the-default-permission-message-configurable.patch
index 93fbacfef7..fe51b80662 100644
--- a/patches/api/0164-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0165-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b0457e7740dda723b6eda481bcea3560d55333f1..a10ad183431d2a67e8f49062fba37e7fc3b760dc 100644
+index 832b3f72c4a314dc0f38d412bdc999508f7d2b7b..80517b3bc7fe470c418cf9343c86b151ad9a702a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1933,6 +1933,15 @@ public final class Bukkit {
+@@ -1947,6 +1947,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -25,10 +25,10 @@ index b0457e7740dda723b6eda481bcea3560d55333f1..a10ad183431d2a67e8f49062fba37e7f
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 44a5e05fbc00aa878cd31879677d0aad779eb175..27353a3eb4669ee457fe7d65dc5dd5e8c23c8283 100644
+index 58e347f771b85c6bfbb06690f6a80fffaf1538f6..2534560ccc8340500b71572ee6121df8ec06e154 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1698,6 +1698,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1710,6 +1710,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to patches/api/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0166-Add-more-Zombie-API.patch b/patches/api/0167-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/api/0166-Add-more-Zombie-API.patch
rename to patches/api/0167-Add-more-Zombie-API.patch
diff --git a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0168-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
rename to patches/api/0168-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch b/patches/api/0169-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/api/0168-Add-PlayerConnectionCloseEvent.patch
rename to patches/api/0169-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/api/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/unapplied/api/0170-BlockDestroyEvent.patch b/patches/api/0171-BlockDestroyEvent.patch
similarity index 100%
rename from patches/unapplied/api/0170-BlockDestroyEvent.patch
rename to patches/api/0171-BlockDestroyEvent.patch
diff --git a/patches/unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 87%
rename from patches/unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 5966712d5a..002b6a3cf0 100644
--- a/patches/unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ea902f8d525684e0e8f82bc5017bcf748f106e40..8ba95157e0273c412314a506d4f6e24b0784147b 100644
+index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..98efa73682ceee3590c225fbd4dc57b8ab0aec17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -407,10 +407,15 @@ public final class CraftServer implements Server {
+@@ -405,10 +405,15 @@ public final class CraftServer implements Server {
      public void loadPlugins() {
          this.pluginManager.registerInterface(JavaPluginLoader.class);
  
@@ -29,7 +29,7 @@ index ea902f8d525684e0e8f82bc5017bcf748f106e40..8ba95157e0273c412314a506d4f6e24b
              for (Plugin plugin : plugins) {
                  try {
                      String message = String.format("Loading %s", plugin.getDescription().getFullName());
-@@ -425,6 +430,35 @@ public final class CraftServer implements Server {
+@@ -423,6 +428,35 @@ public final class CraftServer implements Server {
          }
      }
  
@@ -66,13 +66,13 @@ index ea902f8d525684e0e8f82bc5017bcf748f106e40..8ba95157e0273c412314a506d4f6e24b
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c687df04b3543df763a4d5225342357355fab7ec..22e9dd17f62103c5061435099ce96a3d70d54808 100644
+index aa4b21c9d3c4af08c4d3a309f948692cc585c9c9..e3bc3be320e6e2638b8a336c71d08152da84367d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -153,6 +153,12 @@ public class Main {
-                         .ofType(String.class)
-                         .defaultsTo("Unknown Server")
-                         .describedAs("Name");
+@@ -136,6 +136,12 @@ public class Main {
+                         .ofType(File.class)
+                         .defaultsTo(new File("paper.yml"))
+                         .describedAs("Yml file");
 +
 +                acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
 +                        .withRequiredArg()
diff --git a/patches/server/0011-Adventure.patch b/patches/server/0012-Adventure.patch
similarity index 99%
rename from patches/server/0011-Adventure.patch
rename to patches/server/0012-Adventure.patch
index a24058e106..712b14e423 100644
--- a/patches/server/0011-Adventure.patch
+++ b/patches/server/0012-Adventure.patch
@@ -1436,7 +1436,7 @@ index 7f9b560a415eec4008d0fdcfa427c3df8f974e43..11687dc95f606750e9042b043f333e3b
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 346061bf60fad2f20ac88f287019d813eabe259b..4ae61a810c63a259490dde53e7bdb862ed4df5ad 100644
+index 8cf42a52732301d0216a348f588d58877d60cb0d..08e7fd48514f9a6e89efc0d8adcbcf14bc92b103 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -36,6 +36,7 @@ import net.minecraft.world.entity.player.Player;
@@ -1472,7 +1472,7 @@ index 346061bf60fad2f20ac88f287019d813eabe259b..4ae61a810c63a259490dde53e7bdb862
                              }
                          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 50ab7ebeefc6588aca6037aaf21589e5e73aa2c0..dff7b1005f60c762ed81de5eb77e1575f07f5ce9 100644
+index c9a8d64ef23def0ad8e986a97c34331b8d54c205..2b24a41587fbe1fba70a0ab42d3dc33358f2ba2e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -55,7 +55,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
@@ -1718,10 +1718,10 @@ index 9af14095fa8dbc75fadb84c5a1d263039994e441..3b35ec1df648a3de920ea0c159623880
                  }
                  collection = icons;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f523a98f94 100644
+index 98efa73682ceee3590c225fbd4dc57b8ab0aec17..dea0b0d3164737b72d84679f2128fc82e1e03230 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -592,8 +592,10 @@ public final class CraftServer implements Server {
+@@ -626,8 +626,10 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -1732,7 +1732,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
      }
  
      @Override
-@@ -1429,7 +1431,15 @@ public final class CraftServer implements Server {
+@@ -1463,7 +1465,15 @@ public final class CraftServer implements Server {
          return this.configuration.getInt("settings.spawn-radius", -1);
      }
  
@@ -1748,7 +1748,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
      public String getShutdownMessage() {
          return this.configuration.getString("settings.shutdown-message");
      }
-@@ -1587,7 +1597,20 @@ public final class CraftServer implements Server {
+@@ -1621,7 +1631,20 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -1769,7 +1769,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
              if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
-@@ -1595,14 +1618,14 @@ public final class CraftServer implements Server {
+@@ -1629,14 +1652,14 @@ public final class CraftServer implements Server {
              }
          }
  
@@ -1786,7 +1786,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
  
          for (CommandSender recipient : recipients) {
              recipient.sendMessage(message);
-@@ -1838,6 +1861,14 @@ public final class CraftServer implements Server {
+@@ -1872,6 +1895,14 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
      }
  
@@ -1801,7 +1801,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
      @Override
      public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
          Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
-@@ -1850,13 +1881,28 @@ public final class CraftServer implements Server {
+@@ -1884,13 +1915,28 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
      }
  
@@ -1830,7 +1830,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
      public Merchant createMerchant(String title) {
          return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
      }
-@@ -1905,6 +1951,12 @@ public final class CraftServer implements Server {
+@@ -1939,6 +1985,12 @@ public final class CraftServer implements Server {
          return Thread.currentThread().equals(console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
      }
  
@@ -1843,7 +1843,7 @@ index 734fbbd27dc3bfed223ea03f246ebfb87a46225a..52d6814cc46dd195dbfe3ee3b79c09f5
      @Override
      public String getMotd() {
          return this.console.getMotd();
-@@ -2348,5 +2400,15 @@ public final class CraftServer implements Server {
+@@ -2382,5 +2434,15 @@ public final class CraftServer implements Server {
              return null;
          }
      }
@@ -1891,7 +1891,7 @@ index 6bb2e87c4aa09e565c1c197548517d87f63f7fb1..277b946bec2cfd8cfb4054504133f6ab
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index aa4b21c9d3c4af08c4d3a309f948692cc585c9c9..b9b3e4ead357e6f9816b612d54215c7123b1310a 100644
+index e3bc3be320e6e2638b8a336c71d08152da84367d..02376da4e087a7bfcb63ee2bf74aed49fe8439dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -19,6 +19,12 @@ public class Main {
diff --git a/patches/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch
similarity index 100%
rename from patches/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch
rename to patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0013-Configurable-baby-zombie-movement-speed.patch b/patches/server/0014-Configurable-baby-zombie-movement-speed.patch
similarity index 100%
rename from patches/server/0013-Configurable-baby-zombie-movement-speed.patch
rename to patches/server/0014-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0014-Configurable-fishing-time-ranges.patch b/patches/server/0015-Configurable-fishing-time-ranges.patch
similarity index 100%
rename from patches/server/0014-Configurable-fishing-time-ranges.patch
rename to patches/server/0015-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
similarity index 100%
rename from patches/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
rename to patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 100%
rename from patches/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch
rename to patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0017-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch
similarity index 100%
rename from patches/server/0017-Allow-for-toggling-of-spawn-chunks.patch
rename to patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 97%
rename from patches/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 9bed877f11..0776c819e0 100644
--- a/patches/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -32,7 +32,7 @@ index 37ace477c170be9453ab65976085837faa312255..15163398f96b4eda94d99b4b48ab2b06
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52d6814cc46dd195dbfe3ee3b79c09f523a98f94..6381ef19b4ea9ddcbf797eaae8103fe88d5d7fb7 100644
+index dea0b0d3164737b72d84679f2128fc82e1e03230..4b44fb9584f1b85ff183e52542154c7fd7f46332 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -251,7 +251,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -45,10 +45,10 @@ index 52d6814cc46dd195dbfe3ee3b79c09f523a98f94..6381ef19b4ea9ddcbf797eaae8103fe8
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b9b3e4ead357e6f9816b612d54215c7123b1310a..f8a5adaff31bb5aa91550f24aab6cce83642d86f 100644
+index 02376da4e087a7bfcb63ee2bf74aed49fe8439dc..a1bbd6a89b9c829309a440375c6c8cbb75e7a48a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -210,12 +210,25 @@ public class Main {
+@@ -216,12 +216,25 @@ public class Main {
                      deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
diff --git a/patches/server/0020-Implement-Paper-VersionChecker.patch b/patches/server/0021-Implement-Paper-VersionChecker.patch
similarity index 100%
rename from patches/server/0020-Implement-Paper-VersionChecker.patch
rename to patches/server/0021-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0021-Add-version-history-to-version-command.patch b/patches/server/0022-Add-version-history-to-version-command.patch
similarity index 100%
rename from patches/server/0021-Add-version-history-to-version-command.patch
rename to patches/server/0022-Add-version-history-to-version-command.patch
diff --git a/patches/server/0022-Player-affects-spawning-API.patch b/patches/server/0023-Player-affects-spawning-API.patch
similarity index 100%
rename from patches/server/0022-Player-affects-spawning-API.patch
rename to patches/server/0023-Player-affects-spawning-API.patch
diff --git a/patches/server/0023-Remove-invalid-mob-spawner-tile-entities.patch b/patches/server/0024-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 100%
rename from patches/server/0023-Remove-invalid-mob-spawner-tile-entities.patch
rename to patches/server/0024-Remove-invalid-mob-spawner-tile-entities.patch
diff --git a/patches/server/0024-Further-improve-server-tick-loop.patch b/patches/server/0025-Further-improve-server-tick-loop.patch
similarity index 98%
rename from patches/server/0024-Further-improve-server-tick-loop.patch
rename to patches/server/0025-Further-improve-server-tick-loop.patch
index 75d63be520..f9ace426ec 100644
--- a/patches/server/0024-Further-improve-server-tick-loop.patch
+++ b/patches/server/0025-Further-improve-server-tick-loop.patch
@@ -144,10 +144,10 @@ index 15163398f96b4eda94d99b4b48ab2b06622bd2af..608b6218f5c59ecb3e7137121b8c4c21
                      this.startMetricsRecordingTick();
                      this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6381ef19b4ea9ddcbf797eaae8103fe88d5d7fb7..c365a1cd02dbb8a248ba6247d3feb9553a22dfe6 100644
+index 4b44fb9584f1b85ff183e52542154c7fd7f46332..4a1e0fbf9213497dfd730f3e6600719b5cdc1703 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2316,6 +2316,17 @@ public final class CraftServer implements Server {
+@@ -2350,6 +2350,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/patches/server/0025-Only-refresh-abilities-if-needed.patch b/patches/server/0026-Only-refresh-abilities-if-needed.patch
similarity index 100%
rename from patches/server/0025-Only-refresh-abilities-if-needed.patch
rename to patches/server/0026-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0026-Entity-Origin-API.patch b/patches/server/0027-Entity-Origin-API.patch
similarity index 100%
rename from patches/server/0026-Entity-Origin-API.patch
rename to patches/server/0027-Entity-Origin-API.patch
diff --git a/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
similarity index 100%
rename from patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch
rename to patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0028-Configurable-top-of-nether-void-damage.patch b/patches/server/0029-Configurable-top-of-nether-void-damage.patch
similarity index 100%
rename from patches/server/0028-Configurable-top-of-nether-void-damage.patch
rename to patches/server/0029-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 100%
rename from patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0030-Always-tick-falling-blocks.patch b/patches/server/0031-Always-tick-falling-blocks.patch
similarity index 100%
rename from patches/server/0030-Always-tick-falling-blocks.patch
rename to patches/server/0031-Always-tick-falling-blocks.patch
diff --git a/patches/server/0031-Configurable-end-credits.patch b/patches/server/0032-Configurable-end-credits.patch
similarity index 100%
rename from patches/server/0031-Configurable-end-credits.patch
rename to patches/server/0032-Configurable-end-credits.patch
diff --git a/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 100%
rename from patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0033-Optimize-explosions.patch b/patches/server/0034-Optimize-explosions.patch
similarity index 100%
rename from patches/server/0033-Optimize-explosions.patch
rename to patches/server/0034-Optimize-explosions.patch
diff --git a/patches/server/0034-Disable-explosion-knockback.patch b/patches/server/0035-Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/0034-Disable-explosion-knockback.patch
rename to patches/server/0035-Disable-explosion-knockback.patch
diff --git a/patches/server/0035-Disable-thunder.patch b/patches/server/0036-Disable-thunder.patch
similarity index 100%
rename from patches/server/0035-Disable-thunder.patch
rename to patches/server/0036-Disable-thunder.patch
diff --git a/patches/server/0036-Disable-ice-and-snow.patch b/patches/server/0037-Disable-ice-and-snow.patch
similarity index 100%
rename from patches/server/0036-Disable-ice-and-snow.patch
rename to patches/server/0037-Disable-ice-and-snow.patch
diff --git a/patches/server/0037-Configurable-mob-spawner-tick-rate.patch b/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
similarity index 100%
rename from patches/server/0037-Configurable-mob-spawner-tick-rate.patch
rename to patches/server/0038-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0038-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/server/0038-Implement-PlayerLocaleChangeEvent.patch
rename to patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0039-Per-Player-View-Distance-API-placeholders.patch b/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from patches/server/0039-Per-Player-View-Distance-API-placeholders.patch
rename to patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0040-Add-BeaconEffectEvent.patch b/patches/server/0041-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0040-Add-BeaconEffectEvent.patch
rename to patches/server/0041-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0041-Configurable-container-update-tick-rate.patch b/patches/server/0042-Configurable-container-update-tick-rate.patch
similarity index 100%
rename from patches/server/0041-Configurable-container-update-tick-rate.patch
rename to patches/server/0042-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0042-Use-UserCache-for-player-heads.patch b/patches/server/0043-Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/0042-Use-UserCache-for-player-heads.patch
rename to patches/server/0043-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0043-Disable-spigot-tick-limiters.patch b/patches/server/0044-Disable-spigot-tick-limiters.patch
similarity index 100%
rename from patches/server/0043-Disable-spigot-tick-limiters.patch
rename to patches/server/0044-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0044-Add-PlayerInitialSpawnEvent.patch b/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/server/0044-Add-PlayerInitialSpawnEvent.patch
rename to patches/server/0045-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0046-Ensure-commands-are-not-ran-async.patch b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
similarity index 97%
rename from patches/server/0046-Ensure-commands-are-not-ran-async.patch
rename to patches/server/0047-Ensure-commands-are-not-ran-async.patch
index 4c80e567f1..3ac6671edf 100644
--- a/patches/server/0046-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
@@ -48,10 +48,10 @@ index 11687dc95f606750e9042b043f333e3b00eb171c..38909ef14fcfd4b93d83512f4cacbe2c
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c365a1cd02dbb8a248ba6247d3feb9553a22dfe6..7292cc72e9d8227b4354f1d91246d27d639c5abb 100644
+index 4a1e0fbf9213497dfd730f3e6600719b5cdc1703..199969e2052918c17c9fb2088013150046e20ff2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -796,6 +796,28 @@ public final class CraftServer implements Server {
+@@ -830,6 +830,28 @@ public final class CraftServer implements Server {
          Validate.notNull(commandLine, "CommandLine cannot be null");
          org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
  
diff --git a/patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 100%
rename from patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0048-Expose-server-CommandMap.patch b/patches/server/0049-Expose-server-CommandMap.patch
similarity index 78%
rename from patches/server/0048-Expose-server-CommandMap.patch
rename to patches/server/0049-Expose-server-CommandMap.patch
index a50f05585b..9455336ac5 100644
--- a/patches/server/0048-Expose-server-CommandMap.patch
+++ b/patches/server/0049-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7292cc72e9d8227b4354f1d91246d27d639c5abb..c66577e495b59acd9bc666e1291c6417cfa9e477 100644
+index 199969e2052918c17c9fb2088013150046e20ff2..99b86fe800e6015d5342f8510ec24ad757e67ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1934,6 +1934,7 @@ public final class CraftServer implements Server {
+@@ -1968,6 +1968,7 @@ public final class CraftServer implements Server {
          return this.helpMap;
      }
  
diff --git a/patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
similarity index 100%
rename from patches/server/0050-Ensure-inv-drag-is-in-bounds.patch
rename to patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/0051-Player-Tab-List-and-Title-APIs.patch b/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/server/0051-Player-Tab-List-and-Title-APIs.patch
rename to patches/server/0052-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0052-Add-configurable-portal-search-radius.patch b/patches/server/0053-Add-configurable-portal-search-radius.patch
similarity index 100%
rename from patches/server/0052-Add-configurable-portal-search-radius.patch
rename to patches/server/0053-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0053-Add-velocity-warnings.patch b/patches/server/0054-Add-velocity-warnings.patch
similarity index 98%
rename from patches/server/0053-Add-velocity-warnings.patch
rename to patches/server/0054-Add-velocity-warnings.patch
index 368e0fd58a..a18ca8fe30 100644
--- a/patches/server/0053-Add-velocity-warnings.patch
+++ b/patches/server/0054-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c66577e495b59acd9bc666e1291c6417cfa9e477..e62ee04cbe0f3281783aff8ef74d7165447b34ba 100644
+index 99b86fe800e6015d5342f8510ec24ad757e67ec7..a5ed49072d5e4d1555c7eb0e2433b69f4f238703 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -289,6 +289,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0054-Configurable-inter-world-teleportation-safety.patch b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
similarity index 100%
rename from patches/server/0054-Configurable-inter-world-teleportation-safety.patch
rename to patches/server/0055-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0055-Add-exception-reporting-event.patch b/patches/server/0056-Add-exception-reporting-event.patch
similarity index 99%
rename from patches/server/0055-Add-exception-reporting-event.patch
rename to patches/server/0056-Add-exception-reporting-event.patch
index 0638cd9e57..1f946f6d86 100644
--- a/patches/server/0055-Add-exception-reporting-event.patch
+++ b/patches/server/0056-Add-exception-reporting-event.patch
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index cab03a81a97d851db61e517cfe3a43fa8afd32b2..9dd0279f9d33fabd1dc4ff029f0ad76a9cc8cb21 100644
+index 66416d761cc71b2d57acb840b781870dc3180c46..cb0ba135e766783a00b37c5b72f1cc1ed23ce07a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -924,6 +924,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 100%
rename from patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 100%
rename from patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0059-Chunk-Save-Reattempt.patch b/patches/server/0060-Chunk-Save-Reattempt.patch
similarity index 100%
rename from patches/server/0059-Chunk-Save-Reattempt.patch
rename to patches/server/0060-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0060-Complete-resource-pack-API.patch b/patches/server/0061-Complete-resource-pack-API.patch
similarity index 100%
rename from patches/server/0060-Complete-resource-pack-API.patch
rename to patches/server/0061-Complete-resource-pack-API.patch
diff --git a/patches/server/0061-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
similarity index 92%
rename from patches/server/0061-Default-loading-permissions.yml-before-plugins.patch
rename to patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
index a247056a32..35956793ba 100644
--- a/patches/server/0061-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
@@ -30,10 +30,10 @@ index 701a2ffd04df48d437b2cb963dd150af99725b6e..817d4572c9991992b720b3ba163188ac
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e62ee04cbe0f3281783aff8ef74d7165447b34ba..49725d304ade26d537552788952f18291c64f927 100644
+index a5ed49072d5e4d1555c7eb0e2433b69f4f238703..1fddd631be42b84f115e6555b5a4e81e003a526f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -428,6 +428,7 @@ public final class CraftServer implements Server {
+@@ -462,6 +462,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
              this.helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index e62ee04cbe0f3281783aff8ef74d7165447b34ba..49725d304ade26d537552788952f1829
          }
  
          Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -447,7 +448,7 @@ public final class CraftServer implements Server {
+@@ -481,7 +482,7 @@ public final class CraftServer implements Server {
              this.commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
diff --git a/patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
similarity index 90%
rename from patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch
rename to patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
index 112d2c420c..2a6573d8f6 100644
--- a/patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 49725d304ade26d537552788952f18291c64f927..657c810f86c73cdbb2c044c742803c835e6d4c50 100644
+index 1fddd631be42b84f115e6555b5a4e81e003a526f..f1d8ed4fad48025132fa018f54d2a5a88096d60a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2446,5 +2446,23 @@ public final class CraftServer implements Server {
+@@ -2480,5 +2480,23 @@ public final class CraftServer implements Server {
          }
          return this.adventure$audiences;
      }
diff --git a/patches/server/0063-Remove-Metadata-on-reload.patch b/patches/server/0064-Remove-Metadata-on-reload.patch
similarity index 88%
rename from patches/server/0063-Remove-Metadata-on-reload.patch
rename to patches/server/0064-Remove-Metadata-on-reload.patch
index 810488cce4..c923e8ae5a 100644
--- a/patches/server/0063-Remove-Metadata-on-reload.patch
+++ b/patches/server/0064-Remove-Metadata-on-reload.patch
@@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 657c810f86c73cdbb2c044c742803c835e6d4c50..bf18ed30b1e66cb94f346b1e63a67ec5f4030b0b 100644
+index f1d8ed4fad48025132fa018f54d2a5a88096d60a..7aaa2d191446c9f790b6d7f3f0bf1997209c7664 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -913,8 +913,16 @@ public final class CraftServer implements Server {
+@@ -947,8 +947,16 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
diff --git a/patches/server/0064-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/0064-Handle-Item-Meta-Inconsistencies.patch
rename to patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0066-Add-World-Util-Methods.patch b/patches/server/0067-Add-World-Util-Methods.patch
similarity index 100%
rename from patches/server/0066-Add-World-Util-Methods.patch
rename to patches/server/0067-Add-World-Util-Methods.patch
diff --git a/patches/server/0067-Custom-replacement-for-eaten-items.patch b/patches/server/0068-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/0067-Custom-replacement-for-eaten-items.patch
rename to patches/server/0068-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0069-Use-a-Shared-Random-for-Entities.patch b/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/0069-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0070-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 100%
rename from patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/patches/server/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 100%
rename from patches/server/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to patches/server/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
diff --git a/patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 100%
rename from patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0074-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from patches/server/0074-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0075-EntityPathfindEvent.patch b/patches/server/0076-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0075-EntityPathfindEvent.patch
rename to patches/server/0076-EntityPathfindEvent.patch
diff --git a/patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0081-Optimize-DataBits.patch b/patches/server/0082-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0081-Optimize-DataBits.patch
rename to patches/server/0082-Optimize-DataBits.patch
diff --git a/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0083-Workaround-for-setting-passengers-on-players.patch b/patches/server/0084-Workaround-for-setting-passengers-on-players.patch
similarity index 100%
rename from patches/server/0083-Workaround-for-setting-passengers-on-players.patch
rename to patches/server/0084-Workaround-for-setting-passengers-on-players.patch
diff --git a/patches/server/0084-Configurable-Player-Collision.patch b/patches/server/0085-Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/0084-Configurable-Player-Collision.patch
rename to patches/server/0085-Configurable-Player-Collision.patch
diff --git a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0086-Configurable-RCON-IP-address.patch b/patches/server/0087-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0086-Configurable-RCON-IP-address.patch
rename to patches/server/0087-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0090-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 100%
rename from patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0093-System-property-for-disabling-watchdoge.patch b/patches/server/0094-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0093-System-property-for-disabling-watchdoge.patch
rename to patches/server/0094-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0094-Optimize-UserCache-Thread-Safe.patch b/patches/server/0095-Optimize-UserCache-Thread-Safe.patch
similarity index 100%
rename from patches/server/0094-Optimize-UserCache-Thread-Safe.patch
rename to patches/server/0095-Optimize-UserCache-Thread-Safe.patch
diff --git a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0097-Add-server-name-parameter.patch b/patches/server/0098-Add-server-name-parameter.patch
similarity index 76%
rename from patches/server/0097-Add-server-name-parameter.patch
rename to patches/server/0098-Add-server-name-parameter.patch
index 00721fa9a5..1c5a38ba4d 100644
--- a/patches/server/0097-Add-server-name-parameter.patch
+++ b/patches/server/0098-Add-server-name-parameter.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f8a5adaff31bb5aa91550f24aab6cce83642d86f..c6312e189751a637341c9cf4fd24dc05766b09d6 100644
+index a1bbd6a89b9c829309a440375c6c8cbb75e7a48a..3bfbd12e973486aabbb42ea5e761313eac65e4ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -143,6 +143,14 @@ public class Main {
-                         .defaultsTo(new File("paper.yml"))
-                         .describedAs("Yml file");
+@@ -149,6 +149,14 @@ public class Main {
+                         .defaultsTo(new File[] {})
+                         .describedAs("Jar file");
                  // Paper end
 +
 +                // Paper start
diff --git a/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 100%
rename from patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0099-Fix-Old-Sign-Conversion.patch b/patches/server/0100-Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from patches/server/0099-Fix-Old-Sign-Conversion.patch
rename to patches/server/0100-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
similarity index 96%
rename from patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
index f2f6d51133..0ee99e71c7 100644
--- a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
@@ -67,10 +67,10 @@ index 876658b685ea09adb4c01d436da56daadb7eedaa..5445cb5910ec63408dc4379eec5e12d3
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf18ed30b1e66cb94f346b1e63a67ec5f4030b0b..1bc319a3423a2cff776e30ac04a09e6d38e13e49 100644
+index 7aaa2d191446c9f790b6d7f3f0bf1997209c7664..c85312d9dfd577d3cb57de5a65efc8385d07ff05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1677,7 +1677,7 @@ public final class CraftServer implements Server {
+@@ -1711,7 +1711,7 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/server/0105-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from patches/server/0104-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0105-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0105-Configurable-flying-kick-messages.patch b/patches/server/0106-Configurable-flying-kick-messages.patch
similarity index 100%
rename from patches/server/0105-Configurable-flying-kick-messages.patch
rename to patches/server/0106-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from patches/server/0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/patches/server/0107-Option-to-remove-corrupt-tile-entities.patch b/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
similarity index 100%
rename from patches/server/0107-Option-to-remove-corrupt-tile-entities.patch
rename to patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
diff --git a/patches/server/0108-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0108-Add-EntityZapEvent.patch
rename to patches/server/0109-Add-EntityZapEvent.patch
diff --git a/patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 100%
rename from patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/0110-Cache-user-authenticator-threads.patch b/patches/server/0111-Cache-user-authenticator-threads.patch
similarity index 97%
rename from patches/server/0110-Cache-user-authenticator-threads.patch
rename to patches/server/0111-Cache-user-authenticator-threads.patch
index ff61dcef53..2acf356122 100644
--- a/patches/server/0110-Cache-user-authenticator-threads.patch
+++ b/patches/server/0111-Cache-user-authenticator-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 4ae61a810c63a259490dde53e7bdb862ed4df5ad..58617412e4759fe6c1c975f352c0c8281b744de1 100644
+index 08e7fd48514f9a6e89efc0d8adcbcf14bc92b103..afa04bbf778e5dd0823a0aab0573e4cc3787858d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -117,6 +117,18 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0111-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
similarity index 90%
rename from patches/server/0111-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
index 659c9cd1ba..a995a41f34 100644
--- a/patches/server/0111-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1bc319a3423a2cff776e30ac04a09e6d38e13e49..5a6d044a0b3a60e50c55d2f854b923f46df12d5e 100644
+index c85312d9dfd577d3cb57de5a65efc8385d07ff05..18c04dd01a57693ddf7befe31645166442b02011 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2472,5 +2472,24 @@ public final class CraftServer implements Server {
+@@ -2506,5 +2506,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0113-Don-t-let-fishinghooks-use-portals.patch b/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from patches/server/0113-Don-t-let-fishinghooks-use-portals.patch
rename to patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0114-Add-ProjectileCollideEvent.patch
rename to patches/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0119-Optimize-ItemStack.isEmpty.patch b/patches/server/0120-Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from patches/server/0119-Optimize-ItemStack.isEmpty.patch
rename to patches/server/0120-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0121-String-based-Action-Bar-API.patch b/patches/server/0122-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/server/0121-String-based-Action-Bar-API.patch
rename to patches/server/0122-String-based-Action-Bar-API.patch
diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/server/0123-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/0122-Properly-fix-item-duplication-bug.patch
rename to patches/server/0123-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0123-Firework-API-s.patch b/patches/server/0124-Firework-API-s.patch
similarity index 100%
rename from patches/server/0123-Firework-API-s.patch
rename to patches/server/0124-Firework-API-s.patch
diff --git a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch b/patches/server/0125-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0124-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0125-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/server/0127-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/0126-Enforce-Sync-Player-Saves.patch
rename to patches/server/0127-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 100%
rename from patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
rename to patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch
similarity index 100%
rename from patches/server/0129-Cap-Entity-Collisions.patch
rename to patches/server/0130-Cap-Entity-Collisions.patch
diff --git a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/server/0132-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0131-Do-not-let-armorstands-drown.patch
rename to patches/server/0132-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
index 9c9da76980..7e85cdf6ca 100644
--- a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -20,10 +20,10 @@ index 5e23ff0c5e44427a996281ae42fc12c28649e158..7a69f9d9bb9c05474d8fbab22d626529
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a6d044a0b3a60e50c55d2f854b923f46df12d5e..5a2bd4c382b72157d1d11381665ce1398c63cb2d 100644
+index 18c04dd01a57693ddf7befe31645166442b02011..67c4a3da2d896ef4a82dd666b7d51fb8d6c0be67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2491,5 +2491,10 @@ public final class CraftServer implements Server {
+@@ -2525,5 +2525,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
index 2bad0658ec..2c4515abdd 100644
--- a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -244,7 +244,7 @@ index b5ee56706c04fd9c0c294856860eebff9f62531a..61086dbcd852bdb2e5b6083ae8781a52
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a2bd4c382b72157d1d11381665ce1398c63cb2d..de85382893132efa9c60e0c9bb0f07faaf6f442c 100644
+index 67c4a3da2d896ef4a82dd666b7d51fb8d6c0be67..abbc9db66ea8ff6b7210584ed1fc1d154e256c40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -48,7 +48,6 @@ import java.util.logging.Level;
@@ -263,7 +263,7 @@ index 5a2bd4c382b72157d1d11381665ce1398c63cb2d..de85382893132efa9c60e0c9bb0f07fa
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.bossevents.CustomBossEvent;
  import net.minecraft.server.commands.ReloadCommand;
-@@ -1256,9 +1256,13 @@ public final class CraftServer implements Server {
+@@ -1290,9 +1290,13 @@ public final class CraftServer implements Server {
          return this.logger;
      }
  
@@ -278,7 +278,7 @@ index 5a2bd4c382b72157d1d11381665ce1398c63cb2d..de85382893132efa9c60e0c9bb0f07fa
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c6312e189751a637341c9cf4fd24dc05766b09d6..29e4b0282bd85c55700c07480b6c8911a1708dad 100644
+index 3bfbd12e973486aabbb42ea5e761313eac65e4ba..c1038935b32a5187c765418a4be97a31df966239 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -12,7 +12,7 @@ import java.util.logging.Level;
@@ -290,7 +290,7 @@ index c6312e189751a637341c9cf4fd24dc05766b09d6..29e4b0282bd85c55700c07480b6c8911
  
  public class Main {
      public static boolean useJline = true;
-@@ -189,6 +189,8 @@ public class Main {
+@@ -195,6 +195,8 @@ public class Main {
              }
  
              try {
@@ -299,7 +299,7 @@ index c6312e189751a637341c9cf4fd24dc05766b09d6..29e4b0282bd85c55700c07480b6c8911
                  // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
                  String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
                  String jline_terminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
-@@ -206,9 +208,18 @@ public class Main {
+@@ -212,9 +214,18 @@ public class Main {
                      // This ensures the terminal literal will always match the jline implementation
                      System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
                  }
@@ -318,7 +318,7 @@ index c6312e189751a637341c9cf4fd24dc05766b09d6..29e4b0282bd85c55700c07480b6c8911
                  }
  
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
-@@ -236,7 +247,7 @@ public class Main {
+@@ -242,7 +253,7 @@ public class Main {
                      System.out.println("Unable to read system info");
                  }
                  // Paper end
diff --git a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0137-Item-canEntityPickup.patch b/patches/server/0138-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0137-Item-canEntityPickup.patch
rename to patches/server/0138-Item-canEntityPickup.patch
diff --git a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0139-PlayerAttemptPickupItemEvent.patch b/patches/server/0140-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0139-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0140-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0140-Add-UnknownCommandEvent.patch b/patches/server/0141-Add-UnknownCommandEvent.patch
similarity index 87%
rename from patches/server/0140-Add-UnknownCommandEvent.patch
rename to patches/server/0141-Add-UnknownCommandEvent.patch
index ff9e062aff..44ca208151 100644
--- a/patches/server/0140-Add-UnknownCommandEvent.patch
+++ b/patches/server/0141-Add-UnknownCommandEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index de85382893132efa9c60e0c9bb0f07faaf6f442c..21b7620eb13cc297acecd7dcb2ba22fab028983a 100644
+index abbc9db66ea8ff6b7210584ed1fc1d154e256c40..a9fc22d89720879d45dc724540ab0084d75c223d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -826,7 +826,13 @@ public final class CraftServer implements Server {
+@@ -860,7 +860,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0142-Basic-PlayerProfile-API.patch
similarity index 99%
rename from patches/server/0141-Basic-PlayerProfile-API.patch
rename to patches/server/0142-Basic-PlayerProfile-API.patch
index ecb4ddda3c..d3f0e29cce 100644
--- a/patches/server/0141-Basic-PlayerProfile-API.patch
+++ b/patches/server/0142-Basic-PlayerProfile-API.patch
@@ -491,7 +491,7 @@ index 00f783aafd81fa7e836e4eea5bfeac7434f33b0f..3789441e2df9410aa1c6efe59054aaba
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 21b7620eb13cc297acecd7dcb2ba22fab028983a..a48067a7cc48c375854d443e483398c0c1f65e05 100644
+index a9fc22d89720879d45dc724540ab0084d75c223d..0d9b0b1ac87602a0ee77e14be27e1346a975a1d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -250,6 +250,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -504,7 +504,7 @@ index 21b7620eb13cc297acecd7dcb2ba22fab028983a..a48067a7cc48c375854d443e483398c0
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2506,5 +2509,24 @@ public final class CraftServer implements Server {
+@@ -2540,5 +2543,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
diff --git a/patches/server/0142-Shoulder-Entities-Release-API.patch b/patches/server/0143-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0142-Shoulder-Entities-Release-API.patch
rename to patches/server/0143-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0143-Profile-Lookup-Events.patch b/patches/server/0144-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0143-Profile-Lookup-Events.patch
rename to patches/server/0144-Profile-Lookup-Events.patch
diff --git a/patches/server/0144-Block-player-logins-during-server-shutdown.patch b/patches/server/0145-Block-player-logins-during-server-shutdown.patch
similarity index 92%
rename from patches/server/0144-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0145-Block-player-logins-during-server-shutdown.patch
index 430822fa01..6a0c802572 100644
--- a/patches/server/0144-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0145-Block-player-logins-during-server-shutdown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 58617412e4759fe6c1c975f352c0c8281b744de1..bf2dbc99a9b9580816d6a51e2774f8cde2989eef 100644
+index afa04bbf778e5dd0823a0aab0573e4cc3787858d..2f512ca5314103d2f42c822c7bd1268f11161edf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -69,6 +69,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0145-Entity-fromMobSpawner.patch b/patches/server/0146-Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/server/0145-Entity-fromMobSpawner.patch
rename to patches/server/0146-Entity-fromMobSpawner.patch
diff --git a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0147-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0147-Implement-ensureServerConversions-API.patch b/patches/server/0148-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0147-Implement-ensureServerConversions-API.patch
rename to patches/server/0148-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0148-Implement-getI18NDisplayName.patch b/patches/server/0149-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0148-Implement-getI18NDisplayName.patch
rename to patches/server/0149-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0149-ProfileWhitelistVerifyEvent.patch b/patches/server/0150-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/0149-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0150-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0150-Fix-this-stupid-bullshit.patch b/patches/server/0151-Fix-this-stupid-bullshit.patch
similarity index 95%
rename from patches/server/0150-Fix-this-stupid-bullshit.patch
rename to patches/server/0151-Fix-this-stupid-bullshit.patch
index 9773942980..0a7c3913b2 100644
--- a/patches/server/0150-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0151-Fix-this-stupid-bullshit.patch
@@ -31,10 +31,10 @@ index bf42e5687935022fe5bcb1ed40bab09bfe189e88..b111200a8f5d3255de29c9836f70fc7f
              Bootstrap.isBootstrapped = true;
              if (Registry.REGISTRY.keySet().isEmpty()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 29e4b0282bd85c55700c07480b6c8911a1708dad..cd75c62770f872a5c270f63adfe3016156e2efc9 100644
+index c1038935b32a5187c765418a4be97a31df966239..633cfb22039f22557d71cafcf42ea27f223b7b62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -228,10 +228,12 @@ public class Main {
+@@ -234,10 +234,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
                      deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
diff --git a/patches/server/0151-LivingEntity-setKiller.patch b/patches/server/0152-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0151-LivingEntity-setKiller.patch
rename to patches/server/0152-LivingEntity-setKiller.patch
diff --git a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 96%
rename from patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
index a88aa9003f..183a5a2e6f 100644
--- a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -27,7 +27,7 @@ index 7a69f9d9bb9c05474d8fbab22d626529a41a66a1..f4735cc330822183e098a67f2c0f00f2
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index bf2dbc99a9b9580816d6a51e2774f8cde2989eef..b057dfd42e9439cd8a2a2933b736f0581da53b85 100644
+index 2f512ca5314103d2f42c822c7bd1268f11161edf..ad9fd830d94bdbcf0499861a46b7acdf08c433fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -298,6 +298,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0157-Add-PlayerJumpEvent.patch b/patches/server/0158-Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/server/0157-Add-PlayerJumpEvent.patch
rename to patches/server/0158-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0158-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0159-handle-PacketPlayInKeepAlive-async.patch
similarity index 100%
rename from patches/server/0158-handle-PacketPlayInKeepAlive-async.patch
rename to patches/server/0159-handle-PacketPlayInKeepAlive-async.patch
diff --git a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch b/patches/server/0161-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from patches/server/0160-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0161-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0162-Add-PlayerArmorChangeEvent.patch b/patches/server/0163-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/server/0162-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0163-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 92%
rename from patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
index b8bd497615..3618451954 100644
--- a/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b057dfd42e9439cd8a2a2933b736f0581da53b85..40feb2fbbe3c73b73124cae62f4661f000fad6cb 100644
+index ad9fd830d94bdbcf0499861a46b7acdf08c433fc..cbe65d2516021946a6d759f91f03dcc886bcd237 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -76,7 +76,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0167-AsyncTabCompleteEvent.patch b/patches/server/0168-AsyncTabCompleteEvent.patch
similarity index 98%
rename from patches/server/0167-AsyncTabCompleteEvent.patch
rename to patches/server/0168-AsyncTabCompleteEvent.patch
index 7ca1839172..dcc0d9b79b 100644
--- a/patches/server/0167-AsyncTabCompleteEvent.patch
+++ b/patches/server/0168-AsyncTabCompleteEvent.patch
@@ -72,10 +72,10 @@ index 7e80a929bc0ddcf94f27f4febedf10ad07a531ff..f97125ad82bc1ec850af9bdd92973942
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a48067a7cc48c375854d443e483398c0c1f65e05..283038f0e8e78ba869eead3dabc51bff7b0ba77a 100644
+index 0d9b0b1ac87602a0ee77e14be27e1346a975a1d0..c0270955c05baea285676615a5a75c165e00ffed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2026,7 +2026,7 @@ public final class CraftServer implements Server {
+@@ -2060,7 +2060,7 @@ public final class CraftServer implements Server {
              offers = this.tabCompleteChat(player, message);
          }
  
diff --git a/patches/server/0168-PlayerPickupExperienceEvent.patch b/patches/server/0169-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0168-PlayerPickupExperienceEvent.patch
rename to patches/server/0169-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 97%
rename from patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
index 640d5e6dfa..4153b35181 100644
--- a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9dd0279f9d33fabd1dc4ff029f0ad76a9cc8cb21..1a62a21d40c583f9cbf2b8fbb63b691fffb71ae0 100644
+index cb0ba135e766783a00b37c5b72f1cc1ed23ce07a..a268ea70d084465bf2ba0550083a136540d88734 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1077,7 +1077,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0172-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0171-PreCreatureSpawnEvent.patch
rename to patches/server/0172-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0173-Fill-Profile-Property-Events.patch b/patches/server/0174-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0173-Fill-Profile-Property-Events.patch
rename to patches/server/0174-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0175-Add-ArmorStand-Item-Meta.patch b/patches/server/0176-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0175-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0176-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0176-Extend-Player-Interact-cancellation.patch b/patches/server/0177-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0176-Extend-Player-Interact-cancellation.patch
rename to patches/server/0177-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0177-Tameable-getOwnerUniqueId-API.patch b/patches/server/0178-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0177-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0178-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0181-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 3f414ed852..129359cf48 100644
--- a/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 40feb2fbbe3c73b73124cae62f4661f000fad6cb..d2cf2db45c6df9bb188c329bc4f6f4e74285cb3e 100644
+index cbe65d2516021946a6d759f91f03dcc886bcd237..00ef714294b6cce5fec7613eed4ba228a48e3e11 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -1,5 +1,7 @@
diff --git a/patches/server/0182-Player.setPlayerProfile-API.patch b/patches/server/0183-Player.setPlayerProfile-API.patch
similarity index 98%
rename from patches/server/0182-Player.setPlayerProfile-API.patch
rename to patches/server/0183-Player.setPlayerProfile-API.patch
index 3648eacd7c..488eb50b29 100644
--- a/patches/server/0182-Player.setPlayerProfile-API.patch
+++ b/patches/server/0183-Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index d2cf2db45c6df9bb188c329bc4f6f4e74285cb3e..90ce56c5b7937e8fd28da6d68448679094308c6e 100644
+index 00ef714294b6cce5fec7613eed4ba228a48e3e11..67b300574655854249c1f7440f56a6e8f0fad351 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -341,12 +341,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0183-getPlayerUniqueId-API.patch b/patches/server/0184-getPlayerUniqueId-API.patch
similarity index 90%
rename from patches/server/0183-getPlayerUniqueId-API.patch
rename to patches/server/0184-getPlayerUniqueId-API.patch
index e696933109..51bcc8969b 100644
--- a/patches/server/0183-getPlayerUniqueId-API.patch
+++ b/patches/server/0184-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 283038f0e8e78ba869eead3dabc51bff7b0ba77a..464b3b25c1099de85e817f15858d4be9ed7b8dfb 100644
+index c0270955c05baea285676615a5a75c165e00ffed..294e90195cd0d00ca6d77136d886797cb39cfca5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1679,6 +1679,25 @@ public final class CraftServer implements Server {
+@@ -1713,6 +1713,25 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/patches/server/0184-Improved-Async-Task-Scheduler.patch b/patches/server/0185-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0184-Improved-Async-Task-Scheduler.patch
rename to patches/server/0185-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0185-Upstream-config-migrations.patch b/patches/server/0186-Upstream-config-migrations.patch
similarity index 100%
rename from patches/server/0185-Upstream-config-migrations.patch
rename to patches/server/0186-Upstream-config-migrations.patch
diff --git a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0186-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0187-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0189-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0188-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0189-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0189-Add-method-to-open-already-placed-sign.patch b/patches/server/0190-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/server/0189-Add-method-to-open-already-placed-sign.patch
rename to patches/server/0190-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch b/patches/server/0191-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0190-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0191-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0192-EndermanEscapeEvent.patch b/patches/server/0193-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0192-EndermanEscapeEvent.patch
rename to patches/server/0193-EndermanEscapeEvent.patch
diff --git a/patches/server/0193-Enderman.teleportRandomly.patch b/patches/server/0194-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0193-Enderman.teleportRandomly.patch
rename to patches/server/0194-Enderman.teleportRandomly.patch
diff --git a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0194-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0195-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0197-EndermanAttackPlayerEvent.patch b/patches/server/0198-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0197-EndermanAttackPlayerEvent.patch
rename to patches/server/0198-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0198-WitchConsumePotionEvent.patch b/patches/server/0199-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0198-WitchConsumePotionEvent.patch
rename to patches/server/0199-WitchConsumePotionEvent.patch
diff --git a/patches/server/0199-WitchThrowPotionEvent.patch b/patches/server/0200-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0199-WitchThrowPotionEvent.patch
rename to patches/server/0200-WitchThrowPotionEvent.patch
diff --git a/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0201-WitchReadyPotionEvent.patch b/patches/server/0202-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0201-WitchReadyPotionEvent.patch
rename to patches/server/0202-WitchReadyPotionEvent.patch
diff --git a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch b/patches/server/0203-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0202-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0203-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0205-Fix-CraftEntity-hashCode.patch b/patches/server/0206-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0205-Fix-CraftEntity-hashCode.patch
rename to patches/server/0206-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/server/0209-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0208-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0209-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0209-Improve-EntityShootBowEvent.patch b/patches/server/0210-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0209-Improve-EntityShootBowEvent.patch
rename to patches/server/0210-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0210-PlayerReadyArrowEvent.patch b/patches/server/0211-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0210-PlayerReadyArrowEvent.patch
rename to patches/server/0211-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0212-Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch
rename to patches/server/0212-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/0212-Expand-Explosions-API.patch b/patches/server/0213-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0212-Expand-Explosions-API.patch
rename to patches/server/0213-Expand-Explosions-API.patch
diff --git a/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0214-RangedEntity-API.patch b/patches/server/0215-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0214-RangedEntity-API.patch
rename to patches/server/0215-RangedEntity-API.patch
diff --git a/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0216-Implement-World.getEntity-UUID-API.patch b/patches/server/0217-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0216-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0217-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0218-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/server/0217-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0218-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0218-Vex-get-setSummoner-API.patch b/patches/server/0219-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0218-Vex-get-setSummoner-API.patch
rename to patches/server/0219-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0220-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0221-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from patches/server/0220-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to patches/server/0221-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0222-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0222-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0222-add-more-information-to-Entity.toString.patch b/patches/server/0223-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0222-add-more-information-to-Entity.toString.patch
rename to patches/server/0223-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0223-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0224-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0223-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0224-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0224-EnderDragon-Events.patch b/patches/server/0225-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0224-EnderDragon-Events.patch
rename to patches/server/0225-EnderDragon-Events.patch
diff --git a/patches/server/0225-PlayerElytraBoostEvent.patch b/patches/server/0226-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0225-PlayerElytraBoostEvent.patch
rename to patches/server/0226-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0226-PlayerLaunchProjectileEvent.patch b/patches/server/0227-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0226-PlayerLaunchProjectileEvent.patch
rename to patches/server/0227-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0227-Improve-BlockPosition-inlining.patch b/patches/server/0228-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0227-Improve-BlockPosition-inlining.patch
rename to patches/server/0228-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0229-Vanished-players-don-t-have-rights.patch b/patches/server/0230-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0229-Vanished-players-don-t-have-rights.patch
rename to patches/server/0230-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0230-Allow-disabling-armour-stand-ticking.patch b/patches/server/0231-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0230-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0231-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0231-SkeletonHorse-Additions.patch b/patches/server/0232-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0231-SkeletonHorse-Additions.patch
rename to patches/server/0232-SkeletonHorse-Additions.patch
diff --git a/patches/server/0232-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0233-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0232-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0233-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0233-Implement-Expanded-ArmorStand-API.patch b/patches/server/0234-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0233-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0234-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0234-AnvilDamageEvent.patch b/patches/server/0235-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0234-AnvilDamageEvent.patch
rename to patches/server/0235-AnvilDamageEvent.patch
diff --git a/patches/server/0235-Add-hand-to-bucket-events.patch b/patches/server/0236-Add-hand-to-bucket-events.patch
similarity index 100%
rename from patches/server/0235-Add-hand-to-bucket-events.patch
rename to patches/server/0236-Add-hand-to-bucket-events.patch
diff --git a/patches/server/0236-Add-TNTPrimeEvent.patch b/patches/server/0237-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0236-Add-TNTPrimeEvent.patch
rename to patches/server/0237-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0237-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0238-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0237-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0238-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0238-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0239-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0238-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0239-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0239-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0240-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from patches/server/0239-Fix-client-rendering-skulls-from-same-user.patch
rename to patches/server/0240-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from patches/server/0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0241-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from patches/server/0241-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch
index 0c4d6c616f..b526f27fb3 100644
--- a/patches/server/0241-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -48,10 +48,10 @@ index e9333b85100d7670b2be7df6e847dfca3084ff55..44f32023db3edaae107f48fd9b96baf5
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 464b3b25c1099de85e817f15858d4be9ed7b8dfb..26c7c5c51c60086957db57e9fdc256e3940e9c39 100644
+index 294e90195cd0d00ca6d77136d886797cb39cfca5..199397a95fc2fbc0b64bcad81c79f24b4d1fb98a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -844,6 +844,7 @@ public final class CraftServer implements Server {
+@@ -878,6 +878,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -59,7 +59,7 @@ index 464b3b25c1099de85e817f15858d4be9ed7b8dfb..26c7c5c51c60086957db57e9fdc256e3
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
-@@ -962,6 +963,7 @@ public final class CraftServer implements Server {
+@@ -996,6 +997,7 @@ public final class CraftServer implements Server {
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
          this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
diff --git a/patches/server/0242-Make-EnderDragon-implement-Mob.patch b/patches/server/0243-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from patches/server/0242-Make-EnderDragon-implement-Mob.patch
rename to patches/server/0243-Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/0243-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0243-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0244-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0244-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0245-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0245-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0246-Optimize-BlockPosition-helper-methods.patch b/patches/server/0247-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0246-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0247-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0247-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 100%
rename from patches/server/0247-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
diff --git a/patches/server/0248-Slime-Pathfinder-Events.patch b/patches/server/0249-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0248-Slime-Pathfinder-Events.patch
rename to patches/server/0249-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0249-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0249-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0250-Optimize-CraftBlockData-Creation.patch b/patches/server/0251-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0250-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0251-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0251-Optimize-MappedRegistry.patch b/patches/server/0252-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0251-Optimize-MappedRegistry.patch
rename to patches/server/0252-Optimize-MappedRegistry.patch
diff --git a/patches/server/0252-Add-PhantomPreSpawnEvent.patch b/patches/server/0253-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0252-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0253-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0253-Add-More-Creeper-API.patch b/patches/server/0254-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0253-Add-More-Creeper-API.patch
rename to patches/server/0254-Add-More-Creeper-API.patch
diff --git a/patches/server/0254-Inventory-removeItemAnySlot.patch b/patches/server/0255-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0254-Inventory-removeItemAnySlot.patch
rename to patches/server/0255-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0255-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0255-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0256-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from patches/server/0256-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/0257-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0257-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0258-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0258-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0259-Improve-death-events.patch b/patches/server/0260-Improve-death-events.patch
similarity index 100%
rename from patches/server/0259-Improve-death-events.patch
rename to patches/server/0260-Improve-death-events.patch
diff --git a/patches/server/0260-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0260-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0261-Mob-Pathfinding-API.patch b/patches/server/0262-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0261-Mob-Pathfinding-API.patch
rename to patches/server/0262-Mob-Pathfinding-API.patch
diff --git a/patches/server/0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0264-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0264-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0265-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0265-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0266-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0266-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0268-Honor-EntityAgeable.ageLock.patch b/patches/server/0269-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0268-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0269-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0269-Configurable-connection-throttle-kick-message.patch b/patches/server/0270-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0269-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0270-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0270-Hook-into-CB-plugin-rewrites.patch b/patches/server/0271-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0270-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0271-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0271-PreSpawnerSpawnEvent.patch b/patches/server/0272-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0271-PreSpawnerSpawnEvent.patch
rename to patches/server/0272-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0272-Add-LivingEntity-getTargetEntity.patch b/patches/server/0273-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0272-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0273-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0273-Add-sun-related-API.patch b/patches/server/0274-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0273-Add-sun-related-API.patch
rename to patches/server/0274-Add-sun-related-API.patch
diff --git a/patches/server/0274-Here-s-Johnny.patch b/patches/server/0275-Here-s-Johnny.patch
similarity index 100%
rename from patches/server/0274-Here-s-Johnny.patch
rename to patches/server/0275-Here-s-Johnny.patch
diff --git a/patches/server/0275-Turtle-API.patch b/patches/server/0276-Turtle-API.patch
similarity index 100%
rename from patches/server/0275-Turtle-API.patch
rename to patches/server/0276-Turtle-API.patch
diff --git a/patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
index a968f665c5..84926c4f93 100644
--- a/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
@@ -128,7 +128,7 @@ index 0000000000000000000000000000000000000000..41d73aa91fb401612e087aa1b7278ba6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 90ce56c5b7937e8fd28da6d68448679094308c6e..2bd6241243d2fb49c91daefdec72ac573300473f 100644
+index 67b300574655854249c1f7440f56a6e8f0fad351..bb767f5b626225e70a8af273384bb74dbd21430d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -18,6 +18,7 @@ import javax.crypto.Cipher;
@@ -225,10 +225,10 @@ index 90ce56c5b7937e8fd28da6d68448679094308c6e..2bd6241243d2fb49c91daefdec72ac57
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 26c7c5c51c60086957db57e9fdc256e3940e9c39..41de977650b5b6ebb8120d31f5106342189e4a59 100644
+index 199397a95fc2fbc0b64bcad81c79f24b4d1fb98a..b006441a23e0de7c090c38aa76744bbd146298d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -712,7 +712,7 @@ public final class CraftServer implements Server {
+@@ -746,7 +746,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations
diff --git a/patches/server/0279-Add-more-Witch-API.patch b/patches/server/0280-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0279-Add-more-Witch-API.patch
rename to patches/server/0280-Add-more-Witch-API.patch
diff --git a/patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0282-Reset-players-airTicks-on-respawn.patch b/patches/server/0283-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0282-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0283-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0285-Optimize-World-Time-Updates.patch b/patches/server/0286-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0285-Optimize-World-Time-Updates.patch
rename to patches/server/0286-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0286-Restore-custom-InventoryHolder-support.patch b/patches/server/0287-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0286-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0287-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0287-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0287-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0288-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0288-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0290-Make-the-default-permission-message-configurable.patch b/patches/server/0291-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/server/0290-Make-the-default-permission-message-configurable.patch
rename to patches/server/0291-Make-the-default-permission-message-configurable.patch
index 8c3f515feb..2d53c4d792 100644
--- a/patches/server/0290-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0291-Make-the-default-permission-message-configurable.patch
@@ -42,10 +42,10 @@ index 1015fcc6c77bd64c3f3cbf234e85a6602dbfa0d7..769353df1fcdaacecd80085165a1d72f
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 41de977650b5b6ebb8120d31f5106342189e4a59..7f20134859f39fc819cc0010b88828f210617c71 100644
+index b006441a23e0de7c090c38aa76744bbd146298d3..b0b01f9c6c209faf6e400aa8aa221260cb80d12a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2531,6 +2531,11 @@ public final class CraftServer implements Server {
+@@ -2565,6 +2565,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  
diff --git a/patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0292-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0292-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0293-force-entity-dismount-during-teleportation.patch b/patches/server/0294-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0293-force-entity-dismount-during-teleportation.patch
rename to patches/server/0294-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0294-Add-more-Zombie-API.patch b/patches/server/0295-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0294-Add-more-Zombie-API.patch
rename to patches/server/0295-Add-more-Zombie-API.patch
diff --git a/patches/server/0295-Book-Size-Limits.patch b/patches/server/0296-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0295-Book-Size-Limits.patch
rename to patches/server/0296-Book-Size-Limits.patch
diff --git a/patches/server/0296-Add-PlayerConnectionCloseEvent.patch b/patches/server/0297-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0296-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0297-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0297-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0297-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0300-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from patches/server/0300-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/unapplied/server/0306-BlockDestroyEvent.patch b/patches/server/0303-BlockDestroyEvent.patch
similarity index 93%
rename from patches/unapplied/server/0306-BlockDestroyEvent.patch
rename to patches/server/0303-BlockDestroyEvent.patch
index 9703875c7a..bbdc9597a1 100644
--- a/patches/unapplied/server/0306-BlockDestroyEvent.patch
+++ b/patches/server/0303-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 414375c118e604f88e1d283dc7b2287c2cb9e274..7b522b984a0152bc43be1589d26478ecf4988696 100644
+index 0663aa74688104c551e8ef52b01947dacf95bb22..f7fccb4761e829a2a1d431f56cfb4288ae0bbd2d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index 414375c118e604f88e1d283dc7b2287c2cb9e274..7b522b984a0152bc43be1589d26478ec
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerLevel;
-@@ -563,8 +564,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -564,8 +565,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);