From afe633df085f1c78802170bca6d03a6873fc0344 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 15 Feb 2023 13:27:40 -0800
Subject: [PATCH] convert API/server tests to mockito (#8848)

* convert API tests to mockito

* convert server tests to mockito

* add co-author
---
 build.gradle.kts                              |   2 +
 .../api/0003-Annotation-Test-changes.patch    | 114 -----
 patches/api/0003-Test-changes.patch           | 478 ++++++++++++++++++
 patches/api/0005-Adventure.patch              |   4 +-
 ...deadlock-risk-in-firing-async-events.patch |  10 +-
 patches/api/0157-Add-Material-Tags.patch      |  41 +-
 patches/server/0004-Test-changes.patch        | 280 ++++++++++
 ...es.patch => 0005-Paper-config-files.patch} |  12 +-
 ...ev-fixes.patch => 0006-MC-Dev-fixes.patch} |   0
 ...ntUtil.patch => 0007-ConcurrentUtil.patch} |   0
 ...007-CB-fixes.patch => 0008-CB-fixes.patch} |   0
 ...008-MC-Utils.patch => 0009-MC-Utils.patch} |   4 +-
 ...9-Adventure.patch => 0010-Adventure.patch} |   2 +-
 ...command.patch => 0011-Paper-command.patch} |   0
 ...Metrics.patch => 0012-Paper-Metrics.patch} |   0
 ...Timings-v2.patch => 0013-Timings-v2.patch} |   0
 ...> 0014-Rewrite-dataconverter-system.patch} |   0
 ...4-Starlight.patch => 0015-Starlight.patch} |   4 +-
 ...Thread.patch => 0016-Add-TickThread.patch} |   0
 ....patch => 0017-Rewrite-chunk-system.patch} |   4 +-
 ...option-to-load-extra-plugin-jars-no.patch} |   4 +-
 ...ctus-bamboo-and-reed-growth-heights.patch} |   0
 ...igurable-baby-zombie-movement-speed.patch} |   0
 ...21-Configurable-fishing-time-ranges.patch} |   2 +-
 ...-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} |   0
 ...0027-Implement-Paper-VersionChecker.patch} |   0
 ...-version-history-to-version-command.patch} |   0
 ...=> 0029-Player-affects-spawning-API.patch} |   0
 ...30-Further-improve-server-tick-loop.patch} |   0
 ...31-Only-refresh-abilities-if-needed.patch} |   0
 ...API.patch => 0032-Entity-Origin-API.patch} |   0
 ...vent-tile-entity-and-entity-crashes.patch} |   2 +-
 ...figurable-top-of-nether-void-damage.patch} |   0
 ...-before-converting-and-renaming-pla.patch} |   0
 ... => 0036-Always-tick-falling-blocks.patch} |   0
 ...ch => 0037-Configurable-end-credits.patch} |   2 +-
 ...explosions-processing-dead-entities.patch} |   2 +-
 ...s.patch => 0039-Optimize-explosions.patch} |   0
 ...=> 0040-Disable-explosion-knockback.patch} |   0
 ...under.patch => 0041-Disable-thunder.patch} |   0
 ....patch => 0042-Disable-ice-and-snow.patch} |   0
 ...-Configurable-mob-spawner-tick-rate.patch} |   2 +-
 ...4-Implement-PlayerLocaleChangeEvent.patch} |   2 +-
 ...patch => 0045-Add-BeaconEffectEvent.patch} |   0
 ...igurable-container-update-tick-rate.patch} |   2 +-
 ...0047-Use-UserCache-for-player-heads.patch} |   0
 ...> 0048-Disable-spigot-tick-limiters.patch} |   0
 ...=> 0049-Add-PlayerInitialSpawnEvent.patch} |   2 +-
 ...rable-Disabling-Cat-Chest-Detection.patch} |   0
 ...1-Ensure-commands-are-not-ran-async.patch} |   4 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |   2 +-
 ...ch => 0053-Expose-server-CommandMap.patch} |   0
 ...-informative-in-maxHealth-exception.patch} |   0
 ...0055-Player-Tab-List-and-Title-APIs.patch} |   0
 ...d-configurable-portal-search-radius.patch} |   0
 ...patch => 0057-Add-velocity-warnings.patch} |   0
 ...le-inter-world-teleportation-safety.patch} |   0
 ... 0059-Add-exception-reporting-event.patch} |   0
 ...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 => 0063-Chunk-Save-Reattempt.patch} |   0
 ... => 0064-Complete-resource-pack-API.patch} |   0
 ...ding-permissions.yml-before-plugins.patch} |   0
 ...low-Reloading-of-Custom-Permissions.patch} |   0
 ...h => 0067-Remove-Metadata-on-reload.patch} |   0
 ...68-Handle-Item-Meta-Inconsistencies.patch} |   0
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |   0
 ...atch => 0070-Add-World-Util-Methods.patch} |   0
 ...-Custom-replacement-for-eaten-items.patch} |   0
 ...h-absorb-values-and-repair-bad-data.patch} |   0
 ...73-Use-a-Shared-Random-for-Entities.patch} |   0
 ...e-spawn-chances-for-skeleton-horses.patch} |   0
 ...dBounds-and-getBlockState-for-inlin.patch} |   0
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |   0
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   0
 ...8-Configurable-Chunk-Inhabited-Time.patch} |   0
 ...t.patch => 0079-EntityPathfindEvent.patch} |   0
 ...gionFileCache-and-make-configurable.patch} |   0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |   0
 ...082-Add-PlayerUseUnknownEntityEvent.patch} |   0
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   0
 ...-BlockPlaceEvent-triggering-physics.patch} |   0
 ...its.patch => 0085-Optimize-DataBits.patch} |   0
 ...illa-per-world-scoreboard-coloring-.patch} |   0
 ... 0087-Configurable-Player-Collision.patch} |   0
 ...nt-to-allow-plugins-to-handle-clien.patch} |   0
 ...> 0089-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
 ... 0097-Async-GameProfileCache-saving.patch} |   0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |   0
 ...-redstone-torch-rapid-clock-removal.patch} |   0
 ...h => 0100-Add-server-name-parameter.patch} |   0
 ...sounds-to-same-world-if-limiting-ra.patch} |   0
 ...tch => 0102-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} |   0
 ...timise-BlockState-s-hashCode-equals.patch} |   0
 ...nfigurable-packet-in-spam-threshold.patch} |   0
 ...8-Configurable-flying-kick-messages.patch} |   0
 ...nt.patch => 0109-Add-EntityZapEvent.patch} |   0
 ...entity-nbt-data-from-falling-blocks.patch} |   0
 ...11-Cache-user-authenticator-threads.patch} |   0
 ...-Allow-Reloading-of-Command-Aliases.patch} |   0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   0
 ... => 0114-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
 ... => 0119-Optimize-ItemStack.isEmpty.patch} |   0
 ...o-control-if-armour-stands-can-move.patch} |   0
 ...=> 0121-String-based-Action-Bar-API.patch} |   0
 ...2-Properly-fix-item-duplication-bug.patch} |   0
 ...-API-s.patch => 0123-Firework-API-s.patch} |   0
 ... 0124-PlayerTeleportEndGatewayEvent.patch} |   0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   0
 ...h => 0126-Enforce-Sync-Player-Saves.patch} |   0
 ...low-entities-to-ride-themselves-572.patch} |   0
 ...I-for-Reason-Source-Triggering-play.patch} |   0
 ...patch => 0129-Cap-Entity-Collisions.patch} |   0
 ...-CraftScheduler-Async-Task-Debugger.patch} |   0
 ...> 0131-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} |   0
 ...leAppender-for-console-improvements.patch} |   2 +-
 ...rable-option-to-disable-creeper-lin.patch} |   0
 ....patch => 0137-Item-canEntityPickup.patch} |   0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   0
 ...> 0139-PlayerAttemptPickupItemEvent.patch} |   0
 ...profile-lookups-to-worldgen-threads.patch} |   0
 ...tch => 0141-Add-UnknownCommandEvent.patch} |   0
 ...tch => 0142-Basic-PlayerProfile-API.patch} |   0
 ... 0143-Shoulder-Entities-Release-API.patch} |   0
 ...patch => 0144-Profile-Lookup-Events.patch} |   0
 ...layer-logins-during-server-shutdown.patch} |   0
 ...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} |   0
 ...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} |   0
 ...-prefixes-using-Log4J-configuration.patch} |   2 +-
 ...-Log4J-Configuration-Plugin-Loggers.patch} |   0
 ...t.patch => 0158-Add-PlayerJumpEvent.patch} |   0
 ...le-ServerboundKeepAlivePacket-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} |   0
 ...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} |   0
 ...=> 0169-PlayerPickupExperienceEvent.patch} |   0
 ...-Ability-to-apply-mending-to-XP-API.patch} |   0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   0
 ...patch => 0173-PreCreatureSpawnEvent.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} |   0
 ...=> 0183-Player.setPlayerProfile-API.patch} |   0
 ...patch => 0184-getPlayerUniqueId-API.patch} |   0
 ... 0185-Improved-Async-Task-Scheduler.patch} |   0
 ...e-legacy-ping-handler-more-reliable.patch} |   0
 ...erverListPingEvent-for-legacy-pings.patch} |   0
 ...8-Flag-to-disable-the-channel-limit.patch} |   0
 ...-Add-openSign-method-to-HumanEntity.patch} |   0
 ...rable-sprint-interruption-on-attack.patch} |   0
 ...allowed-colored-signs-to-be-created.patch} |   0
 ...t.patch => 0192-EndermanEscapeEvent.patch} |   0
 ...h => 0193-Enderman.teleportRandomly.patch} |   0
 ...194-Block-Enderpearl-Travel-Exploit.patch} |   0
 ...d.spawnParticle-API-and-add-Builder.patch} |   0
 ...ted-Ice-from-loading-holding-chunks.patch} |   0
 ...h => 0197-EndermanAttackPlayerEvent.patch} |   0
 ...tch => 0198-WitchConsumePotionEvent.patch} |   0
 ...patch => 0199-WitchThrowPotionEvent.patch} |   0
 ...tem-entities-with-World.spawnEntity.patch} |   0
 ...patch => 0201-WitchReadyPotionEvent.patch} |   0
 ...202-ItemStack-getMaxItemUseDuration.patch} |   0
 ...ement-EntityTeleportEndGatewayEvent.patch} |   0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   0
 ...ch => 0205-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
 ...=> 0209-Improve-EntityShootBowEvent.patch} |   0
 ...patch => 0210-PlayerReadyArrowEvent.patch} |   0
 ...nockbackByEntityEvent-and-EntityPus.patch} |   0
 ...patch => 0212-Expand-Explosions-API.patch} |   0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   0
 ...-API.patch => 0214-RangedEntity-API.patch} |   0
 ...o-disable-ender-dragon-legacy-check.patch} |   0
 ...-Implement-World.getEntity-UUID-API.patch} |   0
 ...0217-InventoryCloseEvent-Reason-API.patch} |   0
 ...tch => 0218-Vex-get-setSummoner-API.patch} |   0
 ...ventory-when-cancelling-PlayerInter.patch} |   0
 ...-to-keep-logging-IO-off-main-thread.patch} |   4 +-
 ...more-information-to-Entity.toString.patch} |   0
 ...tMagicNumbers.isSupportedApiVersion.patch} |   0
 ...ts.patch => 0223-EnderDragon-Events.patch} |   0
 ...atch => 0224-PlayerElytraBoostEvent.patch} |   0
 ...=> 0225-PlayerLaunchProjectileEvent.patch} |   0
 ...0226-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 => 0230-SkeletonHorse-Additions.patch} |   0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   0
 ...2-Implement-Expanded-ArmorStand-API.patch} |   0
 ...vent.patch => 0233-AnvilDamageEvent.patch} |   0
 ...ent.patch => 0234-Add-TNTPrimeEvent.patch} |   0
 ...d-make-tab-spam-limits-configurable.patch} |   0
 ...s.patch => 0236-Fix-NBT-type-issues.patch} |   0
 ...emove-unnecessary-itemmeta-handling.patch} |   0
 ...es-option-to-debug-dupe-uuid-issues.patch} |   0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |   0
 ...0-Use-ConcurrentHashMap-in-JsonList.patch} |   0
 ...1-Use-a-Queue-for-Queueing-Commands.patch} |   0
 ...le-Entities-from-a-chunk-without-sn.patch} |   0
 ...timize-BlockPosition-helper-methods.patch} |   0
 ...efault-mob-spawn-range-and-water-an.patch} |   0
 ...tch => 0245-Slime-Pathfinder-Events.patch} |   0
 ...e-speed-for-water-flowing-over-lava.patch} |   0
 ...47-Optimize-CraftBlockData-Creation.patch} |   0
 ...tch => 0248-Optimize-MappedRegistry.patch} |   0
 ...ch => 0249-Add-PhantomPreSpawnEvent.patch} |   0
 ....patch => 0250-Add-More-Creeper-API.patch} |   0
 ...=> 0251-Inventory-removeItemAnySlot.patch} |   0
 ...oadChunk-int-int-false-load-unconve.patch} |   0
 ...ray-tracing-methods-to-LivingEntity.patch} |   0
 ...-attack-cooldown-methods-for-Player.patch} |   0
 ....patch => 0255-Improve-death-events.patch} |   0
 ...w-chests-to-be-placed-with-NBT-data.patch} |   0
 ...I.patch => 0257-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
 ...=> 0264-Honor-EntityAgeable.ageLock.patch} |   0
 ...le-connection-throttle-kick-message.patch} |   0
 ...> 0266-Hook-into-CB-plugin-rewrites.patch} |   0
 ....patch => 0267-PreSpawnerSpawnEvent.patch} |   0
 ...68-Add-LivingEntity-getTargetEntity.patch} |   0
 ...I.patch => 0269-Add-sun-related-API.patch} |   0
 ...Turtle-API.patch => 0270-Turtle-API.patch} |   0
 ...ator-target-events-and-improve-impl.patch} |   0
 ...her-worlds-for-shooter-of-projectil.patch} |   0
 ...PI.patch => 0273-Add-more-Witch-API.patch} |   0
 ...wned-for-Villager-Aggression-Config.patch} |   0
 ...vent-players-from-moving-into-unloa.patch} |   0
 ...6-Reset-players-airTicks-on-respawn.patch} |   0
 ...after-profile-lookups-if-not-needed.patch} |   0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |   0
 ...=> 0279-Optimize-World-Time-Updates.patch} |   0
 ...tore-custom-InventoryHolder-support.patch} |   0
 ...=> 0281-Use-Vanilla-Minecart-Speeds.patch} |   0
 ...0282-Fix-SpongeAbsortEvent-handling.patch} |   0
 ...-allow-digging-into-unloaded-chunks.patch} |   0
 ...ult-permission-message-configurable.patch} |   0
 ...revent-rayTrace-from-loading-chunks.patch} |   0
 ...-Large-Packets-disconnecting-client.patch} |   0
 ...ntity-dismount-during-teleportation.patch} |   0
 ...I.patch => 0288-Add-more-Zombie-API.patch} |   0
 ...mits.patch => 0289-Book-Size-Limits.patch} |   0
 ...0290-Add-PlayerConnectionCloseEvent.patch} |   0
 ...revent-Enderman-from-loading-chunks.patch} |   0
 ...replace-OfflinePlayer-getLastPlayed.patch} |   0
 ...ehicle-tracking-issue-on-disconnect.patch} |   0
 ...remove-from-being-called-on-Players.patch} |   0
 ...ent.patch => 0295-BlockDestroyEvent.patch} |   0
 ... => 0296-Async-command-map-building.patch} |   0
 ...0297-Implement-Brigadier-Mojang-API.patch} |   2 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   0
 ... 0299-Limit-Client-Sign-length-more.patch} |   0
 ...onvertSigns-boolean-every-sign-save.patch} |   0
 ...Manager-and-add-advanced-packet-sup.patch} |   0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |   0
 ...ggleEvent-when-whitelist-is-toggled.patch} |   0
 ...=> 0304-Entity-getEntitySpawnReason.patch} |   0
 ...tch => 0305-Fire-event-on-GS4-query.patch} |   0
 ...06-Implement-PlayerPostRespawnEvent.patch} |   0
 ...for-pickupDelay-breaks-picking-up-i.patch} |   0
 ...ts.patch => 0308-Server-Tick-Events.patch} |   0
 ...309-PlayerDeathEvent-getItemsToKeep.patch} |   0
 ...Optimize-Captured-TileEntity-Lookup.patch} |   0
 ...API.patch => 0311-Add-Heightmap-API.patch} |   0
 ...> 0312-Mob-Spawner-API-Enhancements.patch} |   0
 ...-to-changed-postToMainThread-method.patch} |   0
 ...-item-frames-are-modified-MC-123450.patch} |   0
 ...0315-Implement-CraftBlockSoundGroup.patch} |   0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |   0
 ...17-Allow-Saving-of-Oversized-Chunks.patch} |   0
 ...18-Expose-the-internal-current-tick.patch} |   0
 ...19-Fix-World-isChunkGenerated-calls.patch} |   0
 ...te-location-if-we-failed-to-read-it.patch} |   0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   0
 ...urable-projectile-relative-velocity.patch} |   0
 ...h => 0323-offset-item-frame-ticking.patch} |   0
 ...-158900.patch => 0324-Fix-MC-158900.patch} |   0
 ...event-consuming-the-wrong-itemstack.patch} |   0
 ...6-Dont-send-unnecessary-sign-update.patch} |   0
 ...-option-to-disable-pillager-patrols.patch} |   0
 ...328-Flat-bedrock-generator-settings.patch} |   0
 ...k-loads-when-villagers-try-to-find-.patch} |   0
 ...656-Fix-Follow-Range-Initial-Target.patch} |   0
 ... 0331-Duplicate-UUID-Resolve-Option.patch} |   0
 ...pers.patch => 0332-Optimize-Hoppers.patch} |   0
 ...ayerDeathEvent-shouldDropExperience.patch} |   0
 ...ading-chunks-checking-hive-position.patch} |   0
 ...hunks-from-Hoppers-and-other-things.patch} |   0
 ...ializing-mismatching-chunk-coordina.patch} |   0
 ...timise-EntityGetter-getPlayerByUUID.patch} |   0
 ...338-Fix-items-not-falling-correctly.patch} |   0
 ...patch => 0339-Lag-compensate-eating.patch} |   0
 ...ize-call-to-getFluid-for-explosions.patch} |   0
 ...-in-stack-not-having-effects-when-d.patch} |   0
 ...=> 0342-Entity-Activation-Range-2.0.patch} |   0
 ...h => 0343-Increase-Light-Queue-Size.patch} |   0
 ...3-Anti-Xray.patch => 0344-Anti-Xray.patch} |   0
 ...ement-alternative-item-despawn-rate.patch} |   0
 ...=> 0346-Tracking-Range-Improvements.patch} |   0
 ...-items-vanishing-through-end-portal.patch} |   0
 ...ment-optional-per-player-mob-spawns.patch} |   0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   0
 ...50-Improve-Block-breakNaturally-API.patch} |   0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   0
 ...0352-Add-debug-for-sync-chunk-loads.patch} |   0
 ...3-Remove-garbage-Java-version-check.patch} |   0
 ...tch => 0354-Add-ThrownEggHatchEvent.patch} |   0
 ...p-API.patch => 0355-Entity-Jump-API.patch} |   0
 ...-to-nerf-pigmen-from-nether-portals.patch} |   0
 ... => 0357-Make-the-GUI-graph-fancier.patch} |   0
 ...58-add-hand-to-BlockMultiPlaceEvent.patch} |   0
 ...ipwire-hook-placement-before-update.patch} |   0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   0
 ...chance-of-villager-zombie-infection.patch} |   0
 ...tch => 0362-Optimise-Chunk-getFluid.patch} |   0
 ...rbose-world-setting-to-false-by-def.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   0
 ...65-Expose-MinecraftServer-isRunning.patch} |   0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...pawn-settings-and-per-player-option.patch} |   0
 ...nections-shouldn-t-hold-up-shutdown.patch} |   0
 ...ow-bees-to-load-chunks-for-beehives.patch} |   0
 ...PlayerChunkMap-adds-crashing-server.patch} |   0
 ...tch => 0371-Don-t-tick-dead-players.patch} |   0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   0
 ...timize-Collision-to-not-load-chunks.patch} |   0
 ...ove-existing-players-to-world-spawn.patch} |   0
 ...alSelector-Goal.Flag-Set-operations.patch} |   0
 ...h => 0376-Improved-Watchdog-Support.patch} |   0
 ....patch => 0377-Optimize-Pathfinding.patch} |   0
 ...8-Reduce-Either-Optional-allocation.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.patch} |   0
 ...entity-collision-code-if-not-needed.patch} |   0
 ...Implement-Player-Client-Options-API.patch} |   0
 ...ayer-is-attempted-to-be-removed-fro.patch} |   0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   0
 ...layerAttackEntityCooldownResetEvent.patch} |   0
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |   0
 ...patch => 0390-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   0
 ...n.patch => 0392-Expose-game-version.patch} |   0
 ...> 0393-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   0
 ....patch => 0395-misc-debugging-dumps.patch} |   0
 ...6-Prevent-teleporting-dead-entities.patch} |   0
 ...traces-in-log-messages-crash-report.patch} |   9 +-
 ...atch => 0398-Implement-Mob-Goal-API.patch} |   4 +-
 ...=> 0399-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0401-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0404-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   0
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   0
 ...leInt-allocations-from-light-engine.patch} |   0
 ...location-of-Vec3D-by-entity-tracker.patch} |   0
 ...> 0410-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |   0
 ...ance-map-to-optimise-entity-tracker.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0415-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   0
 ...uping.patch => 0419-Fix-sand-duping.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   0
 ...older-method-without-block-snapshot.patch} |   0
 ...API.patch => 0423-Improve-Arrow-API.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...6-Add-permission-for-command-blocks.patch} |   0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |   0
 ...d-Difficulty-Remembering-Difficulty.patch} |   0
 ...atch => 0429-Paper-dumpitem-command.patch} |   0
 ...Legacy-Component-serialization-size.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |   0
 ...incremental-chunk-and-player-saving.patch} |   0
 ...e-operations-for-updating-light-dat.patch} |   0
 ...435-Support-old-UUID-format-for-NBT.patch} |   0
 ...p-duplicated-GameProfile-Properties.patch} |   0
 ...vert-legacy-attributes-in-Item-Meta.patch} |   0
 ...Remove-some-streams-from-structures.patch} |   0
 ...rom-classes-related-villager-gossip.patch} |   0
 ...0440-Support-components-in-ItemMeta.patch} |   0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |   0
 ...patch => 0442-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   0
 ...wn-player-in-correct-world-on-login.patch} |   0
 ...atch => 0445-Add-PrepareResultEvent.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   0
 ...e-NetworkManager-Exception-Handling.patch} |   0
 ...ncement-data-player-iteration-to-be.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   0
 ...Vanilla-Command-permission-checking.patch} |   0
 ...-5989.patch => 0451-Fix-SPIGOT-5989.patch} |   0
 ...-Bukkit-world-container-is-not-used.patch} |   0
 ...5885-Unable-to-disable-advancements.patch} |   0
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...stake-in-CB-NBT-int-deserialization.patch} |   0
 ...rver-load-chunks-from-newer-version.patch} |   0
 ...support.patch => 0458-Brand-support.patch} |   0
 ...patch => 0459-Add-setMaxPlayers-API.patch} |   0
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0461-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   0
 ...PI.patch => 0463-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0465-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   0
 ...patch => 0467-Buffer-joins-to-world.patch} |   0
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   0
 ...reateEvent-needs-to-know-its-entity.patch} |   0
 ...ch => 0471-Fix-CraftTeam-null-check.patch} |   0
 ...I.patch => 0472-Add-more-Evoker-API.patch} |   0
 ...Add-methods-to-get-translation-keys.patch} |   0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0475-Cache-block-data-strings.patch} |   0
 ...rtation-and-cancel-velocity-if-tele.patch} |   0
 ...l-open-container-api-to-HumanEntity.patch} |   0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |   0
 ...-capture-to-capture-all-items-added.patch} |   0
 ...-Counter-to-allow-plugins-to-use-va.patch} |   0
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0482-Entity-isTicking.patch} |   0
 ...non-whitelisted-player-when-white-l.patch} |   0
 ...-Concurrency-issue-in-ShufflingList.patch} |   0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   0
 ...-large-move-vectors-crashing-server.patch} |   0
 ...atch => 0487-Optimise-getType-calls.patch} |   0
 ....patch => 0488-Villager-resetOffers.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   0
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0492-Player-elytra-boost-API.patch} |   0
 ...93-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   0
 ...ch => 0496-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   0
 ...x-client-lag-on-advancement-loading.patch} |   0
 ...> 0499-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...501-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0502-Add-API-for-quit-reason.patch} |   0
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...ch => 0504-Expose-world-spawn-angle.patch} |   0
 ...patch => 0505-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   0
 ...07-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0508-Add-PlayerItemCooldownEvent.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...PI.patch => 0510-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   0
 ...-missing-default-perms-for-commands.patch} |  35 --
 ...h => 0513-Add-PlayerShearBlockEvent.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0515-Limit-recipe-packets.patch} |   0
 ...-CraftSound-backwards-compatibility.patch} |   0
 ...517-Player-Chunk-Load-Unload-Events.patch} |   0
 ...8-Optimize-Dynamic-get-Missing-Keys.patch} |   0
 ...-Expose-LivingEntity-hurt-direction.patch} |   0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |   0
 ...-invalid-ingredient-lists-in-Villag.patch} |   0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |   0
 ...ch => 0523-Implement-TargetHitEvent.patch} |   0
 ... 0524-MC-4-Fix-item-position-desync.patch} |   0
 ...525-Additional-Block-Material-API-s.patch} |   0
 ...tch => 0526-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0528-Cache-burn-durations.patch} |   0
 ...ob-spawner-spawn-egg-transformation.patch} |   0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |   0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |   0
 ...event-not-being-called-in-adventure.patch} |   0
 ...h => 0533-Zombie-API-breaking-doors.patch} |   0
 ...534-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0535-Add-EntityLoadCrossbowEvent.patch} |   0
 ...0536-Added-WorldGameRuleChangeEvent.patch} |   0
 ...-Added-ServerResourcesReloadedEvent.patch} |   0
 ...d-settings-for-mobs-picking-up-loot.patch} |   0
 ...mplemented-BlockFailedDispenseEvent.patch} |   0
 ...-Added-PlayerLecternPageChangeEvent.patch} |   0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |   0
 ...nfigurable-door-breaking-difficulty.patch} |   0
 ...ty-commands-shall-not-be-dispatched.patch} |   0
 ...I-to-expose-exact-interaction-point.patch} |   0
 ...OIs.patch => 0545-Remove-stale-POIs.patch} |   0
 ...h => 0546-Fix-villager-boat-exploit.patch} |   0
 ...I.patch => 0547-Add-sendOpLevel-API.patch} |   0
 ...try.patch => 0548-Add-PaperRegistry.patch} |   2 +-
 ...h => 0549-Add-StructuresLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   0
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...553-Make-schedule-command-per-world.patch} |   0
 ...554-Configurable-max-leash-distance.patch} |   0
 ...555-Implement-BlockPreDispenseEvent.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   0
 ...atch => 0561-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0562-EntityMoveEvent.patch} |   0
 ...isable-pathfinding-updates-on-block.patch} |   0
 ... 0564-Inline-shift-direction-fields.patch} |   0
 ...-adding-items-to-BlockDropItemEvent.patch} |   0
 ...inThreadExecutor-to-BukkitScheduler.patch} |   0
 ...entity-allow-attribute-registration.patch} |   0
 ...ix-dead-slime-setSize-invincibility.patch} |   0
 ...pes-should-return-an-immutable-list.patch} |   0
 ...port-for-hex-color-codes-in-console.patch} |   0
 ...atch => 0571-Expose-Tracked-Players.patch} |   0
 ...2-Remove-streams-from-SensorNearest.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0574-Improve-ServerGUI.patch} |   0
 ...ure-plate-EntityInteractEvent-for-i.patch} |   0
 ...576-fix-converting-txt-to-json-file.patch} |   0
 ...atch => 0577-Add-worldborder-events.patch} |   0
 ...=> 0578-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0580-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0581-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   0
 ....patch => 0583-Expand-world-key-API.patch} |   0
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0585-Item-Rarity-API.patch} |   0
 ...py-TESign-isEditable-from-snapshots.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   0
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   0
 ...90-Entity-load-save-limit-per-chunk.patch} |   0
 ...tch => 0591-Expose-protocol-version.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   0
 ...patch => 0594-Add-bypass-host-check.patch} |   0
 ...0595-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   0
 ... => 0601-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0602-More-World-API.patch} |   0
 ... 0603-Added-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   0
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0610-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...close.patch => 0614-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0616-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0617-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   0
 ... => 0620-ItemStack-repair-check-API.patch} |   0
 ....patch => 0621-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   0
 ...PI.patch => 0624-Add-Mob-lookAt-API.patch} |   0
 ...0625-Add-Unix-domain-socket-support.patch} |   0
 ... => 0626-Add-EntityInsideBlockEvent.patch} |   0
 ...27-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   0
 ...patch => 0629-More-Lidded-Block-API.patch} |   0
 ...30-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0631-Add-PlayerKickEvent-causes.patch} |   0
 ...0632-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0636-Add-BellRevealRaiderEvent.patch} |   0
 ... 0637-Fix-invulnerable-end-crystals.patch} |   0
 ...38-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0639-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0642-Line-Of-Sight-Changes.patch} |   0
 ... => 0643-add-per-world-spawn-limits.patch} |   0
 ...h => 0644-Fix-potions-splash-events.patch} |   0
 ... => 0645-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   0
 ...=> 0647-Missing-Entity-Behavior-API.patch} |   0
 ...ect-for-book-edit-is-called-on-main.patch} |   0
 ...of-Block-applyBoneMeal-always-being.patch} |   0
 ...tChunkIfLoadedImmediately-in-places.patch} |   0
 ...rom-signs-not-firing-command-events.patch} |   0
 ...ch => 0652-Adds-PlayerArmSwingEvent.patch} |   0
 ...-event-leave-message-not-being-sent.patch} |   0
 ...-for-mobs-immune-to-default-effects.patch} |   0
 ...correct-message-for-outdated-client.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   0
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ...-bunch-of-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0659-Stinger-API.patch} |   0
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0661-Add-System.out-err-catcher.patch} |   0
 ... => 0662-Fix-test-not-bootstrapping.patch} |   0
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   0
 ...AFK-kick-while-watching-end-credits.patch} |   0
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0667-Add-PlayerSetSpawnEvent.patch} |   0
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0671-Added-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   0
 ...osition-losing-precision-millions-o.patch} |   0
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...676-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0678-Add-BlockBreakBlockEvent.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0680-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0682-Add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   0
 ... 0684-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0685-Left-handed-API.patch} |   0
 ...ch => 0686-Add-more-advancement-API.patch} |   0
 ...687-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0688-Add-critical-damage-API.patch} |   0
 ...0689-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   0
 ...-ram-API.patch => 0691-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...3-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...94-Vanilla-command-permission-fixes.patch} |   0
 ...logic-for-inventories-on-chunk-unlo.patch} |   0
 ...96-Fix-GameProfileCache-concurrency.patch} |   0
 ...g-when-the-async-catcher-is-tripped.patch} |   0
 ...per-mobcaps-and-paper-playermobcaps.patch} |   0
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...rolled-flushing-for-network-manager.patch} |   0
 ...=> 0701-Optimise-general-POI-access.patch} |   0
 ... 0702-Optimise-chunk-tick-iteration.patch} |   0
 ...> 0703-Execute-chunk-tasks-mid-tick.patch} |   0
 ...ulate-regionfile-header-if-it-is-co.patch} |   0
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...-more-information-in-watchdog-dumps.patch} |   0
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ... 0708-Distance-manager-tick-timings.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   0
 ...h => 0711-Add-packet-limiter-config.patch} |   0
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...sh-calls-for-entity-tracker-packets.patch} |   0
 ...-lookup-fluid-state-when-raytracing.patch} |   0
 ...atch => 0715-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...7-Do-not-run-raytrace-logic-for-AIR.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   0
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0720-Optimise-random-block-ticking.patch} |   0
 ...1-Optimise-non-flush-packet-sending.patch} |   0
 ...0722-Optimise-nearby-player-lookups.patch} |   0
 ...0723-Remove-streams-for-villager-AI.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   4 +-
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ...ifications-to-critical-entity-state.patch} |   0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   0
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0732-Ensure-valid-vehicle-status.patch} |   0
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0737-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0740-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ...ion-for-logging-player-ip-addresses.patch} |   0
 ... => 0743-Configurable-feature-seeds.patch} |   0
 ...pper-didnt-account-for-entity-sende.patch} |   0
 ... 0745-Add-root-admin-user-detection.patch} |   0
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   0
 ...ive-velocity-through-repeated-crits.patch} |   0
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...ochunk-light-sources-unless-it-is-m.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   0
 ...e-unnecessary-itemmeta-from-clients.patch} |   0
 ...=> 0754-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0756-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...> 0757-Add-player-health-update-API.patch} |   0
 ...tch => 0758-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |   0
 ...n-checking-in-player-move-packet-ha.patch} |   0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0763-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...65-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   0
 ... => 0767-Improve-scoreboard-entries.patch} |   0
 ...ch => 0768-Entity-powdered-snow-API.patch} |   0
 ...0769-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0775-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0776-Bucketable-API.patch} |   0
 ...es.patch => 0777-Validate-usernames.patch} |   0
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   0
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...load-to-PersistentDataContainer-has.patch} |   0
 ...2-Multiple-Entries-with-Scoreboards.patch} |   0
 ...783-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...0786-Fix-xp-reward-for-baby-zombies.patch} |   0
 ... 0787-Kick-on-main-for-illegal-chat.patch} |   0
 ...lti-Block-Change-API-Implementation.patch} |   0
 ...ent.patch => 0789-Fix-NotePlayEvent.patch} |   0
 ....patch => 0790-Freeze-Tick-Lock-API.patch} |   0
 ...lphin-API.patch => 0791-Dolphin-API.patch} |   0
 ...h => 0792-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   0
 ...-missing-structure-set-seed-configs.patch} |   0
 ...h => 0796-Implement-regenerateChunk.patch} |   0
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   0
 ...gs.patch => 0799-Add-GameEvent-tags.patch} |   0
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0801-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   0
 ... => 0806-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0807-Custom-Potion-Mixes.patch} |   0
 ...0808-Fix-Fluid-tags-isTagged-method.patch} |   0
 ...09-Force-close-world-loading-screen.patch} |   0
 ...810-Fix-falling-block-spawn-methods.patch} |   0
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0813-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   0
 ...0816-Implement-getComputedBiome-API.patch} |   0
 ...> 0817-Make-some-itemstacks-nonnull.patch} |   0
 ...818-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0819-Fix-saving-in-unloadWorld.patch} |   0
 ...h => 0820-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0821-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   0
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   0
 ...s.patch => 0826-cache-resource-keys.patch} |   0
 ...ange-the-podium-for-the-EnderDragon.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   0
 ...ead-of-display-name-in-PlayerList-g.patch} |   0
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |   0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0835-WorldCreator-keepSpawnLoaded.patch} |   0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0841-Add-PlayerStopUsingItemEvent.patch} |   0
 ...42-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0843-Don-t-tick-markers.patch} |   0
 ...-not-accept-invalid-client-settings.patch} |   0
 ...0845-Add-support-for-Proxy-Protocol.patch} |   2 +-
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0848-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   0
 ...ate-Current-redstone-implementation.patch} |   0
 ...53-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0854-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0857-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   0
 ...pty-items-from-being-added-to-world.patch} |   0
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...nent-in-resource-pack-rejection-mes.patch} |   0
 ...atch => 0862-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...debug-information-to-chat-packet-er.patch} |   0
 ...PE.patch => 0866-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   0
 ...API.patch => 0868-More-Teleport-API.patch} |   0
 ... => 0869-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   0
 ...on-plugins-accessing-faraway-chunks.patch} |   0
 ...tom-Chat-Completion-Suggestions-API.patch} |   0
 ...=> 0874-Add-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0875-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...-invalid-signature-login-stacktrace.patch} |   0
 ...-to-PlayerConnection-internalTelepo.patch} |   0
 ...API.patch => 0879-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   0
 ...andom-in-ServerLoginPacketListenerI.patch} |   0
 ...882-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...und-for-client-lag-spikes-MC-162253.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...estroyerIdentity-to-sendBlockDamage.patch} |   0
 ...t-killed-statuses-should-be-false-f.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0889-Missing-eating-regain-reason.patch} |   0
 ....patch => 0890-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...3-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0894-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ...re-player-sending-on-dimension-chan.patch} |   0
 ... 0897-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ...lockState-and-isPreferredTool-to-Bl.patch} |   0
 ...=> 0900-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   0
 ... 0902-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0903-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0906-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0908-Add-entity-knockback-API.patch} |   0
 ....patch => 0909-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...1-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0912-Added-EntityToggleSitEvent.patch} |   0
 ... => 0913-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0914-Add-Moving-Piston-API.patch} |   0
 ...> 0915-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0920-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0923-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...925-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   0
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0928-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0929-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0931-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0932-Sync-offhand-slot-in-menus.patch} |   0
 ... 0933-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0934-Limit-pet-look-distance.patch} |   0
 ...ch => 0935-Properly-resend-entities.patch} |   0
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0937-fix-Instruments.patch} |   0
 ...938-Fix-chunk-snapshot-biome-getter.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...-MapLike-Codec-missing-key-selector.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ... => 0942-Improve-logging-and-errors.patch} |   0
 ...-explosion-yield-with-new-gamerules.patch} |   0
 ...tch => 0944-Add-BlockLockCheckEvent.patch} |   0
 ... 0945-Add-Sneaking-API-for-Entities.patch} |   0
 ....patch => 0946-Improve-PortalEvents.patch} |   0
 ...ed-block-state-to-BlockExplodeEvent.patch} |   0
 ...ion-for-spider-worldborder-climbing.patch} |   0
 ...sing-SpigotConfig-logCommands-check.patch} |   0
 ...Allay-stopDancing-while-not-dancing.patch} |   0
 ...ge.patch => 0951-Flying-Fall-Damage.patch} |   0
 ...ion-moving-velocity-to-VehicleBlock.patch} |   0
 ...onfig-for-disabling-entity-tag-tags.patch} |   0
 ...e-player-info-update-packet-on-join.patch} |   0
 ...k-items-during-EntityResurrectEvent.patch} |   0
 ...-Player-sendEquipmentChange-Map-API.patch} |   0
 ...en-API.patch => 0957-Win-Screen-API.patch} |   0
 ...ItemStack-setAmount-null-assignment.patch} |   0
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0960-Add-Entity-Body-Yaw-API.patch} |   0
 ...Add-missing-isFuel-Material-entries.patch} |   2 +-
 964 files changed, 819 insertions(+), 230 deletions(-)
 delete mode 100644 patches/api/0003-Annotation-Test-changes.patch
 create mode 100644 patches/api/0003-Test-changes.patch
 create mode 100644 patches/server/0004-Test-changes.patch
 rename patches/server/{0004-Paper-config-files.patch => 0005-Paper-config-files.patch} (99%)
 rename patches/server/{0005-MC-Dev-fixes.patch => 0006-MC-Dev-fixes.patch} (100%)
 rename patches/server/{0006-ConcurrentUtil.patch => 0007-ConcurrentUtil.patch} (100%)
 rename patches/server/{0007-CB-fixes.patch => 0008-CB-fixes.patch} (100%)
 rename patches/server/{0008-MC-Utils.patch => 0009-MC-Utils.patch} (99%)
 rename patches/server/{0009-Adventure.patch => 0010-Adventure.patch} (99%)
 rename patches/server/{0010-Paper-command.patch => 0011-Paper-command.patch} (100%)
 rename patches/server/{0011-Paper-Metrics.patch => 0012-Paper-Metrics.patch} (100%)
 rename patches/server/{0012-Timings-v2.patch => 0013-Timings-v2.patch} (100%)
 rename patches/server/{0013-Rewrite-dataconverter-system.patch => 0014-Rewrite-dataconverter-system.patch} (100%)
 rename patches/server/{0014-Starlight.patch => 0015-Starlight.patch} (99%)
 rename patches/server/{0015-Add-TickThread.patch => 0016-Add-TickThread.patch} (100%)
 rename patches/server/{0016-Rewrite-chunk-system.patch => 0017-Rewrite-chunk-system.patch} (99%)
 rename patches/server/{0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (95%)
 rename patches/server/{0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch => 0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch} (100%)
 rename patches/server/{0019-Configurable-baby-zombie-movement-speed.patch => 0020-Configurable-baby-zombie-movement-speed.patch} (100%)
 rename patches/server/{0020-Configurable-fishing-time-ranges.patch => 0021-Configurable-fishing-time-ranges.patch} (94%)
 rename patches/server/{0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch => 0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch} (100%)
 rename patches/server/{0022-Add-configurable-despawn-distances-for-living-entiti.patch => 0023-Add-configurable-despawn-distances-for-living-entiti.patch} (100%)
 rename patches/server/{0023-Allow-for-toggling-of-spawn-chunks.patch => 0024-Allow-for-toggling-of-spawn-chunks.patch} (100%)
 rename patches/server/{0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (100%)
 rename patches/server/{0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (100%)
 rename patches/server/{0026-Implement-Paper-VersionChecker.patch => 0027-Implement-Paper-VersionChecker.patch} (100%)
 rename patches/server/{0027-Add-version-history-to-version-command.patch => 0028-Add-version-history-to-version-command.patch} (100%)
 rename patches/server/{0028-Player-affects-spawning-API.patch => 0029-Player-affects-spawning-API.patch} (100%)
 rename patches/server/{0029-Further-improve-server-tick-loop.patch => 0030-Further-improve-server-tick-loop.patch} (100%)
 rename patches/server/{0030-Only-refresh-abilities-if-needed.patch => 0031-Only-refresh-abilities-if-needed.patch} (100%)
 rename patches/server/{0031-Entity-Origin-API.patch => 0032-Entity-Origin-API.patch} (100%)
 rename patches/server/{0032-Prevent-tile-entity-and-entity-crashes.patch => 0033-Prevent-tile-entity-and-entity-crashes.patch} (97%)
 rename patches/server/{0033-Configurable-top-of-nether-void-damage.patch => 0034-Configurable-top-of-nether-void-damage.patch} (100%)
 rename patches/server/{0034-Check-online-mode-before-converting-and-renaming-pla.patch => 0035-Check-online-mode-before-converting-and-renaming-pla.patch} (100%)
 rename patches/server/{0035-Always-tick-falling-blocks.patch => 0036-Always-tick-falling-blocks.patch} (100%)
 rename patches/server/{0036-Configurable-end-credits.patch => 0037-Configurable-end-credits.patch} (91%)
 rename patches/server/{0037-Fix-lag-from-explosions-processing-dead-entities.patch => 0038-Fix-lag-from-explosions-processing-dead-entities.patch} (92%)
 rename patches/server/{0038-Optimize-explosions.patch => 0039-Optimize-explosions.patch} (100%)
 rename patches/server/{0039-Disable-explosion-knockback.patch => 0040-Disable-explosion-knockback.patch} (100%)
 rename patches/server/{0040-Disable-thunder.patch => 0041-Disable-thunder.patch} (100%)
 rename patches/server/{0041-Disable-ice-and-snow.patch => 0042-Disable-ice-and-snow.patch} (100%)
 rename patches/server/{0042-Configurable-mob-spawner-tick-rate.patch => 0043-Configurable-mob-spawner-tick-rate.patch} (95%)
 rename patches/server/{0043-Implement-PlayerLocaleChangeEvent.patch => 0044-Implement-PlayerLocaleChangeEvent.patch} (96%)
 rename patches/server/{0044-Add-BeaconEffectEvent.patch => 0045-Add-BeaconEffectEvent.patch} (100%)
 rename patches/server/{0045-Configurable-container-update-tick-rate.patch => 0046-Configurable-container-update-tick-rate.patch} (93%)
 rename patches/server/{0046-Use-UserCache-for-player-heads.patch => 0047-Use-UserCache-for-player-heads.patch} (100%)
 rename patches/server/{0047-Disable-spigot-tick-limiters.patch => 0048-Disable-spigot-tick-limiters.patch} (100%)
 rename patches/server/{0048-Add-PlayerInitialSpawnEvent.patch => 0049-Add-PlayerInitialSpawnEvent.patch} (95%)
 rename patches/server/{0049-Configurable-Disabling-Cat-Chest-Detection.patch => 0050-Configurable-Disabling-Cat-Chest-Detection.patch} (100%)
 rename patches/server/{0050-Ensure-commands-are-not-ran-async.patch => 0051-Ensure-commands-are-not-ran-async.patch} (97%)
 rename patches/server/{0051-All-chunks-are-slime-spawn-chunks-toggle.patch => 0052-All-chunks-are-slime-spawn-chunks-toggle.patch} (95%)
 rename patches/server/{0052-Expose-server-CommandMap.patch => 0053-Expose-server-CommandMap.patch} (100%)
 rename patches/server/{0053-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0054-Be-a-bit-more-informative-in-maxHealth-exception.patch} (100%)
 rename patches/server/{0054-Player-Tab-List-and-Title-APIs.patch => 0055-Player-Tab-List-and-Title-APIs.patch} (100%)
 rename patches/server/{0055-Add-configurable-portal-search-radius.patch => 0056-Add-configurable-portal-search-radius.patch} (100%)
 rename patches/server/{0056-Add-velocity-warnings.patch => 0057-Add-velocity-warnings.patch} (100%)
 rename patches/server/{0057-Configurable-inter-world-teleportation-safety.patch => 0058-Configurable-inter-world-teleportation-safety.patch} (100%)
 rename patches/server/{0058-Add-exception-reporting-event.patch => 0059-Add-exception-reporting-event.patch} (100%)
 rename patches/server/{0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (100%)
 rename patches/server/{0060-Disable-Scoreboards-for-non-players-by-default.patch => 0061-Disable-Scoreboards-for-non-players-by-default.patch} (100%)
 rename patches/server/{0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (100%)
 rename patches/server/{0062-Chunk-Save-Reattempt.patch => 0063-Chunk-Save-Reattempt.patch} (100%)
 rename patches/server/{0063-Complete-resource-pack-API.patch => 0064-Complete-resource-pack-API.patch} (100%)
 rename patches/server/{0064-Default-loading-permissions.yml-before-plugins.patch => 0065-Default-loading-permissions.yml-before-plugins.patch} (100%)
 rename patches/server/{0065-Allow-Reloading-of-Custom-Permissions.patch => 0066-Allow-Reloading-of-Custom-Permissions.patch} (100%)
 rename patches/server/{0066-Remove-Metadata-on-reload.patch => 0067-Remove-Metadata-on-reload.patch} (100%)
 rename patches/server/{0067-Handle-Item-Meta-Inconsistencies.patch => 0068-Handle-Item-Meta-Inconsistencies.patch} (100%)
 rename patches/server/{0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (100%)
 rename patches/server/{0069-Add-World-Util-Methods.patch => 0070-Add-World-Util-Methods.patch} (100%)
 rename patches/server/{0070-Custom-replacement-for-eaten-items.patch => 0071-Custom-replacement-for-eaten-items.patch} (100%)
 rename patches/server/{0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (100%)
 rename patches/server/{0072-Use-a-Shared-Random-for-Entities.patch => 0073-Use-a-Shared-Random-for-Entities.patch} (100%)
 rename patches/server/{0073-Configurable-spawn-chances-for-skeleton-horses.patch => 0074-Configurable-spawn-chances-for-skeleton-horses.patch} (100%)
 rename patches/server/{0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%)
 rename patches/server/{0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (100%)
 rename patches/server/{0076-Entity-AddTo-RemoveFrom-World-Events.patch => 0077-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename patches/server/{0077-Configurable-Chunk-Inhabited-Time.patch => 0078-Configurable-Chunk-Inhabited-Time.patch} (100%)
 rename patches/server/{0078-EntityPathfindEvent.patch => 0079-EntityPathfindEvent.patch} (100%)
 rename patches/server/{0079-Sanitise-RegionFileCache-and-make-configurable.patch => 0080-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename patches/server/{0080-Do-not-load-chunks-for-Pathfinding.patch => 0081-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0081-Add-PlayerUseUnknownEntityEvent.patch => 0082-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename patches/server/{0082-Configurable-Grass-Spread-Tick-Rate.patch => 0083-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename patches/server/{0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename patches/server/{0084-Optimize-DataBits.patch => 0085-Optimize-DataBits.patch} (100%)
 rename patches/server/{0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0086-Configurable-Player-Collision.patch => 0087-Configurable-Player-Collision.patch} (100%)
 rename patches/server/{0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0088-Configurable-RCON-IP-address.patch => 0089-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0089-EntityRegainHealthEvent-isFastRegen-API.patch => 0090-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename patches/server/{0090-Add-ability-to-configure-frosted_ice-properties.patch => 0091-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0091-remove-null-possibility-for-getServer-singleton.patch => 0092-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename patches/server/{0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename patches/server/{0093-LootTable-API-Replenishable-Lootables-Feature.patch => 0094-LootTable-API-Replenishable-Lootables-Feature.patch} (100%)
 rename patches/server/{0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename patches/server/{0095-System-property-for-disabling-watchdoge.patch => 0096-System-property-for-disabling-watchdoge.patch} (100%)
 rename patches/server/{0096-Async-GameProfileCache-saving.patch => 0097-Async-GameProfileCache-saving.patch} (100%)
 rename patches/server/{0097-Optional-TNT-doesn-t-move-in-water.patch => 0098-Optional-TNT-doesn-t-move-in-water.patch} (100%)
 rename patches/server/{0098-Faster-redstone-torch-rapid-clock-removal.patch => 0099-Faster-redstone-torch-rapid-clock-removal.patch} (100%)
 rename patches/server/{0099-Add-server-name-parameter.patch => 0100-Add-server-name-parameter.patch} (100%)
 rename patches/server/{0100-Only-send-global-sounds-to-same-world-if-limiting-ra.patch => 0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch} (100%)
 rename patches/server/{0101-Fix-Old-Sign-Conversion.patch => 0102-Fix-Old-Sign-Conversion.patch} (100%)
 rename patches/server/{0102-Avoid-blocking-on-Network-Manager-creation.patch => 0103-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename patches/server/{0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename patches/server/{0104-Add-setting-for-proxy-online-mode-status.patch => 0105-Add-setting-for-proxy-online-mode-status.patch} (100%)
 rename patches/server/{0105-Optimise-BlockState-s-hashCode-equals.patch => 0106-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0106-Configurable-packet-in-spam-threshold.patch => 0107-Configurable-packet-in-spam-threshold.patch} (100%)
 rename patches/server/{0107-Configurable-flying-kick-messages.patch => 0108-Configurable-flying-kick-messages.patch} (100%)
 rename patches/server/{0108-Add-EntityZapEvent.patch => 0109-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0109-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch => 0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch} (100%)
 rename patches/server/{0110-Cache-user-authenticator-threads.patch => 0111-Cache-user-authenticator-threads.patch} (100%)
 rename patches/server/{0111-Allow-Reloading-of-Command-Aliases.patch => 0112-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename patches/server/{0112-Add-source-to-PlayerExpChangeEvent.patch => 0113-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/server/{0113-Add-ProjectileCollideEvent.patch => 0114-Add-ProjectileCollideEvent.patch} (100%)
 rename patches/server/{0114-Prevent-Pathfinding-out-of-World-Border.patch => 0115-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0115-Optimize-World.isLoaded-BlockPosition-Z.patch => 0116-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename patches/server/{0116-Bound-Treasure-Maps-to-World-Border.patch => 0117-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename patches/server/{0117-Configurable-Cartographer-Treasure-Maps.patch => 0118-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0118-Optimize-ItemStack.isEmpty.patch => 0119-Optimize-ItemStack.isEmpty.patch} (100%)
 rename patches/server/{0119-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0120-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/server/{0120-String-based-Action-Bar-API.patch => 0121-String-based-Action-Bar-API.patch} (100%)
 rename patches/server/{0121-Properly-fix-item-duplication-bug.patch => 0122-Properly-fix-item-duplication-bug.patch} (100%)
 rename patches/server/{0122-Firework-API-s.patch => 0123-Firework-API-s.patch} (100%)
 rename patches/server/{0123-PlayerTeleportEndGatewayEvent.patch => 0124-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0124-Provide-E-TE-Chunk-count-stat-methods.patch => 0125-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename patches/server/{0125-Enforce-Sync-Player-Saves.patch => 0126-Enforce-Sync-Player-Saves.patch} (100%)
 rename patches/server/{0126-Don-t-allow-entities-to-ride-themselves-572.patch => 0127-Don-t-allow-entities-to-ride-themselves-572.patch} (100%)
 rename patches/server/{0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename patches/server/{0128-Cap-Entity-Collisions.patch => 0129-Cap-Entity-Collisions.patch} (100%)
 rename patches/server/{0129-Remove-CraftScheduler-Async-Task-Debugger.patch => 0130-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0130-Do-not-let-armorstands-drown.patch => 0131-Do-not-let-armorstands-drown.patch} (100%)
 rename patches/server/{0131-Properly-handle-async-calls-to-restart-the-server.patch => 0132-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename patches/server/{0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (100%)
 rename patches/server/{0133-Add-configuration-option-to-prevent-player-names-fro.patch => 0134-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename patches/server/{0134-Use-TerminalConsoleAppender-for-console-improvements.patch => 0135-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename patches/server/{0135-provide-a-configurable-option-to-disable-creeper-lin.patch => 0136-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0136-Item-canEntityPickup.patch => 0137-Item-canEntityPickup.patch} (100%)
 rename patches/server/{0137-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0138-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0138-PlayerAttemptPickupItemEvent.patch => 0139-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (100%)
 rename patches/server/{0140-Add-UnknownCommandEvent.patch => 0141-Add-UnknownCommandEvent.patch} (100%)
 rename patches/server/{0141-Basic-PlayerProfile-API.patch => 0142-Basic-PlayerProfile-API.patch} (100%)
 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} (100%)
 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} (100%)
 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} (100%)
 rename patches/server/{0155-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0156-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 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-ServerboundKeepAlivePacket-async.patch => 0159-handle-ServerboundKeepAlivePacket-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} (100%)
 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} (100%)
 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} (100%)
 rename patches/server/{0171-Add-setPlayerProfile-API-for-Skulls.patch => 0172-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0172-PreCreatureSpawnEvent.patch => 0173-PreCreatureSpawnEvent.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} (100%)
 rename patches/server/{0182-Player.setPlayerProfile-API.patch => 0183-Player.setPlayerProfile-API.patch} (100%)
 rename patches/server/{0183-getPlayerUniqueId-API.patch => 0184-getPlayerUniqueId-API.patch} (100%)
 rename patches/server/{0184-Improved-Async-Task-Scheduler.patch => 0185-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0185-Make-legacy-ping-handler-more-reliable.patch => 0186-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0186-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0187-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0187-Flag-to-disable-the-channel-limit.patch => 0188-Flag-to-disable-the-channel-limit.patch} (100%)
 rename patches/server/{0188-Add-openSign-method-to-HumanEntity.patch => 0189-Add-openSign-method-to-HumanEntity.patch} (100%)
 rename patches/server/{0189-Configurable-sprint-interruption-on-attack.patch => 0190-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename patches/server/{0191-EndermanEscapeEvent.patch => 0192-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0192-Enderman.teleportRandomly.patch => 0193-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0193-Block-Enderpearl-Travel-Exploit.patch => 0194-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename patches/server/{0194-Expand-World.spawnParticle-API-and-add-Builder.patch => 0195-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename patches/server/{0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0196-EndermanAttackPlayerEvent.patch => 0197-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0197-WitchConsumePotionEvent.patch => 0198-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0198-WitchThrowPotionEvent.patch => 0199-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0200-WitchReadyPotionEvent.patch => 0201-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0201-ItemStack-getMaxItemUseDuration.patch => 0202-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0202-Implement-EntityTeleportEndGatewayEvent.patch => 0203-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0204-Fix-CraftEntity-hashCode.patch => 0205-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0205-Configurable-Alternative-LootPool-Luck-Formula.patch => 0206-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0206-Print-Error-details-when-failing-to-save-player-data.patch => 0207-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0207-Make-shield-blocking-delay-configurable.patch => 0208-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/server/{0208-Improve-EntityShootBowEvent.patch => 0209-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0209-PlayerReadyArrowEvent.patch => 0210-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch => 0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch} (100%)
 rename patches/server/{0211-Expand-Explosions-API.patch => 0212-Expand-Explosions-API.patch} (100%)
 rename patches/server/{0212-LivingEntity-Hand-Raised-Item-Use-API.patch => 0213-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0213-RangedEntity-API.patch => 0214-RangedEntity-API.patch} (100%)
 rename patches/server/{0214-Add-config-to-disable-ender-dragon-legacy-check.patch => 0215-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0215-Implement-World.getEntity-UUID-API.patch => 0216-Implement-World.getEntity-UUID-API.patch} (100%)
 rename patches/server/{0216-InventoryCloseEvent-Reason-API.patch => 0217-InventoryCloseEvent-Reason-API.patch} (100%)
 rename patches/server/{0217-Vex-get-setSummoner-API.patch => 0218-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename patches/server/{0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (93%)
 rename patches/server/{0220-add-more-information-to-Entity.toString.patch => 0221-add-more-information-to-Entity.toString.patch} (100%)
 rename patches/server/{0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename patches/server/{0222-EnderDragon-Events.patch => 0223-EnderDragon-Events.patch} (100%)
 rename patches/server/{0223-PlayerElytraBoostEvent.patch => 0224-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0224-PlayerLaunchProjectileEvent.patch => 0225-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0225-Improve-BlockPosition-inlining.patch => 0226-Improve-BlockPosition-inlining.patch} (100%)
 rename patches/server/{0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename patches/server/{0227-Vanished-players-don-t-have-rights.patch => 0228-Vanished-players-don-t-have-rights.patch} (100%)
 rename patches/server/{0228-Allow-disabling-armour-stand-ticking.patch => 0229-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/server/{0229-SkeletonHorse-Additions.patch => 0230-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0230-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0231-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0231-Implement-Expanded-ArmorStand-API.patch => 0232-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0232-AnvilDamageEvent.patch => 0233-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0233-Add-TNTPrimeEvent.patch => 0234-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0234-Break-up-and-make-tab-spam-limits-configurable.patch => 0235-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename patches/server/{0235-Fix-NBT-type-issues.patch => 0236-Fix-NBT-type-issues.patch} (100%)
 rename patches/server/{0236-Remove-unnecessary-itemmeta-handling.patch => 0237-Remove-unnecessary-itemmeta-handling.patch} (100%)
 rename patches/server/{0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename patches/server/{0238-Add-Early-Warning-Feature-to-WatchDog.patch => 0239-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename patches/server/{0239-Use-ConcurrentHashMap-in-JsonList.patch => 0240-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0240-Use-a-Queue-for-Queueing-Commands.patch => 0241-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0242-Optimize-BlockPosition-helper-methods.patch => 0243-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch => 0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch} (100%)
 rename patches/server/{0244-Slime-Pathfinder-Events.patch => 0245-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0245-Configurable-speed-for-water-flowing-over-lava.patch => 0246-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0246-Optimize-CraftBlockData-Creation.patch => 0247-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0247-Optimize-MappedRegistry.patch => 0248-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0248-Add-PhantomPreSpawnEvent.patch => 0249-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0249-Add-More-Creeper-API.patch => 0250-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0250-Inventory-removeItemAnySlot.patch => 0251-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0252-Add-ray-tracing-methods-to-LivingEntity.patch => 0253-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0253-Expose-attack-cooldown-methods-for-Player.patch => 0254-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0254-Improve-death-events.patch => 0255-Improve-death-events.patch} (100%)
 rename patches/server/{0255-Allow-chests-to-be-placed-with-NBT-data.patch => 0256-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0256-Mob-Pathfinding-API.patch => 0257-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0258-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0259-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0260-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0261-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0261-Implement-furnace-cook-speed-multiplier-API.patch => 0262-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0262-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0263-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0263-Honor-EntityAgeable.ageLock.patch => 0264-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0264-Configurable-connection-throttle-kick-message.patch => 0265-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0265-Hook-into-CB-plugin-rewrites.patch => 0266-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0266-PreSpawnerSpawnEvent.patch => 0267-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0267-Add-LivingEntity-getTargetEntity.patch => 0268-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/server/{0268-Add-sun-related-API.patch => 0269-Add-sun-related-API.patch} (100%)
 rename patches/server/{0269-Turtle-API.patch => 0270-Turtle-API.patch} (100%)
 rename patches/server/{0270-Call-player-spectator-target-events-and-improve-impl.patch => 0271-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0272-Add-more-Witch-API.patch => 0273-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0273-Check-Drowned-for-Villager-Aggression-Config.patch => 0274-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0274-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0275-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename patches/server/{0275-Reset-players-airTicks-on-respawn.patch => 0276-Reset-players-airTicks-on-respawn.patch} (100%)
 rename patches/server/{0276-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0278-Optimize-World-Time-Updates.patch => 0279-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0279-Restore-custom-InventoryHolder-support.patch => 0280-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0280-Use-Vanilla-Minecart-Speeds.patch => 0281-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0281-Fix-SpongeAbsortEvent-handling.patch => 0282-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0282-Don-t-allow-digging-into-unloaded-chunks.patch => 0283-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename patches/server/{0283-Make-the-default-permission-message-configurable.patch => 0284-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/server/{0284-Prevent-rayTrace-from-loading-chunks.patch => 0285-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0285-Handle-Large-Packets-disconnecting-client.patch => 0286-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0286-force-entity-dismount-during-teleportation.patch => 0287-force-entity-dismount-during-teleportation.patch} (100%)
 rename patches/server/{0287-Add-more-Zombie-API.patch => 0288-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0288-Book-Size-Limits.patch => 0289-Book-Size-Limits.patch} (100%)
 rename patches/server/{0289-Add-PlayerConnectionCloseEvent.patch => 0290-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0290-Prevent-Enderman-from-loading-chunks.patch => 0291-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0291-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/server/{0292-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0293-Block-Entity-remove-from-being-called-on-Players.patch => 0294-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0294-BlockDestroyEvent.patch => 0295-BlockDestroyEvent.patch} (100%)
 rename patches/server/{0295-Async-command-map-building.patch => 0296-Async-command-map-building.patch} (100%)
 rename patches/server/{0296-Implement-Brigadier-Mojang-API.patch => 0297-Implement-Brigadier-Mojang-API.patch} (99%)
 rename patches/server/{0297-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0298-Limit-Client-Sign-length-more.patch => 0299-Limit-Client-Sign-length-more.patch} (100%)
 rename patches/server/{0299-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0301-Handle-Oversized-Tile-Entities-in-chunks.patch => 0302-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0302-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0303-Entity-getEntitySpawnReason.patch => 0304-Entity-getEntitySpawnReason.patch} (100%)
 rename patches/server/{0304-Fire-event-on-GS4-query.patch => 0305-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0305-Implement-PlayerPostRespawnEvent.patch => 0306-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0306-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0307-Server-Tick-Events.patch => 0308-Server-Tick-Events.patch} (100%)
 rename patches/server/{0308-PlayerDeathEvent-getItemsToKeep.patch => 0309-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/server/{0309-Optimize-Captured-TileEntity-Lookup.patch => 0310-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename patches/server/{0310-Add-Heightmap-API.patch => 0311-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0311-Mob-Spawner-API-Enhancements.patch => 0312-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0312-Fix-CB-call-to-changed-postToMainThread-method.patch => 0313-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename patches/server/{0313-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0314-Implement-CraftBlockSoundGroup.patch => 0315-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0315-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename patches/server/{0316-Allow-Saving-of-Oversized-Chunks.patch => 0317-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0317-Expose-the-internal-current-tick.patch => 0318-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0318-Fix-World-isChunkGenerated-calls.patch => 0319-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0319-Show-blockstate-location-if-we-failed-to-read-it.patch => 0320-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0320-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0321-Configurable-projectile-relative-velocity.patch => 0322-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0322-offset-item-frame-ticking.patch => 0323-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0323-Fix-MC-158900.patch => 0324-Fix-MC-158900.patch} (100%)
 rename patches/server/{0324-Prevent-consuming-the-wrong-itemstack.patch => 0325-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0325-Dont-send-unnecessary-sign-update.patch => 0326-Dont-send-unnecessary-sign-update.patch} (100%)
 rename patches/server/{0326-Add-option-to-disable-pillager-patrols.patch => 0327-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0327-Flat-bedrock-generator-settings.patch => 0328-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0328-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0329-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0330-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0330-Duplicate-UUID-Resolve-Option.patch => 0331-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0331-Optimize-Hoppers.patch => 0332-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0332-PlayerDeathEvent-shouldDropExperience.patch => 0333-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/server/{0333-Prevent-bees-loading-chunks-checking-hive-position.patch => 0334-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0335-Guard-against-serializing-mismatching-chunk-coordina.patch => 0336-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0336-Optimise-EntityGetter-getPlayerByUUID.patch => 0337-Optimise-EntityGetter-getPlayerByUUID.patch} (100%)
 rename patches/server/{0337-Fix-items-not-falling-correctly.patch => 0338-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0338-Lag-compensate-eating.patch => 0339-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0339-Optimize-call-to-getFluid-for-explosions.patch => 0340-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0341-Entity-Activation-Range-2.0.patch => 0342-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0342-Increase-Light-Queue-Size.patch => 0343-Increase-Light-Queue-Size.patch} (100%)
 rename patches/server/{0343-Anti-Xray.patch => 0344-Anti-Xray.patch} (100%)
 rename patches/server/{0344-Implement-alternative-item-despawn-rate.patch => 0345-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0345-Tracking-Range-Improvements.patch => 0346-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0346-Fix-items-vanishing-through-end-portal.patch => 0347-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename patches/server/{0347-implement-optional-per-player-mob-spawns.patch => 0348-implement-optional-per-player-mob-spawns.patch} (100%)
 rename patches/server/{0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0349-Improve-Block-breakNaturally-API.patch => 0350-Improve-Block-breakNaturally-API.patch} (100%)
 rename patches/server/{0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0351-Add-debug-for-sync-chunk-loads.patch => 0352-Add-debug-for-sync-chunk-loads.patch} (100%)
 rename patches/server/{0352-Remove-garbage-Java-version-check.patch => 0353-Remove-garbage-Java-version-check.patch} (100%)
 rename patches/server/{0353-Add-ThrownEggHatchEvent.patch => 0354-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0354-Entity-Jump-API.patch => 0355-Entity-Jump-API.patch} (100%)
 rename patches/server/{0355-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0356-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0356-Make-the-GUI-graph-fancier.patch => 0357-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0357-add-hand-to-BlockMultiPlaceEvent.patch => 0358-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0358-Validate-tripwire-hook-placement-before-update.patch => 0359-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0360-Configurable-chance-of-villager-zombie-infection.patch => 0361-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0361-Optimise-Chunk-getFluid.patch => 0362-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0362-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0363-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0363-Add-tick-times-API-and-mspt-command.patch => 0364-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0364-Expose-MinecraftServer-isRunning.patch => 0365-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0365-Add-Raw-Byte-ItemStack-Serialization.patch => 0366-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0366-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0367-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename patches/server/{0370-Don-t-tick-dead-players.patch => 0371-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0371-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0372-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0372-Optimize-Collision-to-not-load-chunks.patch => 0373-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0373-Don-t-move-existing-players-to-world-spawn.patch => 0374-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0375-Improved-Watchdog-Support.patch => 0376-Improved-Watchdog-Support.patch} (100%)
 rename patches/server/{0376-Optimize-Pathfinding.patch => 0377-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0377-Reduce-Either-Optional-allocation.patch => 0378-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0378-Reduce-memory-footprint-of-NBTTagCompound.patch => 0379-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0379-Prevent-opening-inventories-when-frozen.patch => 0380-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0380-Don-t-run-entity-collision-code-if-not-needed.patch => 0381-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0381-Implement-Player-Client-Options-API.patch => 0382-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0385-Add-PlayerAttackEntityCooldownResetEvent.patch => 0386-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0386-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0387-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0387-Add-phantom-creative-and-insomniac-controls.patch => 0388-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0389-Villager-Restocks-API.patch => 0390-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0390-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0391-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0391-Expose-game-version.patch => 0392-Expose-game-version.patch} (100%)
 rename patches/server/{0392-Optimize-Voxel-Shape-Merging.patch => 0393-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0394-misc-debugging-dumps.patch => 0395-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0395-Prevent-teleporting-dead-entities.patch => 0396-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0397-Implement-Mob-Goal-API.patch => 0398-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0398-Add-villager-reputation-API.patch => 0399-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0399-Option-for-maximum-exp-value-when-merging-orbs.patch => 0400-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0400-ExperienceOrbMergeEvent.patch => 0401-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0401-Fix-PotionEffect-ignores-icon-flag.patch => 0402-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0402-Optimize-brigadier-child-sorting-performance.patch => 0403-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0403-Potential-bed-API.patch => 0404-Potential-bed-API.patch} (100%)
 rename patches/server/{0404-Wait-for-Async-Tasks-during-shutdown.patch => 0405-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0407-Reduce-MutableInt-allocations-from-light-engine.patch => 0408-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0409-Ensure-safe-gateway-teleport.patch => 0410-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0410-Add-option-for-console-having-all-permissions.patch => 0411-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (100%)
 rename patches/server/{0412-Use-distance-map-to-optimise-entity-tracker.patch => 0413-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{0413-Fix-villager-trading-demand-MC-163962.patch => 0414-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0414-Maps-shouldn-t-load-chunks.patch => 0415-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0417-Fix-piston-physics-inconsistency-MC-188840.patch => 0418-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0418-Fix-sand-duping.patch => 0419-Fix-sand-duping.patch} (100%)
 rename patches/server/{0419-Fix-missing-chunks-due-to-integer-overflow.patch => 0420-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0420-Prevent-position-desync-in-playerconnection-causing-.patch => 0421-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0421-Inventory-getHolder-method-without-block-snapshot.patch => 0422-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0422-Improve-Arrow-API.patch => 0423-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0423-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0424-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0424-Hide-sync-chunk-writes-behind-flag.patch => 0425-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0425-Add-permission-for-command-blocks.patch => 0426-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0426-Ensure-Entity-AABB-s-are-never-invalid.patch => 0427-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename patches/server/{0428-Paper-dumpitem-command.patch => 0429-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0429-Improve-Legacy-Component-serialization-size.patch => 0430-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0430-Optimize-Bit-Operations-by-inlining.patch => 0431-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0432-incremental-chunk-and-player-saving.patch => 0433-incremental-chunk-and-player-saving.patch} (100%)
 rename patches/server/{0433-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0434-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0434-Support-old-UUID-format-for-NBT.patch => 0435-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0435-Clean-up-duplicated-GameProfile-Properties.patch => 0436-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0436-Convert-legacy-attributes-in-Item-Meta.patch => 0437-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0437-Remove-some-streams-from-structures.patch => 0438-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0438-Remove-streams-from-classes-related-villager-gossip.patch => 0439-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0439-Support-components-in-ItemMeta.patch => 0440-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0440-Improve-fix-EntityTargetLivingEntityEvent.patch => 0441-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0441-Add-entity-liquid-API.patch => 0442-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0442-Update-itemstack-legacy-name-and-lore.patch => 0443-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0443-Spawn-player-in-correct-world-on-login.patch => 0444-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0444-Add-PrepareResultEvent.patch => 0445-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0446-Optimize-NetworkManager-Exception-Handling.patch => 0447-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0447-Optimize-the-advancement-data-player-iteration-to-be.patch => 0448-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0448-Fix-arrows-never-despawning-MC-125757.patch => 0449-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0449-Thread-Safe-Vanilla-Command-permission-checking.patch => 0450-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0450-Fix-SPIGOT-5989.patch => 0451-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0451-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0452-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0453-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0454-Fix-some-rails-connecting-improperly.patch => 0455-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0455-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0456-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0457-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0457-Brand-support.patch => 0458-Brand-support.patch} (100%)
 rename patches/server/{0458-Add-setMaxPlayers-API.patch => 0459-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0459-Add-playPickupItemAnimation-to-LivingEntity.patch => 0460-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0460-Don-t-require-FACING-data.patch => 0461-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0462-Add-moon-phase-API.patch => 0463-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0463-Prevent-headless-pistons-from-being-created.patch => 0464-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0464-Add-BellRingEvent.patch => 0465-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0465-Add-zombie-targets-turtle-egg-config.patch => 0466-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0466-Buffer-joins-to-world.patch => 0467-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0467-Eigencraft-redstone-implementation.patch => 0468-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0468-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0469-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0469-PortalCreateEvent-needs-to-know-its-entity.patch => 0470-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0470-Fix-CraftTeam-null-check.patch => 0471-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0471-Add-more-Evoker-API.patch => 0472-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0472-Add-methods-to-get-translation-keys.patch => 0473-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0473-Create-HoverEvent-from-ItemStack-Entity.patch => 0474-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0474-Cache-block-data-strings.patch => 0475-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0476-Add-additional-open-container-api-to-HumanEntity.patch => 0477-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0477-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0478-Extend-block-drop-capture-to-capture-all-items-added.patch => 0479-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0479-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0480-Lazily-track-plugin-scoreboards-by-default.patch => 0481-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0481-Entity-isTicking.patch => 0482-Entity-isTicking.patch} (100%)
 rename patches/server/{0482-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0483-Fix-Concurrency-issue-in-ShufflingList.patch => 0484-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0484-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0485-Fix-for-large-move-vectors-crashing-server.patch => 0486-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0486-Optimise-getType-calls.patch => 0487-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0487-Villager-resetOffers.patch => 0488-Villager-resetOffers.patch} (100%)
 rename patches/server/{0488-Retain-block-place-order-when-capturing-blockstates.patch => 0489-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0489-Reduce-blockpos-allocation-from-pathfinding.patch => 0490-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0490-Fix-item-locations-dropped-from-campfires.patch => 0491-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0491-Player-elytra-boost-API.patch => 0492-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0492-Fixed-TileEntityBell-memory-leak.patch => 0493-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0494-Add-getOfflinePlayerIfCached-String.patch => 0495-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0495-Add-ignore-discounts-API.patch => 0496-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0496-Toggle-for-removing-existing-dragon.patch => 0497-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0497-Fix-client-lag-on-advancement-loading.patch => 0498-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0498-Item-no-age-no-player-pickup.patch => 0499-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0499-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0500-Beacon-API-custom-effect-ranges.patch => 0501-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0501-Add-API-for-quit-reason.patch => 0502-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0502-Add-Wandering-Trader-spawn-rate-config-options.patch => 0503-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0503-Expose-world-spawn-angle.patch => 0504-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0504-Add-Destroy-Speed-API.patch => 0505-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0505-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0506-Add-LivingEntity-clearActiveItem.patch => 0507-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0507-Add-PlayerItemCooldownEvent.patch => 0508-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0508-Significantly-improve-performance-of-the-end-generat.patch => 0509-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0509-More-lightning-API.patch => 0510-More-lightning-API.patch} (100%)
 rename patches/server/{0510-Climbing-should-not-bypass-cramming-gamerule.patch => 0511-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0511-Added-missing-default-perms-for-commands.patch => 0512-Added-missing-default-perms-for-commands.patch} (89%)
 rename patches/server/{0512-Add-PlayerShearBlockEvent.patch => 0513-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0513-Fix-curing-zombie-villager-discount-exploit.patch => 0514-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0514-Limit-recipe-packets.patch => 0515-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0515-Fix-CraftSound-backwards-compatibility.patch => 0516-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0516-Player-Chunk-Load-Unload-Events.patch => 0517-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0517-Optimize-Dynamic-get-Missing-Keys.patch => 0518-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0518-Expose-LivingEntity-hurt-direction.patch => 0519-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0519-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0520-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0522-Implement-TargetHitEvent.patch => 0523-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0523-MC-4-Fix-item-position-desync.patch => 0524-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0524-Additional-Block-Material-API-s.patch => 0525-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0525-Fix-harming-potion-dupe.patch => 0526-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0526-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0527-Cache-burn-durations.patch => 0528-Cache-burn-durations.patch} (100%)
 rename patches/server/{0528-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0529-Fix-Not-a-string-Map-Conversion-spam.patch => 0530-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0530-Implement-PlayerFlowerPotManipulateEvent.patch => 0531-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0531-Fix-interact-event-not-being-called-in-adventure.patch => 0532-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0532-Zombie-API-breaking-doors.patch => 0533-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0533-Fix-nerfed-slime-when-splitting.patch => 0534-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0534-Add-EntityLoadCrossbowEvent.patch => 0535-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0535-Added-WorldGameRuleChangeEvent.patch => 0536-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0536-Added-ServerResourcesReloadedEvent.patch => 0537-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0537-Added-world-settings-for-mobs-picking-up-loot.patch => 0538-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0538-Implemented-BlockFailedDispenseEvent.patch => 0539-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0539-Added-PlayerLecternPageChangeEvent.patch => 0540-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0540-Added-PlayerLoomPatternSelectEvent.patch => 0541-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0541-Configurable-door-breaking-difficulty.patch => 0542-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0542-Empty-commands-shall-not-be-dispatched.patch => 0543-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0543-Implement-API-to-expose-exact-interaction-point.patch => 0544-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0544-Remove-stale-POIs.patch => 0545-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0545-Fix-villager-boat-exploit.patch => 0546-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0546-Add-sendOpLevel-API.patch => 0547-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0547-Add-PaperRegistry.patch => 0548-Add-PaperRegistry.patch} (99%)
 rename patches/server/{0548-Add-StructuresLocateEvent.patch => 0549-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0549-Collision-option-for-requiring-a-player-participant.patch => 0550-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0551-Return-chat-component-with-empty-text-instead-of-thr.patch => 0552-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0552-Make-schedule-command-per-world.patch => 0553-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0553-Configurable-max-leash-distance.patch => 0554-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0554-Implement-BlockPreDispenseEvent.patch => 0555-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0555-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0556-Add-toggle-for-always-placing-the-dragon-egg.patch => 0557-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0557-Added-PlayerStonecutterRecipeSelectEvent.patch => 0558-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0558-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0559-Reset-shield-blocking-on-dimension-change.patch => 0560-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0560-add-DragonEggFormEvent.patch => 0561-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0561-EntityMoveEvent.patch => 0562-EntityMoveEvent.patch} (100%)
 rename patches/server/{0562-added-option-to-disable-pathfinding-updates-on-block.patch => 0563-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0563-Inline-shift-direction-fields.patch => 0564-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0564-Allow-adding-items-to-BlockDropItemEvent.patch => 0565-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0565-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0566-living-entity-allow-attribute-registration.patch => 0567-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0567-fix-dead-slime-setSize-invincibility.patch => 0568-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0568-Merchant-getRecipes-should-return-an-immutable-list.patch => 0569-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0569-Add-support-for-hex-color-codes-in-console.patch => 0570-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0570-Expose-Tracked-Players.patch => 0571-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0571-Remove-streams-from-SensorNearest.patch => 0572-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0572-Throw-proper-exception-on-empty-JsonList-file.patch => 0573-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0573-Improve-ServerGUI.patch => 0574-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0574-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0575-fix-converting-txt-to-json-file.patch => 0576-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0576-Add-worldborder-events.patch => 0577-Add-worldborder-events.patch} (100%)
 rename patches/server/{0577-added-PlayerNameEntityEvent.patch => 0578-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0578-Prevent-grindstones-from-overstacking-items.patch => 0579-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0579-Add-recipe-to-cook-events.patch => 0580-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0580-Add-Block-isValidTool.patch => 0581-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0581-Allow-using-signs-inside-spawn-protection.patch => 0582-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0582-Expand-world-key-API.patch => 0583-Expand-world-key-API.patch} (100%)
 rename patches/server/{0583-Add-fast-alternative-constructor-for-Rotations.patch => 0584-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0584-Item-Rarity-API.patch => 0585-Item-Rarity-API.patch} (100%)
 rename patches/server/{0585-copy-TESign-isEditable-from-snapshots.patch => 0586-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0586-Drop-carried-item-when-player-has-disconnected.patch => 0587-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0587-forced-whitelist-use-configurable-kick-message.patch => 0588-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0589-Entity-load-save-limit-per-chunk.patch => 0590-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0590-Expose-protocol-version.patch => 0591-Expose-protocol-version.patch} (100%)
 rename patches/server/{0591-Enhance-console-tab-completions-for-brigadier-comman.patch => 0592-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0592-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0593-Add-bypass-host-check.patch => 0594-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0594-Set-area-affect-cloud-rotation.patch => 0595-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0595-add-isDeeplySleeping-to-HumanEntity.patch => 0596-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0596-add-consumeFuel-to-FurnaceBurnEvent.patch => 0597-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0597-add-get-set-drop-chance-to-EntityEquipment.patch => 0598-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0598-fix-PigZombieAngerEvent-cancellation.patch => 0599-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0599-fix-PlayerItemHeldEvent-firing-twice.patch => 0600-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0600-Added-PlayerDeepSleepEvent.patch => 0601-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0601-More-World-API.patch => 0602-More-World-API.patch} (100%)
 rename patches/server/{0602-Added-PlayerBedFailEnterEvent.patch => 0603-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0603-Implement-methods-to-convert-between-Component-and-B.patch => 0604-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0604-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0605-Introduce-beacon-activation-deactivation-events.patch => 0606-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0606-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0607-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0607-Add-Channel-initialization-listeners.patch => 0608-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0608-Send-empty-commands-if-tab-completion-is-disabled.patch => 0609-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0609-Add-more-WanderingTrader-API.patch => 0610-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0610-Add-EntityBlockStorage-clearEntities.patch => 0611-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0611-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0612-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0613-Inventory-close.patch => 0614-Inventory-close.patch} (100%)
 rename patches/server/{0614-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0615-Fix-CraftPotionBrewer-cache.patch => 0616-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0616-Add-basic-Datapack-API.patch => 0617-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0617-Add-environment-variable-to-disable-server-gui.patch => 0618-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0618-additions-to-PlayerGameModeChangeEvent.patch => 0619-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0619-ItemStack-repair-check-API.patch => 0620-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0620-More-Enchantment-API.patch => 0621-More-Enchantment-API.patch} (100%)
 rename patches/server/{0621-Move-range-check-for-block-placing-up.patch => 0622-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0622-Fix-and-optimise-world-force-upgrading.patch => 0623-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0623-Add-Mob-lookAt-API.patch => 0624-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0624-Add-Unix-domain-socket-support.patch => 0625-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0625-Add-EntityInsideBlockEvent.patch => 0626-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0626-Attributes-API-for-item-defaults.patch => 0627-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0627-Add-cause-to-Weather-ThunderChangeEvents.patch => 0628-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0628-More-Lidded-Block-API.patch => 0629-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0629-Limit-item-frame-cursors-on-maps.patch => 0630-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0630-Add-PlayerKickEvent-causes.patch => 0631-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0631-Add-PufferFishStateChangeEvent.patch => 0632-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0632-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0633-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0634-Add-option-to-fix-items-merging-through-walls.patch => 0635-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0635-Add-BellRevealRaiderEvent.patch => 0636-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0636-Fix-invulnerable-end-crystals.patch => 0637-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0637-Add-ElderGuardianAppearanceEvent.patch => 0638-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0638-Fix-dangerous-end-portal-logic.patch => 0639-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0639-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0640-Make-item-validations-configurable.patch => 0641-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0641-Line-Of-Sight-Changes.patch => 0642-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0642-add-per-world-spawn-limits.patch => 0643-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0643-Fix-potions-splash-events.patch => 0644-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0644-Add-more-LimitedRegion-API.patch => 0645-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0645-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0646-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0646-Missing-Entity-Behavior-API.patch => 0647-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0648-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0649-Use-getChunkIfLoadedImmediately-in-places.patch => 0650-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0650-Fix-commands-from-signs-not-firing-command-events.patch => 0651-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0651-Adds-PlayerArmSwingEvent.patch => 0652-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0652-Fixes-kick-event-leave-message-not-being-sent.patch => 0653-Fixes-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0653-Add-config-for-mobs-immune-to-default-effects.patch => 0654-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0654-Fix-incorrect-message-for-outdated-client.patch => 0655-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0655-Don-t-apply-cramming-damage-to-players.patch => 0656-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0656-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0657-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0657-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0658-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0658-Stinger-API.patch => 0659-Stinger-API.patch} (100%)
 rename patches/server/{0659-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0660-Add-System.out-err-catcher.patch => 0661-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0661-Fix-test-not-bootstrapping.patch => 0662-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0662-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0663-Improve-boat-collision-performance.patch => 0664-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0664-Prevent-AFK-kick-while-watching-end-credits.patch => 0665-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0665-Allow-skipping-writing-of-comments-to-server.propert.patch => 0666-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0666-Add-PlayerSetSpawnEvent.patch => 0667-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0667-Make-hoppers-respect-inventory-max-stack-size.patch => 0668-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0668-Optimize-entity-tracker-passenger-checks.patch => 0669-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0669-Config-option-for-Piglins-guarding-chests.patch => 0670-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0670-Added-EntityDamageItemEvent.patch => 0671-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0671-Optimize-indirect-passenger-iteration.patch => 0672-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0672-Fix-block-drops-position-losing-precision-millions-o.patch => 0673-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0673-Configurable-item-frame-map-cursor-update-interval.patch => 0674-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0674-Make-EntityUnleashEvent-cancellable.patch => 0675-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0675-Clear-bucket-NBT-after-dispense.patch => 0676-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0676-Change-EnderEye-target-without-changing-other-things.patch => 0677-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0677-Add-BlockBreakBlockEvent.patch => 0678-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0678-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0679-More-CommandBlock-API.patch => 0680-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0680-Add-missing-team-sidebar-display-slots.patch => 0681-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0681-Add-back-EntityPortalExitEvent.patch => 0682-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0682-Add-methods-to-find-targets-for-lightning-strikes.patch => 0683-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0683-Get-entity-default-attributes.patch => 0684-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0684-Left-handed-API.patch => 0685-Left-handed-API.patch} (100%)
 rename patches/server/{0685-Add-more-advancement-API.patch => 0686-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0686-Add-ItemFactory-getSpawnEgg-API.patch => 0687-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0687-Add-critical-damage-API.patch => 0688-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0688-Fix-issues-with-mob-conversion.patch => 0689-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0689-Add-isCollidable-methods-to-various-places.patch => 0690-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0690-Goat-ram-API.patch => 0691-Goat-ram-API.patch} (100%)
 rename patches/server/{0691-Add-API-for-resetting-a-single-score.patch => 0692-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0692-Add-Raw-Byte-Entity-Serialization.patch => 0693-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0693-Vanilla-command-permission-fixes.patch => 0694-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0695-Fix-GameProfileCache-concurrency.patch => 0696-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0696-Log-when-the-async-catcher-is-tripped.patch => 0697-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0697-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0698-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0698-Sanitize-ResourceLocation-error-logging.patch => 0699-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0699-Allow-controlled-flushing-for-network-manager.patch => 0700-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0700-Optimise-general-POI-access.patch => 0701-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0701-Optimise-chunk-tick-iteration.patch => 0702-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0702-Execute-chunk-tasks-mid-tick.patch => 0703-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0703-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0704-Custom-table-implementation-for-blockstate-state-loo.patch => 0705-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0705-Detail-more-information-in-watchdog-dumps.patch => 0706-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0706-Manually-inline-methods-in-BlockPosition.patch => 0707-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0707-Distance-manager-tick-timings.patch => 0708-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0708-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0709-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0709-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0710-Add-packet-limiter-config.patch => 0711-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0711-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0712-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0713-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0713-Don-t-lookup-fluid-state-when-raytracing.patch => 0714-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0714-Time-scoreboard-search.patch => 0715-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0715-Send-full-pos-packets-for-hard-colliding-entities.patch => 0716-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0716-Do-not-run-raytrace-logic-for-AIR.patch => 0717-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0717-Oprimise-map-impl-for-tracked-players.patch => 0718-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0718-Optimise-BlockSoil-nearby-water-lookup.patch => 0719-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0719-Optimise-random-block-ticking.patch => 0720-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0720-Optimise-non-flush-packet-sending.patch => 0721-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0721-Optimise-nearby-player-lookups.patch => 0722-Optimise-nearby-player-lookups.patch} (100%)
 rename patches/server/{0722-Remove-streams-for-villager-AI.patch => 0723-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0723-Use-Velocity-compression-and-cipher-natives.patch => 0724-Use-Velocity-compression-and-cipher-natives.patch} (99%)
 rename patches/server/{0724-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0725-Async-catch-modifications-to-critical-entity-state.patch => 0726-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0726-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0727-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0727-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0728-Check-requirement-before-suggesting-root-nodes.patch => 0729-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0730-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0731-Ensure-valid-vehicle-status.patch => 0732-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0732-Prevent-softlocked-end-exit-portal-generation.patch => 0733-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0733-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0734-Don-t-log-debug-logging-being-disabled.patch => 0735-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0735-fix-various-menus-with-empty-level-accesses.patch => 0736-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0736-Preserve-overstacked-loot.patch => 0737-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0737-Update-head-rotation-in-missing-places.patch => 0738-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0738-prevent-unintended-light-block-manipulation.patch => 0739-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0739-Fix-CraftCriteria-defaults-map.patch => 0740-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0740-Fix-upstreams-block-state-factories.patch => 0741-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0741-Add-config-option-for-logging-player-ip-addresses.patch => 0742-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0742-Configurable-feature-seeds.patch => 0743-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0743-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0744-Add-root-admin-user-detection.patch => 0745-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0745-Always-allow-item-changing-in-Fireball.patch => 0746-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0746-don-t-attempt-to-teleport-dead-entities.patch => 0747-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0747-Prevent-excessive-velocity-through-repeated-crits.patch => 0748-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0748-Remove-client-side-code-using-deprecated-for-removal.patch => 0749-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0749-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0750-Fix-removing-recipes-from-RecipeIterator.patch => 0751-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0751-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0752-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0752-Hide-unnecessary-itemmeta-from-clients.patch => 0753-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0753-Fix-Spigot-growth-modifiers.patch => 0754-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0754-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0755-Add-PlayerItemFrameChangeEvent.patch => 0756-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0756-Add-player-health-update-API.patch => 0757-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0757-Optimize-HashMapPalette.patch => 0758-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0758-Allow-delegation-to-vanilla-chunk-gen.patch => 0759-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0760-Optimise-collision-checking-in-player-move-packet-ha.patch => 0761-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0761-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0762-Add-more-Campfire-API.patch => 0763-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0763-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0764-Fix-tripwire-state-inconsistency.patch => 0765-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0765-Forward-CraftEntity-in-teleport-command.patch => 0766-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0766-Improve-scoreboard-entries.patch => 0767-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0767-Entity-powdered-snow-API.patch => 0768-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0768-Add-API-for-item-entity-health.patch => 0769-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0769-Fix-entity-type-tags-suggestions-in-selectors.patch => 0770-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0770-Configurable-max-block-light-for-monster-spawning.patch => 0771-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0771-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0772-Load-effect-amplifiers-greater-than-127-correctly.patch => 0773-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0773-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0774-Fix-bees-aging-inside-hives.patch => 0775-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0775-Bucketable-API.patch => 0776-Bucketable-API.patch} (100%)
 rename patches/server/{0776-Validate-usernames.patch => 0777-Validate-usernames.patch} (100%)
 rename patches/server/{0777-Make-water-animal-spawn-height-configurable.patch => 0778-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0778-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0779-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0780-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0780-Add-new-overload-to-PersistentDataContainer-has.patch => 0781-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0781-Multiple-Entries-with-Scoreboards.patch => 0782-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0782-Reset-placed-block-on-exception.patch => 0783-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0783-Add-configurable-height-for-slime-spawn.patch => 0784-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0784-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0785-Fix-xp-reward-for-baby-zombies.patch => 0786-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0786-Kick-on-main-for-illegal-chat.patch => 0787-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0787-Multi-Block-Change-API-Implementation.patch => 0788-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0788-Fix-NotePlayEvent.patch => 0789-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0789-Freeze-Tick-Lock-API.patch => 0790-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0790-Dolphin-API.patch => 0791-Dolphin-API.patch} (100%)
 rename patches/server/{0791-More-PotionEffectType-API.patch => 0792-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0792-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0793-API-for-creating-command-sender-which-forwards-feedb.patch => 0794-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0794-Add-missing-structure-set-seed-configs.patch => 0795-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0795-Implement-regenerateChunk.patch => 0796-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0796-Fix-cancelled-powdered-snow-bucket-placement.patch => 0797-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0797-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0798-Add-GameEvent-tags.patch => 0799-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0799-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0800-Furnace-RecipesUsed-API.patch => 0801-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0801-Configurable-sculk-sensor-listener-range.patch => 0802-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0802-Add-missing-block-data-mins-and-maxes.patch => 0803-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0803-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0804-Put-world-into-worldlist-before-initing-the-world.patch => 0805-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0805-Fix-Entity-Position-Desync.patch => 0806-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0806-Custom-Potion-Mixes.patch => 0807-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0807-Fix-Fluid-tags-isTagged-method.patch => 0808-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0808-Force-close-world-loading-screen.patch => 0809-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0809-Fix-falling-block-spawn-methods.patch => 0810-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0810-Expose-furnace-minecart-push-values.patch => 0811-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0812-More-Projectile-API.patch => 0813-More-Projectile-API.patch} (100%)
 rename patches/server/{0813-Fix-swamp-hut-cat-generation-deadlock.patch => 0814-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0815-Implement-getComputedBiome-API.patch => 0816-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0816-Make-some-itemstacks-nonnull.patch => 0817-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0817-Implement-enchantWithLevels-API.patch => 0818-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0818-Fix-saving-in-unloadWorld.patch => 0819-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0819-Buffer-OOB-setBlock-calls.patch => 0820-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0820-Add-TameableDeathMessageEvent.patch => 0821-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0822-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0823-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0823-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0824-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0824-Guard-against-invalid-entity-positions.patch => 0825-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0825-cache-resource-keys.patch => 0826-cache-resource-keys.patch} (100%)
 rename patches/server/{0826-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0827-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0829-Prevent-tile-entity-copies-loading-chunks.patch => 0830-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0830-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0831-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0832-Pass-ServerLevel-for-gamerule-callbacks.patch => 0833-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0834-WorldCreator-keepSpawnLoaded.patch => 0835-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0838-Fire-CauldronLevelChange-on-initial-fill.patch => 0839-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0839-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0840-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0840-Add-PlayerStopUsingItemEvent.patch => 0841-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0841-FallingBlock-auto-expire-setting.patch => 0842-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0842-Don-t-tick-markers.patch => 0843-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0843-Do-not-accept-invalid-client-settings.patch => 0844-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0844-Add-support-for-Proxy-Protocol.patch => 0845-Add-support-for-Proxy-Protocol.patch} (97%)
 rename patches/server/{0845-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0846-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0847-Sanitize-Sent-BlockEntity-NBT.patch => 0848-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0848-Prevent-entity-loading-causing-async-lookups.patch => 0849-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0849-Disable-component-selector-resolving-in-books-by-def.patch => 0850-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0850-Throw-exception-on-world-create-while-being-ticked.patch => 0851-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0851-Add-Alternate-Current-redstone-implementation.patch => 0852-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0852-Dont-resent-entity-on-art-update.patch => 0853-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0853-Add-WardenAngerChangeEvent.patch => 0854-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0854-Add-option-for-strict-advancement-dimension-checks.patch => 0855-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0855-Add-missing-important-BlockStateListPopulator-method.patch => 0856-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0856-Nameable-Banner-API.patch => 0857-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0857-Don-t-broadcast-messages-to-command-blocks.patch => 0858-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0858-Prevent-empty-items-from-being-added-to-world.patch => 0859-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0860-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0861-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0861-Add-Player-getFishHook.patch => 0862-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0863-Add-various-missing-EntityDropItemEvent-calls.patch => 0864-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0864-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0865-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0865-Fix-Bee-flower-NPE.patch => 0866-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0867-More-Teleport-API.patch => 0868-More-Teleport-API.patch} (100%)
 rename patches/server/{0868-Add-EntityPortalReadyEvent.patch => 0869-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0869-Don-t-use-level-random-in-entity-constructors.patch => 0870-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0870-Send-block-entities-after-destroy-prediction.patch => 0871-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0871-Warn-on-plugins-accessing-faraway-chunks.patch => 0872-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0872-Custom-Chat-Completion-Suggestions-API.patch => 0873-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0873-Add-missing-BlockFadeEvents.patch => 0874-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0874-Collision-API.patch => 0875-Collision-API.patch} (100%)
 rename patches/server/{0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0876-Remove-invalid-signature-login-stacktrace.patch => 0877-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (100%)
 rename patches/server/{0878-Block-Ticking-API.patch => 0879-Block-Ticking-API.patch} (100%)
 rename patches/server/{0879-Add-Velocity-IP-Forwarding-Support.patch => 0880-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0881-Add-NamespacedKey-biome-methods.patch => 0882-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0882-Fix-plugin-loggers-on-server-shutdown.patch => 0883-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0883-Workaround-for-client-lag-spikes-MC-162253.patch => 0884-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0884-Stop-large-look-changes-from-crashing-the-server.patch => 0885-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0887-Fire-EntityChangeBlockEvent-in-more-places.patch => 0888-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0888-Missing-eating-regain-reason.patch => 0889-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0889-Missing-effect-cause.patch => 0890-Missing-effect-cause.patch} (100%)
 rename patches/server/{0890-Added-byte-array-serialization-deserialization-for-P.patch => 0891-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0892-Call-BlockPhysicsEvent-more-often.patch => 0893-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0893-Configurable-chat-thread-limit.patch => 0894-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0895-Set-position-before-player-sending-on-dimension-chan.patch => 0896-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0896-fix-Jigsaw-block-kicking-user.patch => 0897-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0897-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0898-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0898-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0899-Fix-a-bunch-of-vanilla-bugs.patch => 0900-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0900-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0901-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0901-Fix-custom-piglin-loved-items.patch => 0902-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0902-EntityPickupItemEvent-fixes.patch => 0903-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0903-Correctly-handle-interactions-with-items-on-cooldown.patch => 0904-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0904-Add-PlayerInventorySlotChangeEvent.patch => 0905-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0905-Elder-Guardian-appearance-API.patch => 0906-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0906-Allow-changing-bed-s-occupied-property.patch => 0907-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0907-Add-entity-knockback-API.patch => 0908-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0908-Detect-headless-JREs.patch => 0909-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0909-fixed-entity-vehicle-collision-event-not-called.patch => 0910-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0910-optimized-dirt-and-snow-spreading.patch => 0911-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0911-Added-EntityToggleSitEvent.patch => 0912-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0912-Add-fire-tick-delay-option.patch => 0913-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0913-Add-Moving-Piston-API.patch => 0914-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0914-Ignore-impossible-spawn-tick.patch => 0915-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0915-Track-projectile-source-for-fireworks-from-dispenser.patch => 0916-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0918-Prevent-compass-from-loading-chunks.patch => 0919-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0919-Add-PrePlayerAttackEntityEvent.patch => 0920-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0920-ensure-reset-EnderDragon-boss-event-name.patch => 0921-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0921-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0922-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0922-Add-Player-Warden-Warning-API.patch => 0923-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0923-More-vanilla-friendly-methods-to-update-trades.patch => 0924-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0924-Add-paper-dumplisteners-command.patch => 0925-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0925-check-global-player-list-where-appropriate.patch => 0926-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0926-Fix-async-entity-add-due-to-fungus-trees.patch => 0927-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0927-ItemStack-damage-API.patch => 0928-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0928-Friction-API.patch => 0929-Friction-API.patch} (100%)
 rename patches/server/{0929-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0930-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0930-Fix-player-kick-on-shutdown.patch => 0931-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0931-Sync-offhand-slot-in-menus.patch => 0932-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0932-Player-Entity-Tracking-Events.patch => 0933-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0933-Limit-pet-look-distance.patch => 0934-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0934-Properly-resend-entities.patch => 0935-Properly-resend-entities.patch} (100%)
 rename patches/server/{0935-Fixes-and-additions-to-the-SpawnReason-API.patch => 0936-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0936-fix-Instruments.patch => 0937-fix-Instruments.patch} (100%)
 rename patches/server/{0937-Fix-chunk-snapshot-biome-getter.patch => 0938-Fix-chunk-snapshot-biome-getter.patch} (100%)
 rename patches/server/{0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0939-Fix-MapLike-Codec-missing-key-selector.patch => 0940-Fix-MapLike-Codec-missing-key-selector.patch} (100%)
 rename patches/server/{0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0941-Improve-logging-and-errors.patch => 0942-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0942-Fix-explosion-yield-with-new-gamerules.patch => 0943-Fix-explosion-yield-with-new-gamerules.patch} (100%)
 rename patches/server/{0943-Add-BlockLockCheckEvent.patch => 0944-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0944-Add-Sneaking-API-for-Entities.patch => 0945-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0945-Improve-PortalEvents.patch => 0946-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0946-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0947-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/server/{0947-Add-config-option-for-spider-worldborder-climbing.patch => 0948-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0948-Add-missing-SpigotConfig-logCommands-check.patch => 0949-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0950-Flying-Fall-Damage.patch => 0951-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0952-config-for-disabling-entity-tag-tags.patch => 0953-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0953-Use-single-player-info-update-packet-on-join.patch => 0954-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0954-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0955-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0955-Add-Player-sendEquipmentChange-Map-API.patch => 0956-Add-Player-sendEquipmentChange-Map-API.patch} (100%)
 rename patches/server/{0956-Win-Screen-API.patch => 0957-Win-Screen-API.patch} (100%)
 rename patches/server/{0957-Remove-CraftItemStack-setAmount-null-assignment.patch => 0958-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0958-Fix-force-opening-enchantment-tables.patch => 0959-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0959-Add-Entity-Body-Yaw-API.patch => 0960-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0960-Add-missing-isFuel-Material-entries.patch => 0961-Add-missing-isFuel-Material-entries.patch} (94%)

diff --git a/build.gradle.kts b/build.gradle.kts
index faed50c617..22dca7fb3f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,8 @@ subprojects {
             exceptionFormat = TestExceptionFormat.FULL
             events(TestLogEvent.STANDARD_OUT)
         }
+        minHeapSize = "2g"
+        maxHeapSize = "2g"
     }
 
     repositories {
diff --git a/patches/api/0003-Annotation-Test-changes.patch b/patches/api/0003-Annotation-Test-changes.patch
deleted file mode 100644
index 404635ede1..0000000000
--- a/patches/api/0003-Annotation-Test-changes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 17 Mar 2019 23:04:30 +0000
-Subject: [PATCH] Annotation Test changes
-
-- Allow use of TYPE_USE annotations
-- Ignore package-private methods for nullability annotations
-- Add excludes for classes which don't pass
-
-diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 4ac3dd977e75cd8464163351d306e037ee32cb48..1a71bb8861150c1add6446aa2fad0f7035dd6873 100644
---- a/src/test/java/org/bukkit/AnnotationTest.java
-+++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -40,7 +40,17 @@ public class AnnotationTest {
-         "org/bukkit/util/io/Wrapper",
-         "org/bukkit/plugin/java/PluginClassLoader",
-         // Generic functional interface
--        "org/bukkit/util/Consumer"
-+        "org/bukkit/util/Consumer",
-+        // Paper start
-+        // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
-+        "co/aikar/timings/TimingHistory$2",
-+        "co/aikar/timings/TimingHistory$2$1",
-+        "co/aikar/timings/TimingHistory$2$1$1",
-+        "co/aikar/timings/TimingHistory$2$1$2",
-+        "co/aikar/timings/TimingHistory$3",
-+        "co/aikar/timings/TimingHistory$4",
-+        "co/aikar/timings/TimingHistoryEntry$1"
-+        // Paper end
-     };
- 
-     @Test
-@@ -67,14 +77,40 @@ public class AnnotationTest {
-                 }
- 
-                 if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
-+                    // Paper start - Allow use of TYPE_USE annotations
-+                    boolean warn = true;
-+                    if (isWellAnnotated(method.visibleTypeAnnotations)) {
-+                        warn = false;
-+                    } else if (method.invisibleTypeAnnotations != null) {
-+                        dance: for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
-+                            final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
-+                            if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_RETURN && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
-+                                warn = false;
-+                                break dance; // cha cha real smooth
-+                            }
-+                        }
-+                    }
-+                    if (warn)
-+                    // Paper end
-                     warn(errors, clazz, method, "return value");
-                 }
- 
-                 Type[] paramTypes = Type.getArgumentTypes(method.desc);
-                 List<ParameterNode> parameters = method.parameters;
- 
-+                dancing: // Paper
-                 for (int i = 0; i < paramTypes.length; i++) {
-                     if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
-+                        // Paper start
-+                        if (method.invisibleTypeAnnotations != null) {
-+                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
-+                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
-+                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
-+                                    continue dancing;
-+                                }
-+                            }
-+                        }
-+                        // Paper end - Allow use of TYPE_USE annotations
-                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
-                         String paramName = paramNode == null ? null : paramNode.name;
- 
-@@ -91,13 +127,18 @@ public class AnnotationTest {
- 
-         Collections.sort(errors);
- 
--        System.out.println(errors.size() + " missing annotation(s):");
-+        StringBuilder builder = new StringBuilder()
-+            .append("There ")
-+            .append(errors.size() != 1 ? "are " : "is ")
-+            .append(errors.size())
-+            .append(" missing annotation")
-+            .append(errors.size() != 1 ? "s:\n" : ":\n");
-+
-         for (String message : errors) {
--            System.out.print("\t");
--            System.out.println(message);
-+            builder.append("\t").append(message).append("\n");
-         }
- 
--        Assert.fail("There " + errors.size() + " are missing annotation(s)");
-+        Assert.fail(builder.toString());
-     }
- 
-     private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
-@@ -152,7 +193,7 @@ public class AnnotationTest {
- 
-     private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
-         // Exclude private, synthetic and deprecated methods
--        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0) {
-+        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0 || (method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC)) == 0) { // Paper - ignore package-private
-             return false;
-         }
- 
-@@ -174,7 +215,7 @@ public class AnnotationTest {
-         return true;
-     }
- 
--    private static boolean isWellAnnotated(@Nullable List<AnnotationNode> annotations) {
-+    private static boolean isWellAnnotated(@Nullable List<? extends AnnotationNode> annotations) { // Paper
-         if (annotations == null) {
-             return false;
-         }
diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch
new file mode 100644
index 0000000000..5853d992bd
--- /dev/null
+++ b/patches/api/0003-Test-changes.patch
@@ -0,0 +1,478 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Sun, 17 Mar 2019 23:04:30 +0000
+Subject: [PATCH] Test changes
+
+- convert to mockito for mocking of types
+- Allow use of TYPE_USE annotations
+- Ignore package-private methods for nullability annotations
+- Add excludes for classes which don't pass
+
+Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 2b3288057d67e5add4e22e6b7072527057bcd808..4b3453f8dab6008b6fad6245fb7205da33b4bfb8 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -34,6 +34,7 @@ dependencies {
+     compileOnlyApi(checkerQual)
+     testCompileOnly(checkerQual)
+     // Paper end
++    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
+ 
+     testImplementation("org.apache.commons:commons-lang3:3.12.0")
+     testImplementation("junit:junit:4.13.2")
+diff --git a/src/test/java/io/papermc/paper/testing/EmptyRegistry.java b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ba9ddce87a9f385e729a5c2cf7c5eec120e388a7
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
+@@ -0,0 +1,23 @@
++package io.papermc.paper.testing;
++
++import java.util.Collections;
++import java.util.Iterator;
++import org.bukkit.Keyed;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Registry;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public record EmptyRegistry() implements Registry<Keyed> {
++
++    @NotNull
++    @Override
++    public Iterator<Keyed> iterator() {
++        return Collections.emptyIterator();
++    }
++
++    @Override
++    public @Nullable Keyed get(@NotNull final NamespacedKey key) {
++        return null;
++    }
++}
+diff --git a/src/test/java/io/papermc/paper/testing/EmptyTag.java b/src/test/java/io/papermc/paper/testing/EmptyTag.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f559ebc18
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/EmptyTag.java
+@@ -0,0 +1,31 @@
++package io.papermc.paper.testing;
++
++import java.util.Collections;
++import java.util.Set;
++import org.bukkit.Keyed;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Tag;
++import org.jetbrains.annotations.NotNull;
++
++public record EmptyTag(NamespacedKey key) implements Tag<Keyed> {
++
++    @SuppressWarnings("deprecation")
++    public EmptyTag() {
++        this(NamespacedKey.randomKey());
++    }
++
++    @Override
++    public @NotNull NamespacedKey getKey() {
++        return this.key;
++    }
++
++    @Override
++    public boolean isTagged(@NotNull final Keyed item) {
++        return false;
++    }
++
++    @Override
++    public @NotNull Set<Keyed> getValues() {
++        return Collections.emptySet();
++    }
++}
+diff --git a/src/test/java/io/papermc/paper/testing/TestServer.java b/src/test/java/io/papermc/paper/testing/TestServer.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..756acf231b1b076b08046d86992ba7ce7f62a94f
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/TestServer.java
+@@ -0,0 +1,48 @@
++package io.papermc.paper.testing;
++
++import java.util.logging.Logger;
++import org.bukkit.Bukkit;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Server;
++import org.bukkit.command.SimpleCommandMap;
++import org.bukkit.plugin.PluginManager;
++import org.bukkit.plugin.SimplePluginManager;
++
++import static org.mockito.ArgumentMatchers.anyString;
++import static org.mockito.Mockito.any;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.when;
++
++public final class TestServer {
++
++    @SuppressWarnings("removal")
++    public static void setup() {
++        //noinspection ConstantValue
++        if (Bukkit.getServer() != null) {
++            return;
++        }
++
++        final Server dummyServer = mock(Server.class);
++
++        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
++        when(dummyServer.getLogger()).thenReturn(logger);
++        when(dummyServer.getName()).thenReturn(TestServer.class.getSimpleName());
++        when(dummyServer.getVersion()).thenReturn("Version_" + TestServer.class.getPackage().getImplementationVersion());
++        when(dummyServer.getBukkitVersion()).thenReturn("BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion());
++
++
++        final Thread currentThread = Thread.currentThread();
++        when(dummyServer.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
++
++        when(dummyServer.getTag(anyString(), any(NamespacedKey.class), any())).thenAnswer(ignored -> new EmptyTag());
++
++        final PluginManager pluginManager = new SimplePluginManager(dummyServer, new SimpleCommandMap(dummyServer));
++        when(dummyServer.getPluginManager()).thenReturn(pluginManager);
++
++        when(dummyServer.getRegistry(any())).thenAnswer(ignored -> new EmptyRegistry());
++        when(dummyServer.getScoreboardCriteria(anyString())).thenReturn(null);
++
++        Bukkit.setServer(dummyServer);
++    }
++
++}
+diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
+index 4ac3dd977e75cd8464163351d306e037ee32cb48..1a71bb8861150c1add6446aa2fad0f7035dd6873 100644
+--- a/src/test/java/org/bukkit/AnnotationTest.java
++++ b/src/test/java/org/bukkit/AnnotationTest.java
+@@ -40,7 +40,17 @@ public class AnnotationTest {
+         "org/bukkit/util/io/Wrapper",
+         "org/bukkit/plugin/java/PluginClassLoader",
+         // Generic functional interface
+-        "org/bukkit/util/Consumer"
++        "org/bukkit/util/Consumer",
++        // Paper start
++        // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
++        "co/aikar/timings/TimingHistory$2",
++        "co/aikar/timings/TimingHistory$2$1",
++        "co/aikar/timings/TimingHistory$2$1$1",
++        "co/aikar/timings/TimingHistory$2$1$2",
++        "co/aikar/timings/TimingHistory$3",
++        "co/aikar/timings/TimingHistory$4",
++        "co/aikar/timings/TimingHistoryEntry$1"
++        // Paper end
+     };
+ 
+     @Test
+@@ -67,14 +77,40 @@ public class AnnotationTest {
+                 }
+ 
+                 if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
++                    // Paper start - Allow use of TYPE_USE annotations
++                    boolean warn = true;
++                    if (isWellAnnotated(method.visibleTypeAnnotations)) {
++                        warn = false;
++                    } else if (method.invisibleTypeAnnotations != null) {
++                        dance: for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                            final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                            if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_RETURN && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
++                                warn = false;
++                                break dance; // cha cha real smooth
++                            }
++                        }
++                    }
++                    if (warn)
++                    // Paper end
+                     warn(errors, clazz, method, "return value");
+                 }
+ 
+                 Type[] paramTypes = Type.getArgumentTypes(method.desc);
+                 List<ParameterNode> parameters = method.parameters;
+ 
++                dancing: // Paper
+                 for (int i = 0; i < paramTypes.length; i++) {
+                     if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
++                        // Paper start
++                        if (method.invisibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
++                                    continue dancing;
++                                }
++                            }
++                        }
++                        // Paper end - Allow use of TYPE_USE annotations
+                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
+                         String paramName = paramNode == null ? null : paramNode.name;
+ 
+@@ -91,13 +127,18 @@ public class AnnotationTest {
+ 
+         Collections.sort(errors);
+ 
+-        System.out.println(errors.size() + " missing annotation(s):");
++        StringBuilder builder = new StringBuilder()
++            .append("There ")
++            .append(errors.size() != 1 ? "are " : "is ")
++            .append(errors.size())
++            .append(" missing annotation")
++            .append(errors.size() != 1 ? "s:\n" : ":\n");
++
+         for (String message : errors) {
+-            System.out.print("\t");
+-            System.out.println(message);
++            builder.append("\t").append(message).append("\n");
+         }
+ 
+-        Assert.fail("There " + errors.size() + " are missing annotation(s)");
++        Assert.fail(builder.toString());
+     }
+ 
+     private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
+@@ -152,7 +193,7 @@ public class AnnotationTest {
+ 
+     private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
+         // Exclude private, synthetic and deprecated methods
+-        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0) {
++        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0 || (method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC)) == 0) { // Paper - ignore package-private
+             return false;
+         }
+ 
+@@ -174,7 +215,7 @@ public class AnnotationTest {
+         return true;
+     }
+ 
+-    private static boolean isWellAnnotated(@Nullable List<AnnotationNode> annotations) {
++    private static boolean isWellAnnotated(@Nullable List<? extends AnnotationNode> annotations) { // Paper
+         if (annotations == null) {
+             return false;
+         }
+diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
+deleted file mode 100644
+index 701a17c10f31cd345238a3c568264178ce372faa..0000000000000000000000000000000000000000
+--- a/src/test/java/org/bukkit/TestServer.java
++++ /dev/null
+@@ -1,139 +0,0 @@
+-package org.bukkit;
+-
+-import com.google.common.collect.ImmutableMap;
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.logging.Logger;
+-import org.bukkit.command.SimpleCommandMap;
+-import org.bukkit.plugin.PluginManager;
+-import org.bukkit.plugin.SimplePluginManager;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-public final class TestServer implements InvocationHandler {
+-    private static interface MethodHandler {
+-        Object handle(TestServer server, Object[] args);
+-    }
+-
+-    private static final Map<Method, MethodHandler> methods;
+-
+-    static {
+-        try {
+-            ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
+-            methodMap.put(
+-                    Server.class.getMethod("isPrimaryThread"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return Thread.currentThread().equals(server.creatingThread);
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getPluginManager"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return server.pluginManager;
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getLogger"),
+-                    new MethodHandler() {
+-                        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return logger;
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getName"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return TestServer.class.getSimpleName();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return "Version_" + TestServer.class.getPackage().getImplementationVersion();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getBukkitVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return "BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getRegistry", Class.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return new Registry() {
+-                                @NotNull
+-                                @Override
+-                                public Iterator iterator() {
+-                                    return null;
+-                                }
+-
+-                                @Nullable
+-                                @Override
+-                                public Keyed get(@NotNull NamespacedKey key) {
+-                                    return null;
+-                                }
+-                            };
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getScoreboardCriteria", String.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            // Does not need to return anything. Exists solely to test CriteriaTest which has static init fields
+-                            return null;
+-                        }
+-                    }
+-                );
+-            methods = methodMap.build();
+-
+-            TestServer server = new TestServer();
+-            Server instance = Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(server);
+-            Bukkit.setServer(instance);
+-            server.pluginManager = new SimplePluginManager(instance, new SimpleCommandMap(instance));
+-        } catch (Throwable t) {
+-            throw new Error(t);
+-        }
+-    }
+-
+-    private Thread creatingThread = Thread.currentThread();
+-    private PluginManager pluginManager;
+-    private TestServer() {};
+-
+-    public static Server getInstance() {
+-        return Bukkit.getServer();
+-    }
+-
+-    @Override
+-    public Object invoke(Object proxy, Method method, Object[] args) {
+-        MethodHandler handler = methods.get(method);
+-        if (handler != null) {
+-            return handler.handle(this, args);
+-        }
+-        throw new UnsupportedOperationException(String.valueOf(method));
+-    }
+-}
+diff --git a/src/test/java/org/bukkit/TestWorld.java b/src/test/java/org/bukkit/TestWorld.java
+index ab34f1199921d415fa2ca6e281a8125c9e6d7173..f64d024f5bbf9482aaddb56597b23b04c66f21bf 100644
+--- a/src/test/java/org/bukkit/TestWorld.java
++++ b/src/test/java/org/bukkit/TestWorld.java
+@@ -18,7 +18,7 @@ public final class TestWorld implements InvocationHandler {
+ 
+     static {
+         try {
+-            TestServer.getInstance();
++            io.papermc.paper.testing.TestServer.setup(); // Paper
+ 
+             ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
+             methodMap.put(
+diff --git a/src/test/java/org/bukkit/event/SyntheticEventTest.java b/src/test/java/org/bukkit/event/SyntheticEventTest.java
+index d402cb59f508205ebe9ee450594826b04cecb90b..09886568ae6167141b463b6262565fa212af3385 100644
+--- a/src/test/java/org/bukkit/event/SyntheticEventTest.java
++++ b/src/test/java/org/bukkit/event/SyntheticEventTest.java
+@@ -1,6 +1,5 @@
+ package org.bukkit.event;
+ 
+-import org.bukkit.TestServer;
+ import org.bukkit.plugin.PluginLoader;
+ import org.bukkit.plugin.SimplePluginManager;
+ import org.bukkit.plugin.TestPlugin;
+@@ -12,14 +11,15 @@ public class SyntheticEventTest {
+     @SuppressWarnings("deprecation")
+     @Test
+     public void test() {
+-        final JavaPluginLoader loader = new JavaPluginLoader(TestServer.getInstance());
++        io.papermc.paper.testing.TestServer.setup(); // Paper
++        final JavaPluginLoader loader = new JavaPluginLoader(org.bukkit.Bukkit.getServer()); // Paper
+         TestPlugin plugin = new TestPlugin(getClass().getName()) {
+             @Override
+             public PluginLoader getPluginLoader() {
+                 return loader;
+             }
+         };
+-        SimplePluginManager pluginManager = new SimplePluginManager(TestServer.getInstance(), null);
++        SimplePluginManager pluginManager = new SimplePluginManager(org.bukkit.Bukkit.getServer(), null); // Paper
+ 
+         TestEvent event = new TestEvent(false);
+         Impl impl = new Impl();
+diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+index f188cd4f3b07027c30d41f1162db77a506b7b6bb..c46ed2acb82db814d660459b705dd49e6d44240f 100644
+--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
++++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+@@ -2,7 +2,6 @@ package org.bukkit.plugin;
+ 
+ import static org.hamcrest.Matchers.*;
+ import static org.junit.Assert.*;
+-import org.bukkit.TestServer;
+ import org.bukkit.event.Event;
+ import org.bukkit.event.TestEvent;
+ import org.bukkit.permissions.Permission;
+@@ -14,7 +13,7 @@ public class PluginManagerTest {
+         volatile Object value = null;
+     }
+ 
+-    private static final PluginManager pm = TestServer.getInstance().getPluginManager();
++    private static final PluginManager pm = org.bukkit.Bukkit.getServer().getPluginManager(); // Paper
+ 
+     private final MutableObject store = new MutableObject();
+ 
+diff --git a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
+index eb94b6f4d58cd9f66b07791c57af7e359992e28c..a93f28e2f987a36e2c7e4f7d31506b750bdb222b 100644
+--- a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
++++ b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
+@@ -2,7 +2,6 @@ package org.bukkit.scoreboard;
+ 
+ import org.bukkit.Material;
+ import org.bukkit.Statistic;
+-import org.bukkit.TestServer;
+ import org.bukkit.entity.EntityType;
+ import org.junit.Assert;
+ import org.junit.Test;
+@@ -11,7 +10,7 @@ public class CriteriaTest {
+ 
+     @Test
+     public void testStatistic() {
+-        TestServer.getInstance();
++        io.papermc.paper.testing.TestServer.setup(); // Paper
+ 
+         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, Material.STONE)); // Generic statistic with block
+         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, EntityType.CREEPER)); // Generic statistic with entity type
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index d7b5109ff6..b87d3e92ab 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c2928c6f2d54de0ffde164fd9407085cf9fa18a6..c9f9174a085174b96897c013e0ecb79738c2e9e3 100644
+index d217f708b5bc57e402f4c2179ae3aea555b40f92..558fa62d87af1103efa703ef9114481cb928cf8d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,17 +8,37 @@ java {
@@ -49,7 +49,7 @@ index c2928c6f2d54de0ffde164fd9407085cf9fa18a6..c9f9174a085174b96897c013e0ecb797
      // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-@@ -78,9 +98,24 @@ tasks.withType<Javadoc> {
+@@ -79,9 +99,24 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
          "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
diff --git a/patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch
index 255f60b605..3982bba952 100644
--- a/patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch
@@ -84,11 +84,11 @@ index 9f32b57464352c08617f6adec144111b8fcad50c..5af99aa87e6d4fbff81bd9de40484f4e
          RegisteredListener[] listeners = handlers.getRegisteredListeners();
  
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index f188cd4f3b07027c30d41f1162db77a506b7b6bb..1941c9f49e9514c1236c5f4ea9f7af47f7be85c5 100644
+index c46ed2acb82db814d660459b705dd49e6d44240f..24dc87898e0fc40dfaf52f17a1bd26eccfbc7abc 100644
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-@@ -17,7 +17,7 @@ public class PluginManagerTest {
-     private static final PluginManager pm = TestServer.getInstance().getPluginManager();
+@@ -16,7 +16,7 @@ public class PluginManagerTest {
+     private static final PluginManager pm = org.bukkit.Bukkit.getServer().getPluginManager(); // Paper
  
      private final MutableObject store = new MutableObject();
 -
@@ -96,7 +96,7 @@ index f188cd4f3b07027c30d41f1162db77a506b7b6bb..1941c9f49e9514c1236c5f4ea9f7af47
      @Test
      public void testAsyncSameThread() {
          final Event event = new TestEvent(true);
-@@ -28,14 +28,14 @@ public class PluginManagerTest {
+@@ -27,14 +27,14 @@ public class PluginManagerTest {
              return;
          }
          throw new IllegalStateException("No exception thrown");
@@ -113,7 +113,7 @@ index f188cd4f3b07027c30d41f1162db77a506b7b6bb..1941c9f49e9514c1236c5f4ea9f7af47
      @Test
      public void testAsyncLocked() throws InterruptedException {
          final Event event = new TestEvent(true);
-@@ -129,7 +129,7 @@ public class PluginManagerTest {
+@@ -128,7 +128,7 @@ public class PluginManagerTest {
          if (store.value == null) {
              throw new IllegalStateException("No exception thrown");
          }
diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
index e0cbc1d95c..a9f31f66b3 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/api/0157-Add-Material-Tags.patch
@@ -1134,7 +1134,7 @@ index bceaa1a97b2c5cc15c8f54ae8f6f18029708627a..15699ee58e06880a508689f761ecfdb7
  public interface Tag<T extends Keyed> extends Keyed {
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f849d8b12a7e3d1606698408ab4bb140a3b370e4
+index 0000000000000000000000000000000000000000..e541f29e983d8dcaca91de9ee1459d587226b4c3
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 @@ -0,0 +1,65 @@
@@ -1146,8 +1146,8 @@ index 0000000000000000000000000000000000000000..f849d8b12a7e3d1606698408ab4bb140
 +
 +import io.papermc.paper.tag.BaseTag;
 +import io.papermc.paper.tag.EntityTags;
++import io.papermc.paper.testing.TestServer;
 +import org.bukkit.Bukkit;
-+import org.bukkit.TestServer;
 +import org.junit.Before;
 +import org.junit.Test;
 +
@@ -1163,7 +1163,7 @@ index 0000000000000000000000000000000000000000..f849d8b12a7e3d1606698408ab4bb140
 +
 +    @Before
 +    public void before() {
-+        TestServer.getInstance();
++        TestServer.setup();
 +    }
 +
 +    @Test
@@ -1205,26 +1205,24 @@ index 0000000000000000000000000000000000000000..f849d8b12a7e3d1606698408ab4bb140
 +}
 diff --git a/src/test/java/io/papermc/paper/EntityTagsTest.java b/src/test/java/io/papermc/paper/EntityTagsTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..06bb9d1180361d3d00c699796bbacbce5bef2177
+index 0000000000000000000000000000000000000000..3caf03d8e50cd2180e9aac2dddeaa3afd0bf7438
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/EntityTagsTest.java
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,22 @@
 +package io.papermc.paper;
 +
-+import com.destroystokyo.paper.MaterialTags;
 +import io.papermc.paper.tag.EntityTags;
-+import org.bukkit.Bukkit;
-+import org.bukkit.TestServer;
-+import org.junit.Test;
-+
++import io.papermc.paper.testing.TestServer;
 +import java.util.logging.Level;
++import org.bukkit.Bukkit;
++import org.junit.Test;
 +
 +public class EntityTagsTest {
 +
 +    @Test
 +    public void testInitialize() {
 +        try {
-+            TestServer.getInstance();
++            TestServer.setup();
 +            EntityTags.HORSES.getValues();
 +            assert true;
 +        } catch (Throwable e) {
@@ -1233,24 +1231,3 @@ index 0000000000000000000000000000000000000000..06bb9d1180361d3d00c699796bbacbce
 +        }
 +    }
 +}
-diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 701a17c10f31cd345238a3c568264178ce372faa..bfb39f48bea14ad616c53e2a8a6901e93f728768 100644
---- a/src/test/java/org/bukkit/TestServer.java
-+++ b/src/test/java/org/bukkit/TestServer.java
-@@ -32,6 +32,16 @@ public final class TestServer implements InvocationHandler {
-                         }
-                     }
-                 );
-+            // Paper start
-+            methodMap.put(
-+                Server.class.getMethod("getTag", String.class, NamespacedKey.class, Class.class),
-+                new MethodHandler() {
-+                    public Object handle(TestServer server, Object[] args) {
-+                        return new com.destroystokyo.paper.MaterialSetTag();
-+                    }
-+                }
-+            );
-+            // Paper end
-             methodMap.put(
-                     Server.class.getMethod("getPluginManager"),
-                     new MethodHandler() {
diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch
new file mode 100644
index 0000000000..8b7b3c1213
--- /dev/null
+++ b/patches/server/0004-Test-changes.patch
@@ -0,0 +1,280 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Mon, 13 Feb 2023 14:14:56 -0800
+Subject: [PATCH] Test changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 064a0c5b2a4b379ceec84652ff1e004d57419115..218a0db30ac8e4403da4ee50ca0a67ca7bda40e4 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -12,6 +12,7 @@ dependencies {
+     implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
+     implementation("org.ow2.asm:asm:9.3")
+     implementation("org.ow2.asm:asm-commons:9.3") // Paper - ASM event executor generation
++    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
+     implementation("commons-lang:commons-lang:2.6")
+     runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
+     runtimeOnly("mysql:mysql-connector-java:8.0.29")
+diff --git a/src/test/java/io/papermc/paper/testing/DummyServer.java b/src/test/java/io/papermc/paper/testing/DummyServer.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..286790061c9d81c872108ef63e1a1aba2fbec809
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/DummyServer.java
+@@ -0,0 +1,66 @@
++package io.papermc.paper.testing;
++
++import java.util.logging.Logger;
++import org.bukkit.Bukkit;
++import org.bukkit.Material;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Server;
++import org.bukkit.command.SimpleCommandMap;
++import org.bukkit.craftbukkit.CraftRegistry;
++import org.bukkit.craftbukkit.block.data.CraftBlockData;
++import org.bukkit.craftbukkit.inventory.CraftItemFactory;
++import org.bukkit.craftbukkit.util.CraftMagicNumbers;
++import org.bukkit.craftbukkit.util.CraftNamespacedKey;
++import org.bukkit.plugin.PluginManager;
++import org.bukkit.plugin.SimplePluginManager;
++import org.bukkit.support.AbstractTestingBase;
++
++import static org.mockito.Mockito.any;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.when;
++
++public final class DummyServer {
++
++    @SuppressWarnings({"deprecation", "removal"})
++    public static void setup() {
++        //noinspection ConstantValue
++        if (Bukkit.getServer() != null) {
++            return;
++        }
++
++        final Server dummyServer = mock(Server.class);
++
++        final Logger logger = Logger.getLogger(DummyServer.class.getCanonicalName());
++        when(dummyServer.getLogger()).thenReturn(logger);
++        when(dummyServer.getName()).thenReturn(DummyServer.class.getSimpleName());
++        when(dummyServer.getVersion()).thenReturn("Version_" + DummyServer.class.getPackage().getImplementationVersion());
++        when(dummyServer.getBukkitVersion()).thenReturn("BukkitVersion_" + DummyServer.class.getPackage().getImplementationVersion());
++
++        final Thread currentThread = Thread.currentThread();
++        when(dummyServer.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
++
++        when(dummyServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
++
++        when(dummyServer.getUnsafe()).thenAnswer(ignored -> CraftMagicNumbers.INSTANCE); // lambda for lazy load
++
++        when(dummyServer.createBlockData(any(Material.class))).thenAnswer(invocation -> {
++            return CraftBlockData.newData(invocation.getArgument(0, Material.class), null);
++        });
++
++        when(dummyServer.getLootTable(any(NamespacedKey.class))).thenAnswer(invocation -> {
++            final NamespacedKey key = invocation.getArgument(0, NamespacedKey.class);
++            return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key)));
++        });
++
++        when(dummyServer.getRegistry(any())).thenAnswer(invocation -> {
++            // LazyRegistry because the vanilla data hasn't been bootstrapped yet.
++            return new LazyRegistry(() -> CraftRegistry.createRegistry(invocation.getArgument(0, Class.class), AbstractTestingBase.REGISTRY_CUSTOM));
++        });
++
++        final PluginManager pluginManager = new SimplePluginManager(dummyServer, new SimpleCommandMap(dummyServer));
++        when(dummyServer.getPluginManager()).thenReturn(pluginManager);
++
++        Bukkit.setServer(dummyServer);
++
++    }
++}
+diff --git a/src/test/java/io/papermc/paper/testing/LazyRegistry.java b/src/test/java/io/papermc/paper/testing/LazyRegistry.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..8dd0df8c2cc25d37a2590a07872682230a9335f2
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/LazyRegistry.java
+@@ -0,0 +1,23 @@
++package io.papermc.paper.testing;
++
++import java.util.Iterator;
++import java.util.function.Supplier;
++import org.bukkit.Keyed;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Registry;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public record LazyRegistry(Supplier<Registry<Keyed>> supplier) implements Registry<Keyed> {
++
++    @NotNull
++    @Override
++    public Iterator<Keyed> iterator() {
++        return this.supplier().get().iterator();
++    }
++
++    @Override
++    public @Nullable Keyed get(@NotNull final NamespacedKey key) {
++        return this.supplier().get().get(key);
++    }
++}
+diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
+index 492c1ec28a9f1facb117d05245b32231554385ad..007239914bd48263b83112c2b82a5d6406dcdbdc 100644
+--- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
++++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
+@@ -2,7 +2,6 @@ package org.bukkit.support;
+ 
+ import com.google.common.collect.ImmutableList;
+ import com.google.common.util.concurrent.MoreExecutors;
+-import java.util.Collections;
+ import java.util.List;
+ import net.minecraft.SharedConstants;
+ import net.minecraft.commands.Commands;
+@@ -41,6 +40,7 @@ public abstract class AbstractTestingBase {
+     public static final Registry<Biome> BIOMES;
+ 
+     static {
++        io.papermc.paper.testing.DummyServer.setup(); // Paper
+         SharedConstants.tryDetectVersion();
+         Bootstrap.bootStrap();
+         // Set up resource manager
+@@ -56,7 +56,6 @@ public abstract class AbstractTestingBase {
+         // Biome shortcut
+         BIOMES = REGISTRY_CUSTOM.registryOrThrow(Registries.BIOME);
+ 
+-        DummyServer.setup();
+         DummyEnchantments.setup();
+ 
+         ImmutableList.Builder<Material> builder = ImmutableList.builder();
+diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
+deleted file mode 100644
+index 946497353a64421592d2bae012c9a3cb874dd5b8..0000000000000000000000000000000000000000
+--- a/src/test/java/org/bukkit/support/DummyServer.java
++++ /dev/null
+@@ -1,127 +0,0 @@
+-package org.bukkit.support;
+-
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-import java.util.HashMap;
+-import java.util.logging.Logger;
+-import org.bukkit.Bukkit;
+-import org.bukkit.Material;
+-import org.bukkit.NamespacedKey;
+-import org.bukkit.Server;
+-import org.bukkit.craftbukkit.CraftLootTable;
+-import org.bukkit.craftbukkit.CraftRegistry;
+-import org.bukkit.craftbukkit.block.data.CraftBlockData;
+-import org.bukkit.craftbukkit.inventory.CraftItemFactory;
+-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+-import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+-import org.bukkit.craftbukkit.util.Versioning;
+-
+-public final class DummyServer implements InvocationHandler {
+-    private static interface MethodHandler {
+-        Object handle(DummyServer server, Object[] args);
+-    }
+-    private static final HashMap<Method, MethodHandler> methods = new HashMap<Method, MethodHandler>();
+-    static {
+-        try {
+-            methods.put(
+-                    Server.class.getMethod("getItemFactory"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return CraftItemFactory.instance();
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("getName"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return DummyServer.class.getName();
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("getVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return DummyServer.class.getPackage().getImplementationVersion();
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("getBukkitVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return Versioning.getBukkitVersion();
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("getLogger"),
+-                    new MethodHandler() {
+-                        final Logger logger = Logger.getLogger(DummyServer.class.getCanonicalName());
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return logger;
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("getUnsafe"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return CraftMagicNumbers.INSTANCE;
+-                        }
+-                    }
+-                );
+-            methods.put(
+-                    Server.class.getMethod("createBlockData", Material.class),
+-                    new MethodHandler() {
+-                        final Logger logger = Logger.getLogger(DummyServer.class.getCanonicalName());
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return CraftBlockData.newData((Material) args[0], null);
+-                        }
+-                    }
+-                );
+-            methods.put(Server.class.getMethod("getLootTable", NamespacedKey.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            NamespacedKey key = (NamespacedKey) args[0];
+-                            return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key)));
+-                        }
+-                    }
+-                );
+-            methods.put(Server.class.getMethod("getRegistry", Class.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(DummyServer server, Object[] args) {
+-                            return CraftRegistry.createRegistry((Class) args[0], AbstractTestingBase.REGISTRY_CUSTOM);
+-                        }
+-                    }
+-            );
+-            Bukkit.setServer(Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(new DummyServer()));
+-        } catch (Throwable t) {
+-            throw new Error(t);
+-        }
+-    }
+-
+-    public static void setup() {}
+-
+-    private DummyServer() {};
+-
+-    @Override
+-    public Object invoke(Object proxy, Method method, Object[] args) {
+-        MethodHandler handler = DummyServer.methods.get(method);
+-        if (handler != null) {
+-            return handler.handle(this, args);
+-        }
+-        throw new UnsupportedOperationException(String.valueOf(method));
+-    }
+-}
diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
similarity index 99%
rename from patches/server/0004-Paper-config-files.patch
rename to patches/server/0005-Paper-config-files.patch
index 8fc5609219..354e5b4410 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -14,13 +14,13 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 064a0c5b2a4b379ceec84652ff1e004d57419115..fc8a097b000e892630ddef00c350454a5f785281 100644
+index 218a0db30ac8e4403da4ee50ca0a67ca7bda40e4..4ccaf2ac6f6ff3310ca2f0a0672875f2ab1f718f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -12,6 +12,7 @@ dependencies {
-     implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
+@@ -13,6 +13,7 @@ dependencies {
      implementation("org.ow2.asm:asm:9.3")
      implementation("org.ow2.asm:asm-commons:9.3") // Paper - ASM event executor generation
+     testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
 +    implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
@@ -4660,12 +4660,12 @@ index 0000000000000000000000000000000000000000..0396589795da1f83ddf62426236dde9a
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 492c1ec28a9f1facb117d05245b32231554385ad..abf31f0fc3e68f3702f0500dbff7bb9d8be26887 100644
+index 007239914bd48263b83112c2b82a5d6406dcdbdc..3d9ece71fecd5151bb3862282f6021df2d73e3dc 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -58,6 +58,7 @@ public abstract class AbstractTestingBase {
+@@ -57,6 +57,7 @@ public abstract class AbstractTestingBase {
+         BIOMES = REGISTRY_CUSTOM.registryOrThrow(Registries.BIOME);
  
-         DummyServer.setup();
          DummyEnchantments.setup();
 +        io.papermc.paper.configuration.GlobalConfigTestingBase.setupGlobalConfigForTest(); // Paper
  
diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch
similarity index 100%
rename from patches/server/0005-MC-Dev-fixes.patch
rename to patches/server/0006-MC-Dev-fixes.patch
diff --git a/patches/server/0006-ConcurrentUtil.patch b/patches/server/0007-ConcurrentUtil.patch
similarity index 100%
rename from patches/server/0006-ConcurrentUtil.patch
rename to patches/server/0007-ConcurrentUtil.patch
diff --git a/patches/server/0007-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
similarity index 100%
rename from patches/server/0007-CB-fixes.patch
rename to patches/server/0008-CB-fixes.patch
diff --git a/patches/server/0008-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
similarity index 99%
rename from patches/server/0008-MC-Utils.patch
rename to patches/server/0009-MC-Utils.patch
index b5ecb78a33..87e3b7ac56 100644
--- a/patches/server/0008-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -6523,7 +6523,7 @@ index 8309eb14140ebcf62ae7be1dfa0177ac7fcf83d7..8784b0702f10eb7582c309c15f18fe13
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 957e816429fdf1ab5e3f4431a3d19340cccea837..48972d64710fb0d3821e7c1a0722a1d203c47e07 100644
+index f7c5f0cd9d467305c123d3e86c5723055424600e..56016d59d66d90de2ac4326c16b09f86e4ac390b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -247,6 +247,8 @@ public class ServerPlayer extends Player {
@@ -6683,7 +6683,7 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1f7fe7995d3ecc1a47717927f5f2f74b8d99b33d..489cb50f70589c87dd8fb57087e5fa14fd5e1c43 100644
+index 6439fcbbd31158ce7a8ccf191b47d95911c8c3c2..cf810a1d645dd63595702a5f07456cd48393ee79 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -759,6 +759,25 @@ public final class ItemStack {
diff --git a/patches/server/0009-Adventure.patch b/patches/server/0010-Adventure.patch
similarity index 99%
rename from patches/server/0009-Adventure.patch
rename to patches/server/0010-Adventure.patch
index 6322cb7b9b..2d505563dd 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -2071,7 +2071,7 @@ index 0f7dd33d51281b383be0fb47d4e6b133f123ce1f..011c3d2dbd34dd0c2afba477202c937c
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 48972d64710fb0d3821e7c1a0722a1d203c47e07..6a8c67dc668c775809227b455b2dd522ea0dd70b 100644
+index 56016d59d66d90de2ac4326c16b09f86e4ac390b..e06b2a8eece6f179e4a3f38754fd8d9e7b69bdc4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -156,6 +156,7 @@ import net.minecraft.world.scores.Score;
diff --git a/patches/server/0010-Paper-command.patch b/patches/server/0011-Paper-command.patch
similarity index 100%
rename from patches/server/0010-Paper-command.patch
rename to patches/server/0011-Paper-command.patch
diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/server/0012-Paper-Metrics.patch
similarity index 100%
rename from patches/server/0011-Paper-Metrics.patch
rename to patches/server/0012-Paper-Metrics.patch
diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0013-Timings-v2.patch
similarity index 100%
rename from patches/server/0012-Timings-v2.patch
rename to patches/server/0013-Timings-v2.patch
diff --git a/patches/server/0013-Rewrite-dataconverter-system.patch b/patches/server/0014-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0013-Rewrite-dataconverter-system.patch
rename to patches/server/0014-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0014-Starlight.patch b/patches/server/0015-Starlight.patch
similarity index 99%
rename from patches/server/0014-Starlight.patch
rename to patches/server/0015-Starlight.patch
index 39eeedccec..17217a833f 100644
--- a/patches/server/0014-Starlight.patch
+++ b/patches/server/0015-Starlight.patch
@@ -4485,7 +4485,7 @@ index 74d1ae0104e8d0795df50f00317fd860de4f112e..a7feddc31da0870faa3d32a7108282e9
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4aaea477933a89c0febdcfedeebeae609e61f73e..779783037d024792f8052fea0ea8dbe6f06bc181 100644
+index cb1387a18f4306829c75b07a73195b54dbe63ad0..a07c413f1ee1a1689ca8ca87137cf4992d85c7aa 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -131,7 +131,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -5059,7 +5059,7 @@ index 49f091183111958ebd3fb56964fc5d728c16755c..be181106a223f6bb824ddf5869067461
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 7798cbbae6b72d64e6129cebf1f66696f21e15f9..e310b018004c8d7edbfec877f06671d17f7e47fd 100644
+index 240c19f4a7552a01b3c48f1f6413119e4cfc2b67..4843bd864deba357e0a4b2fd844324218af9774f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -142,7 +142,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
diff --git a/patches/server/0015-Add-TickThread.patch b/patches/server/0016-Add-TickThread.patch
similarity index 100%
rename from patches/server/0015-Add-TickThread.patch
rename to patches/server/0016-Add-TickThread.patch
diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0017-Rewrite-chunk-system.patch
similarity index 99%
rename from patches/server/0016-Rewrite-chunk-system.patch
rename to patches/server/0017-Rewrite-chunk-system.patch
index 5f60ba7d19..25a16b2889 100644
--- a/patches/server/0016-Rewrite-chunk-system.patch
+++ b/patches/server/0017-Rewrite-chunk-system.patch
@@ -15922,7 +15922,7 @@ index e96a0ca47e4701ba187555bd92c968345bc85677..73b96f804079288e9c5fcc11da54e61e
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e4435962a60cf9c6d833183bd244a2758ff42808..b85545f997447875e737e4d22a8a8dbcf1f8e2c8 100644
+index fdb7314784a2232a96a9ccdb049bd240e1cc9b06..8ef64f5192500f87f514c42432c0d5c8361145a7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -776,6 +776,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -18004,7 +18004,7 @@ index fd1da8431578832bcd1f3ca7890dd2150b916ebd..958c5faeddd3ee54ac2880eb3eb9e4ab
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c0b89ccf7b7776d010e6e3632a43b2114ac6c128..8dc5aeaf9525dca447f718153d6210a039aa080e 100644
+index b09d8420ffe3c7e2ba173ee98643bc17909db563..9a6c9c42b162315115781246cdf91af816d93293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -176,6 +176,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 95%
rename from patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 17dbe731e1..4783e6fd0d 100644
--- a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ 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 241e328dda2f9d32a16bbb47f4848af33d8d7b45..1e8f5b6b74c469a77238b2798fe1d0897a7c6fb3 100644
+index 720a078acfe770dba76413a8cfa4ef15616ae292..82b267898f98b7e6c808a2377951106769a4a763 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -418,10 +418,15 @@ public final class CraftServer implements Server {
@@ -66,7 +66,7 @@ index 241e328dda2f9d32a16bbb47f4848af33d8d7b45..1e8f5b6b74c469a77238b2798fe1d089
          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 e2cf043fb35ae8474bf1f6ba2cc2505566973cfe..44b30d0f297af5eb4ace4160a0c601ff824632f6 100644
+index 5448d2a6fe8cace246b81742da19666ec24ca48c..a51581263f1c9d72aab7c9223a816d034630f702 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -149,6 +149,12 @@ public class Main {
diff --git a/patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch
similarity index 100%
rename from patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch
rename to patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0019-Configurable-baby-zombie-movement-speed.patch b/patches/server/0020-Configurable-baby-zombie-movement-speed.patch
similarity index 100%
rename from patches/server/0019-Configurable-baby-zombie-movement-speed.patch
rename to patches/server/0020-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0020-Configurable-fishing-time-ranges.patch b/patches/server/0021-Configurable-fishing-time-ranges.patch
similarity index 94%
rename from patches/server/0020-Configurable-fishing-time-ranges.patch
rename to patches/server/0021-Configurable-fishing-time-ranges.patch
index c3a9c76630..da1c2cc1a7 100644
--- a/patches/server/0020-Configurable-fishing-time-ranges.patch
+++ b/patches/server/0021-Configurable-fishing-time-ranges.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable fishing time ranges
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 41a3e97cda5e12658c69fc8f097250d1f2f5fdea..354fed07a1c8d88c97350be11388925e5bf82f9e 100644
+index f0cb2fa768adf1ffe68a00457d39a7749899ac6b..9d0df8d64a2cfd2458295a214829f277798030f0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -86,6 +86,10 @@ public class FishingHook extends Projectile {
diff --git a/patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
similarity index 100%
rename from patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
rename to patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0023-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 100%
rename from patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch
rename to patches/server/0023-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch
similarity index 100%
rename from patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch
rename to patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 100%
rename from patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0026-Implement-Paper-VersionChecker.patch b/patches/server/0027-Implement-Paper-VersionChecker.patch
similarity index 100%
rename from patches/server/0026-Implement-Paper-VersionChecker.patch
rename to patches/server/0027-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0027-Add-version-history-to-version-command.patch b/patches/server/0028-Add-version-history-to-version-command.patch
similarity index 100%
rename from patches/server/0027-Add-version-history-to-version-command.patch
rename to patches/server/0028-Add-version-history-to-version-command.patch
diff --git a/patches/server/0028-Player-affects-spawning-API.patch b/patches/server/0029-Player-affects-spawning-API.patch
similarity index 100%
rename from patches/server/0028-Player-affects-spawning-API.patch
rename to patches/server/0029-Player-affects-spawning-API.patch
diff --git a/patches/server/0029-Further-improve-server-tick-loop.patch b/patches/server/0030-Further-improve-server-tick-loop.patch
similarity index 100%
rename from patches/server/0029-Further-improve-server-tick-loop.patch
rename to patches/server/0030-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0030-Only-refresh-abilities-if-needed.patch b/patches/server/0031-Only-refresh-abilities-if-needed.patch
similarity index 100%
rename from patches/server/0030-Only-refresh-abilities-if-needed.patch
rename to patches/server/0031-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0031-Entity-Origin-API.patch b/patches/server/0032-Entity-Origin-API.patch
similarity index 100%
rename from patches/server/0031-Entity-Origin-API.patch
rename to patches/server/0032-Entity-Origin-API.patch
diff --git a/patches/server/0032-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch
similarity index 97%
rename from patches/server/0032-Prevent-tile-entity-and-entity-crashes.patch
rename to patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch
index cc702a776e..b53d3c9fbf 100644
--- a/patches/server/0032-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch
@@ -44,7 +44,7 @@ index b300d12e9e00519028b53aca9c3fb01f589eaa91..63acd109a79ed752a05df3d4f1b99309
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 652da141c3ae19c4de790dea1477f9c3f4c0dee1..d11a715dccaaf2a2faeef8af9ff6e5f1914416cb 100644
+index 8c2b562e46a35369389da453012b7af570145380..f21ae1ae8af79c1c0c6f2feaa933638add0aa065 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1184,11 +1184,11 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0033-Configurable-top-of-nether-void-damage.patch b/patches/server/0034-Configurable-top-of-nether-void-damage.patch
similarity index 100%
rename from patches/server/0033-Configurable-top-of-nether-void-damage.patch
rename to patches/server/0034-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 100%
rename from patches/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0035-Always-tick-falling-blocks.patch b/patches/server/0036-Always-tick-falling-blocks.patch
similarity index 100%
rename from patches/server/0035-Always-tick-falling-blocks.patch
rename to patches/server/0036-Always-tick-falling-blocks.patch
diff --git a/patches/server/0036-Configurable-end-credits.patch b/patches/server/0037-Configurable-end-credits.patch
similarity index 91%
rename from patches/server/0036-Configurable-end-credits.patch
rename to patches/server/0037-Configurable-end-credits.patch
index 1c6a3bf132..6037ece7eb 100644
--- a/patches/server/0036-Configurable-end-credits.patch
+++ b/patches/server/0037-Configurable-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 72f9e0eedb142cb37f0cab85208d491c4918235e..38f40851a5927a2f71fb3126d554770ff6cb1107 100644
+index e06b2a8eece6f179e4a3f38754fd8d9e7b69bdc4..d7b581a34d95b038e548a7380ce00ebba9835606 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1011,6 +1011,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 92%
rename from patches/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
index e4dde9fb71..91ece8f728 100644
--- a/patches/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index e0efb6ad5f25522bd395018b85df00dda33a443a..77dc0b310f48471c1ca1dc95bf01c5e24f1ed6d8 100644
+index 84b903ec43ce39ef530ecbcc65999df748f785af..735442e98fc9f5a182ff15a526d9601162c9418d 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -202,7 +202,7 @@ public class Explosion {
diff --git a/patches/server/0038-Optimize-explosions.patch b/patches/server/0039-Optimize-explosions.patch
similarity index 100%
rename from patches/server/0038-Optimize-explosions.patch
rename to patches/server/0039-Optimize-explosions.patch
diff --git a/patches/server/0039-Disable-explosion-knockback.patch b/patches/server/0040-Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/0039-Disable-explosion-knockback.patch
rename to patches/server/0040-Disable-explosion-knockback.patch
diff --git a/patches/server/0040-Disable-thunder.patch b/patches/server/0041-Disable-thunder.patch
similarity index 100%
rename from patches/server/0040-Disable-thunder.patch
rename to patches/server/0041-Disable-thunder.patch
diff --git a/patches/server/0041-Disable-ice-and-snow.patch b/patches/server/0042-Disable-ice-and-snow.patch
similarity index 100%
rename from patches/server/0041-Disable-ice-and-snow.patch
rename to patches/server/0042-Disable-ice-and-snow.patch
diff --git a/patches/server/0042-Configurable-mob-spawner-tick-rate.patch b/patches/server/0043-Configurable-mob-spawner-tick-rate.patch
similarity index 95%
rename from patches/server/0042-Configurable-mob-spawner-tick-rate.patch
rename to patches/server/0043-Configurable-mob-spawner-tick-rate.patch
index 0681d9c8f6..784c0a8983 100644
--- a/patches/server/0042-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0043-Configurable-mob-spawner-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index d172f4e00b064c6c8fb5b1f6b0b68fd44a6efb62..cf9a0addcbec3f78a541fad85697961ed8ec884b 100644
+index 3e83bff81a0656d5e1d079ad9e63c7d27561c8e3..b214a79efc4f5279d3dd29feb1f79efc45788a8d 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -45,6 +45,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
rename to patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
index 4951aafcc7..d41f976a1e 100644
--- a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dadd073ff8df18c0ba2bcadbb631f93ee11181a4..a64bf2c4eab6ddb3d135bea245fa099e34534086 100644
+index d7b581a34d95b038e548a7380ce00ebba9835606..a95e2e05db626edbedaa604f059e19a592a682a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1787,7 +1787,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0044-Add-BeaconEffectEvent.patch b/patches/server/0045-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0044-Add-BeaconEffectEvent.patch
rename to patches/server/0045-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0045-Configurable-container-update-tick-rate.patch b/patches/server/0046-Configurable-container-update-tick-rate.patch
similarity index 93%
rename from patches/server/0045-Configurable-container-update-tick-rate.patch
rename to patches/server/0046-Configurable-container-update-tick-rate.patch
index 91d1b053c2..72bb76e5ac 100644
--- a/patches/server/0045-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0046-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fe1cf92644809b9aed5f74235166a21771893b72..91380d37ddd0c03301618849ea8fd9a72c333ae5 100644
+index a95e2e05db626edbedaa604f059e19a592a682a3..c9e262967f040d224e284aa82256422db14aa9d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -233,6 +233,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0046-Use-UserCache-for-player-heads.patch b/patches/server/0047-Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/0046-Use-UserCache-for-player-heads.patch
rename to patches/server/0047-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0047-Disable-spigot-tick-limiters.patch b/patches/server/0048-Disable-spigot-tick-limiters.patch
similarity index 100%
rename from patches/server/0047-Disable-spigot-tick-limiters.patch
rename to patches/server/0048-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0048-Add-PlayerInitialSpawnEvent.patch b/patches/server/0049-Add-PlayerInitialSpawnEvent.patch
similarity index 95%
rename from patches/server/0048-Add-PlayerInitialSpawnEvent.patch
rename to patches/server/0049-Add-PlayerInitialSpawnEvent.patch
index 6e87062ced..e4cab59acf 100644
--- a/patches/server/0048-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0049-Add-PlayerInitialSpawnEvent.patch
@@ -12,7 +12,7 @@ improve setPosition to use raw
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5463b07b24a4572bd9e83b6694fa0162d4911f7b..ae492b5c184896864bb6cc7429dfd701d560ae06 100644
+index da36a7342c5ef34af9ea4330e6cee2880d8d4dc8..22b9f0b3764907fc3c3d8bf8d42ef84ff237cd71 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -229,7 +229,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0050-Ensure-commands-are-not-ran-async.patch b/patches/server/0051-Ensure-commands-are-not-ran-async.patch
similarity index 97%
rename from patches/server/0050-Ensure-commands-are-not-ran-async.patch
rename to patches/server/0051-Ensure-commands-are-not-ran-async.patch
index 01bc09f9e6..bb4cabe4eb 100644
--- a/patches/server/0050-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0051-Ensure-commands-are-not-ran-async.patch
@@ -21,7 +21,7 @@ character.
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b85545f997447875e737e4d22a8a8dbcf1f8e2c8..4acffc3c509ca247a31a10099829a36a15d044a6 100644
+index 8ef64f5192500f87f514c42432c0d5c8361145a7..f9f18e263d29421bdc83993a6fd55f47cb7ab926 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2040,7 +2040,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -107,7 +107,7 @@ index ecc94c04ba83aff8f232467aef2def69065a1c1e..21479b83bbf8a3fd83d2c28626c70b7e
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2bd04b15330e436dad2bc5006406bf791200d8fd..18ca87ebdc58f1ed2c1dd37e91f7ab3d85f3d014 100644
+index 63e01d1380135072735444724a9b060be364cec4..b3fc0f67715707bf4ad6ff88fbf8dab1c830d74b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -504,7 +504,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
index a8f1031ff2..5551499519 100644
--- a/patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -18,7 +18,7 @@ index 64c4b88f0a64436c126cf32d6e289b3876af8dfb..85abd62434cbe3beb63f61262504372b
              if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
                  return checkMobSpawnRules(type, world, spawnReason, pos, random);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index cda6277a3a8eefc80de00ffc98687ce0afca7bf2..46b1cce7d482adea911b71f3e3623ac0574a85ae 100644
+index a895c81ea6af0822c8371ae93cfe4b72d419439d..e4a533ace96829414844607a013831dba7a1e73e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -177,7 +177,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0052-Expose-server-CommandMap.patch b/patches/server/0053-Expose-server-CommandMap.patch
similarity index 100%
rename from patches/server/0052-Expose-server-CommandMap.patch
rename to patches/server/0053-Expose-server-CommandMap.patch
diff --git a/patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0054-Player-Tab-List-and-Title-APIs.patch b/patches/server/0055-Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/server/0054-Player-Tab-List-and-Title-APIs.patch
rename to patches/server/0055-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0055-Add-configurable-portal-search-radius.patch b/patches/server/0056-Add-configurable-portal-search-radius.patch
similarity index 100%
rename from patches/server/0055-Add-configurable-portal-search-radius.patch
rename to patches/server/0056-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0056-Add-velocity-warnings.patch b/patches/server/0057-Add-velocity-warnings.patch
similarity index 100%
rename from patches/server/0056-Add-velocity-warnings.patch
rename to patches/server/0057-Add-velocity-warnings.patch
diff --git a/patches/server/0057-Configurable-inter-world-teleportation-safety.patch b/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
similarity index 100%
rename from patches/server/0057-Configurable-inter-world-teleportation-safety.patch
rename to patches/server/0058-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0058-Add-exception-reporting-event.patch b/patches/server/0059-Add-exception-reporting-event.patch
similarity index 100%
rename from patches/server/0058-Add-exception-reporting-event.patch
rename to patches/server/0059-Add-exception-reporting-event.patch
diff --git a/patches/server/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 100%
rename from patches/server/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 100%
rename from patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0062-Chunk-Save-Reattempt.patch b/patches/server/0063-Chunk-Save-Reattempt.patch
similarity index 100%
rename from patches/server/0062-Chunk-Save-Reattempt.patch
rename to patches/server/0063-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0063-Complete-resource-pack-API.patch b/patches/server/0064-Complete-resource-pack-API.patch
similarity index 100%
rename from patches/server/0063-Complete-resource-pack-API.patch
rename to patches/server/0064-Complete-resource-pack-API.patch
diff --git a/patches/server/0064-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
similarity index 100%
rename from patches/server/0064-Default-loading-permissions.yml-before-plugins.patch
rename to patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
similarity index 100%
rename from patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch
rename to patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0066-Remove-Metadata-on-reload.patch b/patches/server/0067-Remove-Metadata-on-reload.patch
similarity index 100%
rename from patches/server/0066-Remove-Metadata-on-reload.patch
rename to patches/server/0067-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0067-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/0067-Handle-Item-Meta-Inconsistencies.patch
rename to patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0069-Add-World-Util-Methods.patch b/patches/server/0070-Add-World-Util-Methods.patch
similarity index 100%
rename from patches/server/0069-Add-World-Util-Methods.patch
rename to patches/server/0070-Add-World-Util-Methods.patch
diff --git a/patches/server/0070-Custom-replacement-for-eaten-items.patch b/patches/server/0071-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/0070-Custom-replacement-for-eaten-items.patch
rename to patches/server/0071-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0072-Use-a-Shared-Random-for-Entities.patch b/patches/server/0073-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/0072-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0073-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 100%
rename from patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 100%
rename from patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0077-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from patches/server/0077-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0078-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0078-EntityPathfindEvent.patch b/patches/server/0079-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0078-EntityPathfindEvent.patch
rename to patches/server/0079-EntityPathfindEvent.patch
diff --git a/patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0082-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/0082-Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0084-Optimize-DataBits.patch b/patches/server/0085-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0084-Optimize-DataBits.patch
rename to patches/server/0085-Optimize-DataBits.patch
diff --git a/patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0086-Configurable-Player-Collision.patch b/patches/server/0087-Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/0086-Configurable-Player-Collision.patch
rename to patches/server/0087-Configurable-Player-Collision.patch
diff --git a/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0088-Configurable-RCON-IP-address.patch b/patches/server/0089-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0088-Configurable-RCON-IP-address.patch
rename to patches/server/0089-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0092-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 100%
rename from patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0095-System-property-for-disabling-watchdoge.patch b/patches/server/0096-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0095-System-property-for-disabling-watchdoge.patch
rename to patches/server/0096-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0096-Async-GameProfileCache-saving.patch b/patches/server/0097-Async-GameProfileCache-saving.patch
similarity index 100%
rename from patches/server/0096-Async-GameProfileCache-saving.patch
rename to patches/server/0097-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0099-Add-server-name-parameter.patch b/patches/server/0100-Add-server-name-parameter.patch
similarity index 100%
rename from patches/server/0099-Add-server-name-parameter.patch
rename to patches/server/0100-Add-server-name-parameter.patch
diff --git a/patches/server/0100-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
similarity index 100%
rename from patches/server/0100-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
rename to patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
diff --git a/patches/server/0101-Fix-Old-Sign-Conversion.patch b/patches/server/0102-Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from patches/server/0101-Fix-Old-Sign-Conversion.patch
rename to patches/server/0102-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from patches/server/0104-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0106-Configurable-packet-in-spam-threshold.patch b/patches/server/0107-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from patches/server/0106-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0107-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0107-Configurable-flying-kick-messages.patch b/patches/server/0108-Configurable-flying-kick-messages.patch
similarity index 100%
rename from patches/server/0107-Configurable-flying-kick-messages.patch
rename to patches/server/0108-Configurable-flying-kick-messages.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-tile-entity-nbt-data-from-falling-blocks.patch b/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0109-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
rename to patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0110-Cache-user-authenticator-threads.patch b/patches/server/0111-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0110-Cache-user-authenticator-threads.patch
rename to patches/server/0111-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0111-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/0111-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
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-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0113-Add-ProjectileCollideEvent.patch
rename to patches/server/0114-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0115-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0115-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0117-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0117-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0118-Optimize-ItemStack.isEmpty.patch b/patches/server/0119-Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from patches/server/0118-Optimize-ItemStack.isEmpty.patch
rename to patches/server/0119-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0121-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/server/0120-String-based-Action-Bar-API.patch
rename to patches/server/0121-String-based-Action-Bar-API.patch
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0122-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/0121-Properly-fix-item-duplication-bug.patch
rename to patches/server/0122-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0123-Firework-API-s.patch
similarity index 100%
rename from patches/server/0122-Firework-API-s.patch
rename to patches/server/0123-Firework-API-s.patch
diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0123-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0126-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/0125-Enforce-Sync-Player-Saves.patch
rename to patches/server/0126-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 100%
rename from patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch
rename to patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0128-Cap-Entity-Collisions.patch b/patches/server/0129-Cap-Entity-Collisions.patch
similarity index 100%
rename from patches/server/0128-Cap-Entity-Collisions.patch
rename to patches/server/0129-Cap-Entity-Collisions.patch
diff --git a/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0130-Do-not-let-armorstands-drown.patch b/patches/server/0131-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0130-Do-not-let-armorstands-drown.patch
rename to patches/server/0131-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
index e5aeb6ced5..f166db6091 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fc8a097b000e892630ddef00c350454a5f785281..c3072e478af4ab0c365790975f59880fd9bd7137 100644
+index 4ccaf2ac6f6ff3310ca2f0a0672875f2ab1f718f..568f18944cb229206c3db901d9bd7ce881983f88 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,7 +8,17 @@ plugins {
diff --git a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0136-Item-canEntityPickup.patch b/patches/server/0137-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0136-Item-canEntityPickup.patch
rename to patches/server/0137-Item-canEntityPickup.patch
diff --git a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0138-PlayerAttemptPickupItemEvent.patch b/patches/server/0139-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0138-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0139-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0140-Add-UnknownCommandEvent.patch b/patches/server/0141-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/0140-Add-UnknownCommandEvent.patch
rename to patches/server/0141-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0142-Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/server/0141-Basic-PlayerProfile-API.patch
rename to patches/server/0142-Basic-PlayerProfile-API.patch
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 100%
rename from patches/server/0144-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0145-Block-player-logins-during-server-shutdown.patch
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 100%
rename from patches/server/0150-Fix-this-stupid-bullshit.patch
rename to patches/server/0151-Fix-this-stupid-bullshit.patch
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 100%
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
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 97%
rename from patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
index d4753f531e..cac5a765c4 100644
--- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c3072e478af4ab0c365790975f59880fd9bd7137..ea302ff922bd449b2b2cdbe92d21dc704dc456e3 100644
+index 568f18944cb229206c3db901d9bd7ce881983f88..c6148b8521dd6a619f375fc641d5a2ce74234fc2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -17,7 +17,7 @@ dependencies {
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-ServerboundKeepAlivePacket-async.patch b/patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch
similarity index 100%
rename from patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0159-handle-ServerboundKeepAlivePacket-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 100%
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
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 100%
rename from patches/server/0167-AsyncTabCompleteEvent.patch
rename to patches/server/0168-AsyncTabCompleteEvent.patch
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 100%
rename from patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0172-PreCreatureSpawnEvent.patch b/patches/server/0173-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0172-PreCreatureSpawnEvent.patch
rename to patches/server/0173-PreCreatureSpawnEvent.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 100%
rename from patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0182-Player.setPlayerProfile-API.patch b/patches/server/0183-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0182-Player.setPlayerProfile-API.patch
rename to patches/server/0183-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0183-getPlayerUniqueId-API.patch b/patches/server/0184-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0183-getPlayerUniqueId-API.patch
rename to patches/server/0184-getPlayerUniqueId-API.patch
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-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0186-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0187-Flag-to-disable-the-channel-limit.patch b/patches/server/0188-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0187-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0188-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch b/patches/server/0189-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0188-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0189-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0189-Configurable-sprint-interruption-on-attack.patch b/patches/server/0190-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0189-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0190-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0191-EndermanEscapeEvent.patch b/patches/server/0192-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0191-EndermanEscapeEvent.patch
rename to patches/server/0192-EndermanEscapeEvent.patch
diff --git a/patches/server/0192-Enderman.teleportRandomly.patch b/patches/server/0193-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0192-Enderman.teleportRandomly.patch
rename to patches/server/0193-Enderman.teleportRandomly.patch
diff --git a/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0193-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0194-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0196-EndermanAttackPlayerEvent.patch b/patches/server/0197-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0196-EndermanAttackPlayerEvent.patch
rename to patches/server/0197-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0197-WitchConsumePotionEvent.patch b/patches/server/0198-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0197-WitchConsumePotionEvent.patch
rename to patches/server/0198-WitchConsumePotionEvent.patch
diff --git a/patches/server/0198-WitchThrowPotionEvent.patch b/patches/server/0199-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0198-WitchThrowPotionEvent.patch
rename to patches/server/0199-WitchThrowPotionEvent.patch
diff --git a/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0200-WitchReadyPotionEvent.patch b/patches/server/0201-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0200-WitchReadyPotionEvent.patch
rename to patches/server/0201-WitchReadyPotionEvent.patch
diff --git a/patches/server/0201-ItemStack-getMaxItemUseDuration.patch b/patches/server/0202-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0201-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0202-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0204-Fix-CraftEntity-hashCode.patch b/patches/server/0205-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0204-Fix-CraftEntity-hashCode.patch
rename to patches/server/0205-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0207-Make-shield-blocking-delay-configurable.patch b/patches/server/0208-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0207-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0208-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0208-Improve-EntityShootBowEvent.patch b/patches/server/0209-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0208-Improve-EntityShootBowEvent.patch
rename to patches/server/0209-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0209-PlayerReadyArrowEvent.patch b/patches/server/0210-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0209-PlayerReadyArrowEvent.patch
rename to patches/server/0210-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
similarity index 100%
rename from patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
rename to patches/server/0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
diff --git a/patches/server/0211-Expand-Explosions-API.patch b/patches/server/0212-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0211-Expand-Explosions-API.patch
rename to patches/server/0212-Expand-Explosions-API.patch
diff --git a/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0213-RangedEntity-API.patch b/patches/server/0214-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0213-RangedEntity-API.patch
rename to patches/server/0214-RangedEntity-API.patch
diff --git a/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0215-Implement-World.getEntity-UUID-API.patch b/patches/server/0216-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0215-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0216-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/server/0216-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0217-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0217-Vex-get-setSummoner-API.patch b/patches/server/0218-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0217-Vex-get-setSummoner-API.patch
rename to patches/server/0218-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 93%
rename from patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 2f582e3fc3..bdc1affbf2 100644
--- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ea302ff922bd449b2b2cdbe92d21dc704dc456e3..cf7bebb51e4eb0389dab181dacf7c6b0d7be7014 100644
+index c6148b8521dd6a619f375fc641d5a2ce74234fc2..9c5f8c592ceed46e02c5193559677110485f084d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -26,6 +26,7 @@ dependencies {
+@@ -27,6 +27,7 @@ dependencies {
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
      runtimeOnly("mysql:mysql-connector-java:8.0.29")
diff --git a/patches/server/0220-add-more-information-to-Entity.toString.patch b/patches/server/0221-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0220-add-more-information-to-Entity.toString.patch
rename to patches/server/0221-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0222-EnderDragon-Events.patch b/patches/server/0223-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0222-EnderDragon-Events.patch
rename to patches/server/0223-EnderDragon-Events.patch
diff --git a/patches/server/0223-PlayerElytraBoostEvent.patch b/patches/server/0224-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0223-PlayerElytraBoostEvent.patch
rename to patches/server/0224-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0224-PlayerLaunchProjectileEvent.patch b/patches/server/0225-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0224-PlayerLaunchProjectileEvent.patch
rename to patches/server/0225-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0225-Improve-BlockPosition-inlining.patch b/patches/server/0226-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0225-Improve-BlockPosition-inlining.patch
rename to patches/server/0226-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0227-Vanished-players-don-t-have-rights.patch b/patches/server/0228-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0227-Vanished-players-don-t-have-rights.patch
rename to patches/server/0228-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0228-Allow-disabling-armour-stand-ticking.patch b/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0228-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0229-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0229-SkeletonHorse-Additions.patch b/patches/server/0230-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0229-SkeletonHorse-Additions.patch
rename to patches/server/0230-SkeletonHorse-Additions.patch
diff --git a/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0231-Implement-Expanded-ArmorStand-API.patch b/patches/server/0232-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0231-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0232-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0232-AnvilDamageEvent.patch b/patches/server/0233-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0232-AnvilDamageEvent.patch
rename to patches/server/0233-AnvilDamageEvent.patch
diff --git a/patches/server/0233-Add-TNTPrimeEvent.patch b/patches/server/0234-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0233-Add-TNTPrimeEvent.patch
rename to patches/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0235-Fix-NBT-type-issues.patch b/patches/server/0236-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0235-Fix-NBT-type-issues.patch
rename to patches/server/0236-Fix-NBT-type-issues.patch
diff --git a/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0236-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0242-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0243-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0244-Slime-Pathfinder-Events.patch b/patches/server/0245-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0244-Slime-Pathfinder-Events.patch
rename to patches/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0246-Optimize-CraftBlockData-Creation.patch b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0246-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0247-Optimize-MappedRegistry.patch b/patches/server/0248-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0247-Optimize-MappedRegistry.patch
rename to patches/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0248-Add-PhantomPreSpawnEvent.patch b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0248-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0249-Add-More-Creeper-API.patch b/patches/server/0250-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0249-Add-More-Creeper-API.patch
rename to patches/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0250-Inventory-removeItemAnySlot.patch b/patches/server/0251-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0250-Inventory-removeItemAnySlot.patch
rename to patches/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0254-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch
similarity index 100%
rename from patches/server/0254-Improve-death-events.patch
rename to patches/server/0255-Improve-death-events.patch
diff --git a/patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0256-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0256-Mob-Pathfinding-API.patch
rename to patches/server/0257-Mob-Pathfinding-API.patch
diff --git a/patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0263-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0263-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0264-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0264-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0264-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0265-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0265-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0265-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0266-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0266-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0266-PreSpawnerSpawnEvent.patch
rename to patches/server/0267-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0267-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0267-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0268-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0268-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0268-Add-sun-related-API.patch
rename to patches/server/0269-Add-sun-related-API.patch
diff --git a/patches/server/0269-Turtle-API.patch b/patches/server/0270-Turtle-API.patch
similarity index 100%
rename from patches/server/0269-Turtle-API.patch
rename to patches/server/0270-Turtle-API.patch
diff --git a/patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0272-Add-more-Witch-API.patch b/patches/server/0273-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0272-Add-more-Witch-API.patch
rename to patches/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0273-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0273-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0274-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0274-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0275-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0275-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0276-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0276-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0276-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0278-Optimize-World-Time-Updates.patch b/patches/server/0279-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0278-Optimize-World-Time-Updates.patch
rename to patches/server/0279-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0279-Restore-custom-InventoryHolder-support.patch b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0279-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0280-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0280-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0281-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0281-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0282-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0282-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0283-Make-the-default-permission-message-configurable.patch b/patches/server/0284-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0283-Make-the-default-permission-message-configurable.patch
rename to patches/server/0284-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0284-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0284-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0285-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0285-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0286-force-entity-dismount-during-teleportation.patch b/patches/server/0287-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0286-force-entity-dismount-during-teleportation.patch
rename to patches/server/0287-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0287-Add-more-Zombie-API.patch b/patches/server/0288-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0287-Add-more-Zombie-API.patch
rename to patches/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0288-Book-Size-Limits.patch b/patches/server/0289-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0288-Book-Size-Limits.patch
rename to patches/server/0289-Book-Size-Limits.patch
diff --git a/patches/server/0289-Add-PlayerConnectionCloseEvent.patch b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0289-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0290-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0290-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0290-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0291-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0291-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0292-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0292-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0293-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0293-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0294-BlockDestroyEvent.patch b/patches/server/0295-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0294-BlockDestroyEvent.patch
rename to patches/server/0295-BlockDestroyEvent.patch
diff --git a/patches/server/0295-Async-command-map-building.patch b/patches/server/0296-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0295-Async-command-map-building.patch
rename to patches/server/0296-Async-command-map-building.patch
diff --git a/patches/server/0296-Implement-Brigadier-Mojang-API.patch b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
similarity index 99%
rename from patches/server/0296-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0297-Implement-Brigadier-Mojang-API.patch
index b1602a1439..a7e010fcae 100644
--- a/patches/server/0296-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cf7bebb51e4eb0389dab181dacf7c6b0d7be7014..718d80ca0c808d072a57933775fa53423f781aa1 100644
+index 9c5f8c592ceed46e02c5193559677110485f084d..241613c4effdde09270177c25a5f563261b22871 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,6 +8,7 @@ plugins {
diff --git a/patches/server/0297-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0297-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0298-Limit-Client-Sign-length-more.patch b/patches/server/0299-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0298-Limit-Client-Sign-length-more.patch
rename to patches/server/0299-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0299-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0299-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0301-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0301-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0302-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0302-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0303-Entity-getEntitySpawnReason.patch b/patches/server/0304-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/server/0303-Entity-getEntitySpawnReason.patch
rename to patches/server/0304-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0304-Fire-event-on-GS4-query.patch b/patches/server/0305-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0304-Fire-event-on-GS4-query.patch
rename to patches/server/0305-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0305-Implement-PlayerPostRespawnEvent.patch b/patches/server/0306-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0305-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0306-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0306-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0306-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0307-Server-Tick-Events.patch b/patches/server/0308-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0307-Server-Tick-Events.patch
rename to patches/server/0308-Server-Tick-Events.patch
diff --git a/patches/server/0308-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0308-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0309-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0309-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0310-Add-Heightmap-API.patch b/patches/server/0311-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0310-Add-Heightmap-API.patch
rename to patches/server/0311-Add-Heightmap-API.patch
diff --git a/patches/server/0311-Mob-Spawner-API-Enhancements.patch b/patches/server/0312-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0311-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0312-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0312-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0312-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0313-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0313-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0314-Implement-CraftBlockSoundGroup.patch b/patches/server/0315-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0314-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0315-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0315-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/0315-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0316-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0316-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0317-Expose-the-internal-current-tick.patch b/patches/server/0318-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0317-Expose-the-internal-current-tick.patch
rename to patches/server/0318-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0318-Fix-World-isChunkGenerated-calls.patch b/patches/server/0319-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0318-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0319-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0319-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0319-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0320-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0320-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0321-Configurable-projectile-relative-velocity.patch b/patches/server/0322-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0321-Configurable-projectile-relative-velocity.patch
rename to patches/server/0322-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0322-offset-item-frame-ticking.patch b/patches/server/0323-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0322-offset-item-frame-ticking.patch
rename to patches/server/0323-offset-item-frame-ticking.patch
diff --git a/patches/server/0323-Fix-MC-158900.patch b/patches/server/0324-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0323-Fix-MC-158900.patch
rename to patches/server/0324-Fix-MC-158900.patch
diff --git a/patches/server/0324-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0324-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0325-Dont-send-unnecessary-sign-update.patch b/patches/server/0326-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0325-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0326-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0326-Add-option-to-disable-pillager-patrols.patch b/patches/server/0327-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0326-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0327-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0327-Flat-bedrock-generator-settings.patch b/patches/server/0328-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0327-Flat-bedrock-generator-settings.patch
rename to patches/server/0328-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0328-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0328-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0329-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0329-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0330-Duplicate-UUID-Resolve-Option.patch b/patches/server/0331-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0330-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0331-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0331-Optimize-Hoppers.patch b/patches/server/0332-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0331-Optimize-Hoppers.patch
rename to patches/server/0332-Optimize-Hoppers.patch
diff --git a/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0337-Fix-items-not-falling-correctly.patch b/patches/server/0338-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0337-Fix-items-not-falling-correctly.patch
rename to patches/server/0338-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0338-Lag-compensate-eating.patch b/patches/server/0339-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0338-Lag-compensate-eating.patch
rename to patches/server/0339-Lag-compensate-eating.patch
diff --git a/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0341-Entity-Activation-Range-2.0.patch b/patches/server/0342-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0341-Entity-Activation-Range-2.0.patch
rename to patches/server/0342-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0342-Increase-Light-Queue-Size.patch b/patches/server/0343-Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/0342-Increase-Light-Queue-Size.patch
rename to patches/server/0343-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0343-Anti-Xray.patch b/patches/server/0344-Anti-Xray.patch
similarity index 100%
rename from patches/server/0343-Anti-Xray.patch
rename to patches/server/0344-Anti-Xray.patch
diff --git a/patches/server/0344-Implement-alternative-item-despawn-rate.patch b/patches/server/0345-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0344-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0345-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0345-Tracking-Range-Improvements.patch b/patches/server/0346-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0345-Tracking-Range-Improvements.patch
rename to patches/server/0346-Tracking-Range-Improvements.patch
diff --git a/patches/server/0346-Fix-items-vanishing-through-end-portal.patch b/patches/server/0347-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0346-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0347-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0347-implement-optional-per-player-mob-spawns.patch b/patches/server/0348-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0347-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0348-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0349-Improve-Block-breakNaturally-API.patch b/patches/server/0350-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0349-Improve-Block-breakNaturally-API.patch
rename to patches/server/0350-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0351-Add-debug-for-sync-chunk-loads.patch b/patches/server/0352-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0351-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0352-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0352-Remove-garbage-Java-version-check.patch b/patches/server/0353-Remove-garbage-Java-version-check.patch
similarity index 100%
rename from patches/server/0352-Remove-garbage-Java-version-check.patch
rename to patches/server/0353-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0353-Add-ThrownEggHatchEvent.patch b/patches/server/0354-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0353-Add-ThrownEggHatchEvent.patch
rename to patches/server/0354-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0354-Entity-Jump-API.patch b/patches/server/0355-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0354-Entity-Jump-API.patch
rename to patches/server/0355-Entity-Jump-API.patch
diff --git a/patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0356-Make-the-GUI-graph-fancier.patch b/patches/server/0357-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0356-Make-the-GUI-graph-fancier.patch
rename to patches/server/0357-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0358-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0359-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0358-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0359-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0361-Optimise-Chunk-getFluid.patch b/patches/server/0362-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0361-Optimise-Chunk-getFluid.patch
rename to patches/server/0362-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0363-Add-tick-times-API-and-mspt-command.patch b/patches/server/0364-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0363-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0364-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0364-Expose-MinecraftServer-isRunning.patch b/patches/server/0365-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0364-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0365-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0370-Don-t-tick-dead-players.patch b/patches/server/0371-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0370-Don-t-tick-dead-players.patch
rename to patches/server/0371-Don-t-tick-dead-players.patch
diff --git a/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0373-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0372-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0373-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0375-Improved-Watchdog-Support.patch b/patches/server/0376-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0375-Improved-Watchdog-Support.patch
rename to patches/server/0376-Improved-Watchdog-Support.patch
diff --git a/patches/server/0376-Optimize-Pathfinding.patch b/patches/server/0377-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0376-Optimize-Pathfinding.patch
rename to patches/server/0377-Optimize-Pathfinding.patch
diff --git a/patches/server/0377-Reduce-Either-Optional-allocation.patch b/patches/server/0378-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0377-Reduce-Either-Optional-allocation.patch
rename to patches/server/0378-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0379-Prevent-opening-inventories-when-frozen.patch b/patches/server/0380-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0379-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0380-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0381-Implement-Player-Client-Options-API.patch b/patches/server/0382-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0381-Implement-Player-Client-Options-API.patch
rename to patches/server/0382-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0389-Villager-Restocks-API.patch b/patches/server/0390-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0389-Villager-Restocks-API.patch
rename to patches/server/0390-Villager-Restocks-API.patch
diff --git a/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0391-Expose-game-version.patch b/patches/server/0392-Expose-game-version.patch
similarity index 100%
rename from patches/server/0391-Expose-game-version.patch
rename to patches/server/0392-Expose-game-version.patch
diff --git a/patches/server/0392-Optimize-Voxel-Shape-Merging.patch b/patches/server/0393-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0392-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0393-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0394-misc-debugging-dumps.patch b/patches/server/0395-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0394-misc-debugging-dumps.patch
rename to patches/server/0395-misc-debugging-dumps.patch
diff --git a/patches/server/0395-Prevent-teleporting-dead-entities.patch b/patches/server/0396-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0395-Prevent-teleporting-dead-entities.patch
rename to patches/server/0396-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index b558e2be95..168ef1375f 100644
--- a/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 718d80ca0c808d072a57933775fa53423f781aa1..09d8a2e7e63dfeb6a893ae44b43bdeb9ec9804ea 100644
+index 241613c4effdde09270177c25a5f563261b22871..6d0c0fab461a8b27704c9298a631d557d985652f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,12 +19,14 @@ dependencies {
+@@ -19,6 +19,7 @@ dependencies {
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
      implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
@@ -17,14 +17,15 @@ index 718d80ca0c808d072a57933775fa53423f781aa1..09d8a2e7e63dfeb6a893ae44b43bdeb9
      // Paper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm:9.3")
-     implementation("org.ow2.asm:asm-commons:9.3") // Paper - ASM event executor generation
+@@ -26,6 +27,7 @@ dependencies {
+     testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
 +    implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
      runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
      runtimeOnly("mysql:mysql-connector-java:8.0.29")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-@@ -104,6 +106,18 @@ tasks.check {
+@@ -105,6 +107,18 @@ tasks.check {
  }
  // Paper end
  
diff --git a/patches/server/0397-Implement-Mob-Goal-API.patch b/patches/server/0398-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0397-Implement-Mob-Goal-API.patch
rename to patches/server/0398-Implement-Mob-Goal-API.patch
index 6d74fed31a..8f4a0ad3b6 100644
--- a/patches/server/0397-Implement-Mob-Goal-API.patch
+++ b/patches/server/0398-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 09d8a2e7e63dfeb6a893ae44b43bdeb9ec9804ea..dea5594330830b4a7a2a717188cc33367c38a5ad 100644
+index 6d0c0fab461a8b27704c9298a631d557d985652f..5f9823714a0e7d1d4a73861996c4db03c8a0b99b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -35,6 +35,7 @@ dependencies {
+@@ -36,6 +36,7 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
  
diff --git a/patches/server/0398-Add-villager-reputation-API.patch b/patches/server/0399-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0398-Add-villager-reputation-API.patch
rename to patches/server/0399-Add-villager-reputation-API.patch
diff --git a/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0400-ExperienceOrbMergeEvent.patch b/patches/server/0401-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0400-ExperienceOrbMergeEvent.patch
rename to patches/server/0401-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0402-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0403-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0402-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0403-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0403-Potential-bed-API.patch b/patches/server/0404-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0403-Potential-bed-API.patch
rename to patches/server/0404-Potential-bed-API.patch
diff --git a/patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0409-Ensure-safe-gateway-teleport.patch b/patches/server/0410-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0409-Ensure-safe-gateway-teleport.patch
rename to patches/server/0410-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0410-Add-option-for-console-having-all-permissions.patch b/patches/server/0411-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0410-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0411-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0413-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0414-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0413-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0414-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0414-Maps-shouldn-t-load-chunks.patch b/patches/server/0415-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0414-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0415-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0418-Fix-sand-duping.patch b/patches/server/0419-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0418-Fix-sand-duping.patch
rename to patches/server/0419-Fix-sand-duping.patch
diff --git a/patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0422-Improve-Arrow-API.patch b/patches/server/0423-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0422-Improve-Arrow-API.patch
rename to patches/server/0423-Improve-Arrow-API.patch
diff --git a/patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0425-Add-permission-for-command-blocks.patch b/patches/server/0426-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0425-Add-permission-for-command-blocks.patch
rename to patches/server/0426-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0428-Paper-dumpitem-command.patch b/patches/server/0429-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0428-Paper-dumpitem-command.patch
rename to patches/server/0429-Paper-dumpitem-command.patch
diff --git a/patches/server/0429-Improve-Legacy-Component-serialization-size.patch b/patches/server/0430-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0429-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0430-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0430-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0431-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0430-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0431-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0432-incremental-chunk-and-player-saving.patch b/patches/server/0433-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0432-incremental-chunk-and-player-saving.patch
rename to patches/server/0433-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0434-Support-old-UUID-format-for-NBT.patch b/patches/server/0435-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0434-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0435-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0437-Remove-some-streams-from-structures.patch b/patches/server/0438-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0437-Remove-some-streams-from-structures.patch
rename to patches/server/0438-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0439-Support-components-in-ItemMeta.patch b/patches/server/0440-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0439-Support-components-in-ItemMeta.patch
rename to patches/server/0440-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0441-Add-entity-liquid-API.patch b/patches/server/0442-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0441-Add-entity-liquid-API.patch
rename to patches/server/0442-Add-entity-liquid-API.patch
diff --git a/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0442-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0443-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0443-Spawn-player-in-correct-world-on-login.patch b/patches/server/0444-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0443-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0444-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0444-Add-PrepareResultEvent.patch b/patches/server/0445-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0444-Add-PrepareResultEvent.patch
rename to patches/server/0445-Add-PrepareResultEvent.patch
diff --git a/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0447-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0447-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0448-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0448-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0449-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0449-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0450-Fix-SPIGOT-5989.patch b/patches/server/0451-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0450-Fix-SPIGOT-5989.patch
rename to patches/server/0451-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0451-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0451-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0452-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0452-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0453-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0453-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0454-Fix-some-rails-connecting-improperly.patch b/patches/server/0455-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0454-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0455-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0455-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0455-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0456-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0456-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0457-Brand-support.patch b/patches/server/0458-Brand-support.patch
similarity index 100%
rename from patches/server/0457-Brand-support.patch
rename to patches/server/0458-Brand-support.patch
diff --git a/patches/server/0458-Add-setMaxPlayers-API.patch b/patches/server/0459-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0458-Add-setMaxPlayers-API.patch
rename to patches/server/0459-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0459-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0459-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0460-Don-t-require-FACING-data.patch b/patches/server/0461-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0460-Don-t-require-FACING-data.patch
rename to patches/server/0461-Don-t-require-FACING-data.patch
diff --git a/patches/server/0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0462-Add-moon-phase-API.patch b/patches/server/0463-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0462-Add-moon-phase-API.patch
rename to patches/server/0463-Add-moon-phase-API.patch
diff --git a/patches/server/0463-Prevent-headless-pistons-from-being-created.patch b/patches/server/0464-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0463-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0464-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0464-Add-BellRingEvent.patch b/patches/server/0465-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0464-Add-BellRingEvent.patch
rename to patches/server/0465-Add-BellRingEvent.patch
diff --git a/patches/server/0465-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0466-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0465-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0466-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0466-Buffer-joins-to-world.patch b/patches/server/0467-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0466-Buffer-joins-to-world.patch
rename to patches/server/0467-Buffer-joins-to-world.patch
diff --git a/patches/server/0467-Eigencraft-redstone-implementation.patch b/patches/server/0468-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0467-Eigencraft-redstone-implementation.patch
rename to patches/server/0468-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0468-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0468-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0469-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0469-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0470-Fix-CraftTeam-null-check.patch b/patches/server/0471-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0470-Fix-CraftTeam-null-check.patch
rename to patches/server/0471-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0471-Add-more-Evoker-API.patch b/patches/server/0472-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0471-Add-more-Evoker-API.patch
rename to patches/server/0472-Add-more-Evoker-API.patch
diff --git a/patches/server/0472-Add-methods-to-get-translation-keys.patch b/patches/server/0473-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0472-Add-methods-to-get-translation-keys.patch
rename to patches/server/0473-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0473-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0473-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0474-Cache-block-data-strings.patch b/patches/server/0475-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0474-Cache-block-data-strings.patch
rename to patches/server/0475-Cache-block-data-strings.patch
diff --git a/patches/server/0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0476-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0476-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0477-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0477-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0478-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0478-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0479-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0479-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0480-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0480-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0481-Entity-isTicking.patch b/patches/server/0482-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0481-Entity-isTicking.patch
rename to patches/server/0482-Entity-isTicking.patch
diff --git a/patches/server/0482-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0482-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0483-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0483-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0484-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0484-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0485-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0485-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0486-Optimise-getType-calls.patch b/patches/server/0487-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0486-Optimise-getType-calls.patch
rename to patches/server/0487-Optimise-getType-calls.patch
diff --git a/patches/server/0487-Villager-resetOffers.patch b/patches/server/0488-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0487-Villager-resetOffers.patch
rename to patches/server/0488-Villager-resetOffers.patch
diff --git a/patches/server/0488-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0488-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0489-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0489-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0490-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0491-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0490-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0491-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0491-Player-elytra-boost-API.patch b/patches/server/0492-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0491-Player-elytra-boost-API.patch
rename to patches/server/0492-Player-elytra-boost-API.patch
diff --git a/patches/server/0492-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0493-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0492-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0493-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0494-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0495-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0494-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0495-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0495-Add-ignore-discounts-API.patch b/patches/server/0496-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0495-Add-ignore-discounts-API.patch
rename to patches/server/0496-Add-ignore-discounts-API.patch
diff --git a/patches/server/0496-Toggle-for-removing-existing-dragon.patch b/patches/server/0497-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0496-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0497-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0497-Fix-client-lag-on-advancement-loading.patch b/patches/server/0498-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0497-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0498-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0498-Item-no-age-no-player-pickup.patch b/patches/server/0499-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0498-Item-no-age-no-player-pickup.patch
rename to patches/server/0499-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0499-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0499-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0500-Beacon-API-custom-effect-ranges.patch b/patches/server/0501-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0500-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0501-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0501-Add-API-for-quit-reason.patch b/patches/server/0502-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0501-Add-API-for-quit-reason.patch
rename to patches/server/0502-Add-API-for-quit-reason.patch
diff --git a/patches/server/0502-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0502-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0503-Expose-world-spawn-angle.patch b/patches/server/0504-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0503-Expose-world-spawn-angle.patch
rename to patches/server/0504-Expose-world-spawn-angle.patch
diff --git a/patches/server/0504-Add-Destroy-Speed-API.patch b/patches/server/0505-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0504-Add-Destroy-Speed-API.patch
rename to patches/server/0505-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0505-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0505-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0506-Add-LivingEntity-clearActiveItem.patch b/patches/server/0507-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0506-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0507-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0507-Add-PlayerItemCooldownEvent.patch b/patches/server/0508-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0507-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0508-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0508-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0508-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0509-More-lightning-API.patch b/patches/server/0510-More-lightning-API.patch
similarity index 100%
rename from patches/server/0509-More-lightning-API.patch
rename to patches/server/0510-More-lightning-API.patch
diff --git a/patches/server/0510-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0510-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0511-Added-missing-default-perms-for-commands.patch b/patches/server/0512-Added-missing-default-perms-for-commands.patch
similarity index 89%
rename from patches/server/0511-Added-missing-default-perms-for-commands.patch
rename to patches/server/0512-Added-missing-default-perms-for-commands.patch
index 75e57c96f1..b10824a5aa 100644
--- a/patches/server/0511-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0512-Added-missing-default-perms-for-commands.patch
@@ -170,38 +170,3 @@ index 0000000000000000000000000000000000000000..8665e2740aedcc2895b0e2c44ebaba53
 +        }
 +    }
 +}
-diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
-index 946497353a64421592d2bae012c9a3cb874dd5b8..2ddceb709291d3bd713621ffa4020c02ec26bb21 100644
---- a/src/test/java/org/bukkit/support/DummyServer.java
-+++ b/src/test/java/org/bukkit/support/DummyServer.java
-@@ -106,7 +106,21 @@ public final class DummyServer implements InvocationHandler {
-                         }
-                     }
-             );
--            Bukkit.setServer(Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(new DummyServer()));
-+            // Paper start - modeled off of TestServer in the API tests module
-+            methods.put(
-+                Server.class.getMethod("getPluginManager"),
-+                new MethodHandler() {
-+                    @Override
-+                    public Object handle(DummyServer server, Object[] args) {
-+                        return server.pluginManager;
-+                    }
-+                }
-+            );
-+            DummyServer server = new DummyServer();
-+            Server instance = Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(server);
-+            Bukkit.setServer(instance);
-+            server.pluginManager = new org.bukkit.plugin.SimplePluginManager(instance, new org.bukkit.command.SimpleCommandMap(instance));
-+            // Paper end
-         } catch (Throwable t) {
-             throw new Error(t);
-         }
-@@ -116,6 +130,7 @@ public final class DummyServer implements InvocationHandler {
- 
-     private DummyServer() {};
- 
-+    private org.bukkit.plugin.PluginManager pluginManager; // Paper
-     @Override
-     public Object invoke(Object proxy, Method method, Object[] args) {
-         MethodHandler handler = DummyServer.methods.get(method);
diff --git a/patches/server/0512-Add-PlayerShearBlockEvent.patch b/patches/server/0513-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0512-Add-PlayerShearBlockEvent.patch
rename to patches/server/0513-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0513-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0513-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0514-Limit-recipe-packets.patch b/patches/server/0515-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0514-Limit-recipe-packets.patch
rename to patches/server/0515-Limit-recipe-packets.patch
diff --git a/patches/server/0515-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0516-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0515-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0516-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0516-Player-Chunk-Load-Unload-Events.patch b/patches/server/0517-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0516-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0517-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0517-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0517-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0518-Expose-LivingEntity-hurt-direction.patch b/patches/server/0519-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0518-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0519-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0519-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0519-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0520-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0520-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0522-Implement-TargetHitEvent.patch b/patches/server/0523-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0522-Implement-TargetHitEvent.patch
rename to patches/server/0523-Implement-TargetHitEvent.patch
diff --git a/patches/server/0523-MC-4-Fix-item-position-desync.patch b/patches/server/0524-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0523-MC-4-Fix-item-position-desync.patch
rename to patches/server/0524-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0524-Additional-Block-Material-API-s.patch b/patches/server/0525-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0524-Additional-Block-Material-API-s.patch
rename to patches/server/0525-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0525-Fix-harming-potion-dupe.patch b/patches/server/0526-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0525-Fix-harming-potion-dupe.patch
rename to patches/server/0526-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0526-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0526-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0527-Cache-burn-durations.patch b/patches/server/0528-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0527-Cache-burn-durations.patch
rename to patches/server/0528-Cache-burn-durations.patch
diff --git a/patches/server/0528-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0528-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0529-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0529-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0530-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0530-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0531-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0531-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0532-Zombie-API-breaking-doors.patch b/patches/server/0533-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0532-Zombie-API-breaking-doors.patch
rename to patches/server/0533-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0533-Fix-nerfed-slime-when-splitting.patch b/patches/server/0534-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0533-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0534-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0534-Add-EntityLoadCrossbowEvent.patch b/patches/server/0535-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0534-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0535-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0535-Added-WorldGameRuleChangeEvent.patch b/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0535-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0536-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0536-Added-ServerResourcesReloadedEvent.patch b/patches/server/0537-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0536-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0537-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0537-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0537-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0538-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0539-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0538-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0539-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0539-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0540-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0539-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0540-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0540-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0540-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0541-Configurable-door-breaking-difficulty.patch b/patches/server/0542-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0541-Configurable-door-breaking-difficulty.patch
rename to patches/server/0542-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0542-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0543-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0542-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0543-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0543-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0543-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0544-Remove-stale-POIs.patch b/patches/server/0545-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0544-Remove-stale-POIs.patch
rename to patches/server/0545-Remove-stale-POIs.patch
diff --git a/patches/server/0545-Fix-villager-boat-exploit.patch b/patches/server/0546-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0545-Fix-villager-boat-exploit.patch
rename to patches/server/0546-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0546-Add-sendOpLevel-API.patch b/patches/server/0547-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0546-Add-sendOpLevel-API.patch
rename to patches/server/0547-Add-sendOpLevel-API.patch
diff --git a/patches/server/0547-Add-PaperRegistry.patch b/patches/server/0548-Add-PaperRegistry.patch
similarity index 99%
rename from patches/server/0547-Add-PaperRegistry.patch
rename to patches/server/0548-Add-PaperRegistry.patch
index ae11b89e19..6553c4cfb1 100644
--- a/patches/server/0547-Add-PaperRegistry.patch
+++ b/patches/server/0548-Add-PaperRegistry.patch
@@ -221,7 +221,7 @@ index 00cffc8666cc5e0694da2a3d2a2efab457781374..2ba9cac66413ddc0a830dbb2b2644ed9
  
      /**
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index abf31f0fc3e68f3702f0500dbff7bb9d8be26887..084c48ffabac2cd753609add745203e8a55bc09e 100644
+index a18b0bd17ec3dd021136ec873d93692fffa74dad..a41c386a60d004f065d837aaf10d1d6c0e2f8976 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -49,6 +49,15 @@ public abstract class AbstractTestingBase {
diff --git a/patches/server/0548-Add-StructuresLocateEvent.patch b/patches/server/0549-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0548-Add-StructuresLocateEvent.patch
rename to patches/server/0549-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0549-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0550-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0549-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0550-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0551-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0551-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0552-Make-schedule-command-per-world.patch b/patches/server/0553-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0552-Make-schedule-command-per-world.patch
rename to patches/server/0553-Make-schedule-command-per-world.patch
diff --git a/patches/server/0553-Configurable-max-leash-distance.patch b/patches/server/0554-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0553-Configurable-max-leash-distance.patch
rename to patches/server/0554-Configurable-max-leash-distance.patch
diff --git a/patches/server/0554-Implement-BlockPreDispenseEvent.patch b/patches/server/0555-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0554-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0555-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0555-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0555-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0556-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0556-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0557-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0557-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0558-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0558-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0559-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0559-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0560-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0560-add-DragonEggFormEvent.patch b/patches/server/0561-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0560-add-DragonEggFormEvent.patch
rename to patches/server/0561-add-DragonEggFormEvent.patch
diff --git a/patches/server/0561-EntityMoveEvent.patch b/patches/server/0562-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0561-EntityMoveEvent.patch
rename to patches/server/0562-EntityMoveEvent.patch
diff --git a/patches/server/0562-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0562-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0563-Inline-shift-direction-fields.patch b/patches/server/0564-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0563-Inline-shift-direction-fields.patch
rename to patches/server/0564-Inline-shift-direction-fields.patch
diff --git a/patches/server/0564-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0564-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0565-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0565-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0566-living-entity-allow-attribute-registration.patch b/patches/server/0567-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0566-living-entity-allow-attribute-registration.patch
rename to patches/server/0567-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0567-fix-dead-slime-setSize-invincibility.patch b/patches/server/0568-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0567-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0568-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0568-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0568-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0569-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0570-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0569-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0570-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0570-Expose-Tracked-Players.patch b/patches/server/0571-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0570-Expose-Tracked-Players.patch
rename to patches/server/0571-Expose-Tracked-Players.patch
diff --git a/patches/server/0571-Remove-streams-from-SensorNearest.patch b/patches/server/0572-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0571-Remove-streams-from-SensorNearest.patch
rename to patches/server/0572-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0572-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0572-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0573-Improve-ServerGUI.patch b/patches/server/0574-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0573-Improve-ServerGUI.patch
rename to patches/server/0574-Improve-ServerGUI.patch
diff --git a/patches/server/0574-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0574-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0575-fix-converting-txt-to-json-file.patch b/patches/server/0576-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0575-fix-converting-txt-to-json-file.patch
rename to patches/server/0576-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0576-Add-worldborder-events.patch b/patches/server/0577-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0576-Add-worldborder-events.patch
rename to patches/server/0577-Add-worldborder-events.patch
diff --git a/patches/server/0577-added-PlayerNameEntityEvent.patch b/patches/server/0578-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0577-added-PlayerNameEntityEvent.patch
rename to patches/server/0578-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0578-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0579-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0578-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0579-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0579-Add-recipe-to-cook-events.patch b/patches/server/0580-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0579-Add-recipe-to-cook-events.patch
rename to patches/server/0580-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0580-Add-Block-isValidTool.patch b/patches/server/0581-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0580-Add-Block-isValidTool.patch
rename to patches/server/0581-Add-Block-isValidTool.patch
diff --git a/patches/server/0581-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0581-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0582-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0582-Expand-world-key-API.patch b/patches/server/0583-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0582-Expand-world-key-API.patch
rename to patches/server/0583-Expand-world-key-API.patch
diff --git a/patches/server/0583-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0583-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0584-Item-Rarity-API.patch b/patches/server/0585-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0584-Item-Rarity-API.patch
rename to patches/server/0585-Item-Rarity-API.patch
diff --git a/patches/server/0585-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0586-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0585-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0586-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0586-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0586-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0587-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0588-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0587-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0588-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0589-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0590-Expose-protocol-version.patch b/patches/server/0591-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0590-Expose-protocol-version.patch
rename to patches/server/0591-Expose-protocol-version.patch
diff --git a/patches/server/0591-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0591-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0592-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0592-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0593-Add-bypass-host-check.patch b/patches/server/0594-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0593-Add-bypass-host-check.patch
rename to patches/server/0594-Add-bypass-host-check.patch
diff --git a/patches/server/0594-Set-area-affect-cloud-rotation.patch b/patches/server/0595-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0594-Set-area-affect-cloud-rotation.patch
rename to patches/server/0595-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0595-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0595-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0596-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0596-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0597-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0597-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0598-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0598-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0599-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0599-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0600-Added-PlayerDeepSleepEvent.patch b/patches/server/0601-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0600-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0601-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0601-More-World-API.patch b/patches/server/0602-More-World-API.patch
similarity index 100%
rename from patches/server/0601-More-World-API.patch
rename to patches/server/0602-More-World-API.patch
diff --git a/patches/server/0602-Added-PlayerBedFailEnterEvent.patch b/patches/server/0603-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0602-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0603-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0603-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0603-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0604-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0604-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0605-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0606-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0605-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0606-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0606-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0606-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0607-Add-Channel-initialization-listeners.patch b/patches/server/0608-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0607-Add-Channel-initialization-listeners.patch
rename to patches/server/0608-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0608-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0608-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0609-Add-more-WanderingTrader-API.patch b/patches/server/0610-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0609-Add-more-WanderingTrader-API.patch
rename to patches/server/0610-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0610-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0611-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0610-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0611-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0611-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0611-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0612-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0612-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0613-Inventory-close.patch b/patches/server/0614-Inventory-close.patch
similarity index 100%
rename from patches/server/0613-Inventory-close.patch
rename to patches/server/0614-Inventory-close.patch
diff --git a/patches/server/0614-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0614-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0615-Fix-CraftPotionBrewer-cache.patch b/patches/server/0616-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0615-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0616-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0616-Add-basic-Datapack-API.patch b/patches/server/0617-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0616-Add-basic-Datapack-API.patch
rename to patches/server/0617-Add-basic-Datapack-API.patch
diff --git a/patches/server/0617-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0618-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0617-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0618-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0618-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0618-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0619-ItemStack-repair-check-API.patch b/patches/server/0620-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0619-ItemStack-repair-check-API.patch
rename to patches/server/0620-ItemStack-repair-check-API.patch
diff --git a/patches/server/0620-More-Enchantment-API.patch b/patches/server/0621-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0620-More-Enchantment-API.patch
rename to patches/server/0621-More-Enchantment-API.patch
diff --git a/patches/server/0621-Move-range-check-for-block-placing-up.patch b/patches/server/0622-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0621-Move-range-check-for-block-placing-up.patch
rename to patches/server/0622-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0622-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0623-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0622-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0623-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0623-Add-Mob-lookAt-API.patch b/patches/server/0624-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0623-Add-Mob-lookAt-API.patch
rename to patches/server/0624-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0624-Add-Unix-domain-socket-support.patch b/patches/server/0625-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0624-Add-Unix-domain-socket-support.patch
rename to patches/server/0625-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0625-Add-EntityInsideBlockEvent.patch b/patches/server/0626-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0625-Add-EntityInsideBlockEvent.patch
rename to patches/server/0626-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0626-Attributes-API-for-item-defaults.patch b/patches/server/0627-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0626-Attributes-API-for-item-defaults.patch
rename to patches/server/0627-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0627-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0627-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0628-More-Lidded-Block-API.patch b/patches/server/0629-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0628-More-Lidded-Block-API.patch
rename to patches/server/0629-More-Lidded-Block-API.patch
diff --git a/patches/server/0629-Limit-item-frame-cursors-on-maps.patch b/patches/server/0630-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0629-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0630-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0630-Add-PlayerKickEvent-causes.patch b/patches/server/0631-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0630-Add-PlayerKickEvent-causes.patch
rename to patches/server/0631-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0631-Add-PufferFishStateChangeEvent.patch b/patches/server/0632-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0631-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0632-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0632-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0632-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0633-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0633-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0634-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0634-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0635-Add-BellRevealRaiderEvent.patch b/patches/server/0636-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0635-Add-BellRevealRaiderEvent.patch
rename to patches/server/0636-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0636-Fix-invulnerable-end-crystals.patch b/patches/server/0637-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0636-Fix-invulnerable-end-crystals.patch
rename to patches/server/0637-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0637-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0638-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0637-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0638-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0638-Fix-dangerous-end-portal-logic.patch b/patches/server/0639-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0638-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0639-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0639-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0639-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0640-Make-item-validations-configurable.patch b/patches/server/0641-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0640-Make-item-validations-configurable.patch
rename to patches/server/0641-Make-item-validations-configurable.patch
diff --git a/patches/server/0641-Line-Of-Sight-Changes.patch b/patches/server/0642-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0641-Line-Of-Sight-Changes.patch
rename to patches/server/0642-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0642-add-per-world-spawn-limits.patch b/patches/server/0643-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0642-add-per-world-spawn-limits.patch
rename to patches/server/0643-add-per-world-spawn-limits.patch
diff --git a/patches/server/0643-Fix-potions-splash-events.patch b/patches/server/0644-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0643-Fix-potions-splash-events.patch
rename to patches/server/0644-Fix-potions-splash-events.patch
diff --git a/patches/server/0644-Add-more-LimitedRegion-API.patch b/patches/server/0645-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0644-Add-more-LimitedRegion-API.patch
rename to patches/server/0645-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0645-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0645-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0646-Missing-Entity-Behavior-API.patch b/patches/server/0647-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0646-Missing-Entity-Behavior-API.patch
rename to patches/server/0647-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0648-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0648-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0649-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0649-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0650-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0650-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0651-Adds-PlayerArmSwingEvent.patch b/patches/server/0652-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0651-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0652-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0652-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0652-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0653-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0653-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0654-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0655-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0654-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0655-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0655-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0655-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0656-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0656-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0656-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0657-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0657-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0658-Stinger-API.patch b/patches/server/0659-Stinger-API.patch
similarity index 100%
rename from patches/server/0658-Stinger-API.patch
rename to patches/server/0659-Stinger-API.patch
diff --git a/patches/server/0659-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0659-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0660-Add-System.out-err-catcher.patch b/patches/server/0661-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0660-Add-System.out-err-catcher.patch
rename to patches/server/0661-Add-System.out-err-catcher.patch
diff --git a/patches/server/0661-Fix-test-not-bootstrapping.patch b/patches/server/0662-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0661-Fix-test-not-bootstrapping.patch
rename to patches/server/0662-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0662-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0662-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0663-Improve-boat-collision-performance.patch b/patches/server/0664-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0663-Improve-boat-collision-performance.patch
rename to patches/server/0664-Improve-boat-collision-performance.patch
diff --git a/patches/server/0664-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0664-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0665-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0665-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0666-Add-PlayerSetSpawnEvent.patch b/patches/server/0667-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0666-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0667-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0667-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0667-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0668-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0669-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0668-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0669-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0669-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0670-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0669-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0670-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0670-Added-EntityDamageItemEvent.patch b/patches/server/0671-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0670-Added-EntityDamageItemEvent.patch
rename to patches/server/0671-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0671-Optimize-indirect-passenger-iteration.patch b/patches/server/0672-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0671-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0672-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0672-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0672-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0673-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0673-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0674-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0675-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0674-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0675-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0675-Clear-bucket-NBT-after-dispense.patch b/patches/server/0676-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0675-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0676-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0676-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0676-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0677-Add-BlockBreakBlockEvent.patch b/patches/server/0678-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0677-Add-BlockBreakBlockEvent.patch
rename to patches/server/0678-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0678-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0678-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0679-More-CommandBlock-API.patch b/patches/server/0680-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0679-More-CommandBlock-API.patch
rename to patches/server/0680-More-CommandBlock-API.patch
diff --git a/patches/server/0680-Add-missing-team-sidebar-display-slots.patch b/patches/server/0681-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0680-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0681-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0681-Add-back-EntityPortalExitEvent.patch b/patches/server/0682-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0681-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0682-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0682-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0682-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0683-Get-entity-default-attributes.patch b/patches/server/0684-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0683-Get-entity-default-attributes.patch
rename to patches/server/0684-Get-entity-default-attributes.patch
diff --git a/patches/server/0684-Left-handed-API.patch b/patches/server/0685-Left-handed-API.patch
similarity index 100%
rename from patches/server/0684-Left-handed-API.patch
rename to patches/server/0685-Left-handed-API.patch
diff --git a/patches/server/0685-Add-more-advancement-API.patch b/patches/server/0686-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0685-Add-more-advancement-API.patch
rename to patches/server/0686-Add-more-advancement-API.patch
diff --git a/patches/server/0686-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0686-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0687-Add-critical-damage-API.patch b/patches/server/0688-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0687-Add-critical-damage-API.patch
rename to patches/server/0688-Add-critical-damage-API.patch
diff --git a/patches/server/0688-Fix-issues-with-mob-conversion.patch b/patches/server/0689-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0688-Fix-issues-with-mob-conversion.patch
rename to patches/server/0689-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0689-Add-isCollidable-methods-to-various-places.patch b/patches/server/0690-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0689-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0690-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0690-Goat-ram-API.patch b/patches/server/0691-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0690-Goat-ram-API.patch
rename to patches/server/0691-Goat-ram-API.patch
diff --git a/patches/server/0691-Add-API-for-resetting-a-single-score.patch b/patches/server/0692-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0691-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0692-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0692-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0692-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0693-Vanilla-command-permission-fixes.patch b/patches/server/0694-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0693-Vanilla-command-permission-fixes.patch
rename to patches/server/0694-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0695-Fix-GameProfileCache-concurrency.patch b/patches/server/0696-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0695-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0696-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0696-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0697-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0696-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0697-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0697-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0697-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0698-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0699-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0698-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0699-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0699-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0700-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0699-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0700-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0700-Optimise-general-POI-access.patch b/patches/server/0701-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0700-Optimise-general-POI-access.patch
rename to patches/server/0701-Optimise-general-POI-access.patch
diff --git a/patches/server/0701-Optimise-chunk-tick-iteration.patch b/patches/server/0702-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0701-Optimise-chunk-tick-iteration.patch
rename to patches/server/0702-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0702-Execute-chunk-tasks-mid-tick.patch b/patches/server/0703-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0702-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0703-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0703-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0703-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0704-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0704-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0705-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0706-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0705-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0706-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0706-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0707-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0706-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0707-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0707-Distance-manager-tick-timings.patch b/patches/server/0708-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0707-Distance-manager-tick-timings.patch
rename to patches/server/0708-Distance-manager-tick-timings.patch
diff --git a/patches/server/0708-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0708-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0709-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0709-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0710-Add-packet-limiter-config.patch b/patches/server/0711-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0710-Add-packet-limiter-config.patch
rename to patches/server/0711-Add-packet-limiter-config.patch
diff --git a/patches/server/0711-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0711-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0712-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0712-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0713-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0713-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0714-Time-scoreboard-search.patch b/patches/server/0715-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0714-Time-scoreboard-search.patch
rename to patches/server/0715-Time-scoreboard-search.patch
diff --git a/patches/server/0715-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0715-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0716-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0716-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0717-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0718-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0717-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0718-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0718-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0718-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0719-Optimise-random-block-ticking.patch b/patches/server/0720-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0719-Optimise-random-block-ticking.patch
rename to patches/server/0720-Optimise-random-block-ticking.patch
diff --git a/patches/server/0720-Optimise-non-flush-packet-sending.patch b/patches/server/0721-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0720-Optimise-non-flush-packet-sending.patch
rename to patches/server/0721-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0721-Optimise-nearby-player-lookups.patch b/patches/server/0722-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0721-Optimise-nearby-player-lookups.patch
rename to patches/server/0722-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0722-Remove-streams-for-villager-AI.patch b/patches/server/0723-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0722-Remove-streams-for-villager-AI.patch
rename to patches/server/0723-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0723-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0723-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch
index 2ee4a41d37..6ec08a7498 100644
--- a/patches/server/0723-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dea5594330830b4a7a2a717188cc33367c38a5ad..9411103b2d68e46ef9889f7a512362a4701486dc 100644
+index 5f9823714a0e7d1d4a73861996c4db03c8a0b99b..da408b67c42f6cc0b5322f57ff86f93f66eb8c06 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -27,6 +27,11 @@ dependencies {
+@@ -28,6 +28,11 @@ dependencies {
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
diff --git a/patches/server/0724-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0724-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0725-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0725-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0726-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0726-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0727-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0727-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0728-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0728-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0730-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0730-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0731-Ensure-valid-vehicle-status.patch b/patches/server/0732-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0731-Ensure-valid-vehicle-status.patch
rename to patches/server/0732-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0732-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0732-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0733-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0733-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0734-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0735-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0734-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0735-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0735-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0736-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0735-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0736-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0736-Preserve-overstacked-loot.patch b/patches/server/0737-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0736-Preserve-overstacked-loot.patch
rename to patches/server/0737-Preserve-overstacked-loot.patch
diff --git a/patches/server/0737-Update-head-rotation-in-missing-places.patch b/patches/server/0738-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0737-Update-head-rotation-in-missing-places.patch
rename to patches/server/0738-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0738-prevent-unintended-light-block-manipulation.patch b/patches/server/0739-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0738-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0739-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0739-Fix-CraftCriteria-defaults-map.patch b/patches/server/0740-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0739-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0740-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0740-Fix-upstreams-block-state-factories.patch b/patches/server/0741-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0740-Fix-upstreams-block-state-factories.patch
rename to patches/server/0741-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0741-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0741-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0742-Configurable-feature-seeds.patch b/patches/server/0743-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0742-Configurable-feature-seeds.patch
rename to patches/server/0743-Configurable-feature-seeds.patch
diff --git a/patches/server/0743-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0743-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0744-Add-root-admin-user-detection.patch b/patches/server/0745-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0744-Add-root-admin-user-detection.patch
rename to patches/server/0745-Add-root-admin-user-detection.patch
diff --git a/patches/server/0745-Always-allow-item-changing-in-Fireball.patch b/patches/server/0746-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0745-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0746-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0746-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0746-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0747-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0747-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0748-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0748-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0749-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0749-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0750-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0750-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0751-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0751-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0752-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0752-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0753-Fix-Spigot-growth-modifiers.patch b/patches/server/0754-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0753-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0754-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0754-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0754-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0755-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0756-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0755-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0756-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0756-Add-player-health-update-API.patch b/patches/server/0757-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0756-Add-player-health-update-API.patch
rename to patches/server/0757-Add-player-health-update-API.patch
diff --git a/patches/server/0757-Optimize-HashMapPalette.patch b/patches/server/0758-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0757-Optimize-HashMapPalette.patch
rename to patches/server/0758-Optimize-HashMapPalette.patch
diff --git a/patches/server/0758-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0758-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0760-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0760-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0761-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0761-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0762-Add-more-Campfire-API.patch b/patches/server/0763-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0762-Add-more-Campfire-API.patch
rename to patches/server/0763-Add-more-Campfire-API.patch
diff --git a/patches/server/0763-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0763-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0764-Fix-tripwire-state-inconsistency.patch b/patches/server/0765-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0764-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0765-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0765-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0766-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0765-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0766-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0766-Improve-scoreboard-entries.patch b/patches/server/0767-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0766-Improve-scoreboard-entries.patch
rename to patches/server/0767-Improve-scoreboard-entries.patch
diff --git a/patches/server/0767-Entity-powdered-snow-API.patch b/patches/server/0768-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0767-Entity-powdered-snow-API.patch
rename to patches/server/0768-Entity-powdered-snow-API.patch
diff --git a/patches/server/0768-Add-API-for-item-entity-health.patch b/patches/server/0769-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0768-Add-API-for-item-entity-health.patch
rename to patches/server/0769-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0769-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0769-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0770-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0770-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0771-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0771-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0772-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0772-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0773-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0773-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0774-Fix-bees-aging-inside-hives.patch b/patches/server/0775-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0774-Fix-bees-aging-inside-hives.patch
rename to patches/server/0775-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0775-Bucketable-API.patch b/patches/server/0776-Bucketable-API.patch
similarity index 100%
rename from patches/server/0775-Bucketable-API.patch
rename to patches/server/0776-Bucketable-API.patch
diff --git a/patches/server/0776-Validate-usernames.patch b/patches/server/0777-Validate-usernames.patch
similarity index 100%
rename from patches/server/0776-Validate-usernames.patch
rename to patches/server/0777-Validate-usernames.patch
diff --git a/patches/server/0777-Make-water-animal-spawn-height-configurable.patch b/patches/server/0778-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0777-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0778-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0778-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0778-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0779-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0779-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0780-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0780-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0781-Multiple-Entries-with-Scoreboards.patch b/patches/server/0782-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0781-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0782-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0782-Reset-placed-block-on-exception.patch b/patches/server/0783-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0782-Reset-placed-block-on-exception.patch
rename to patches/server/0783-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0783-Add-configurable-height-for-slime-spawn.patch b/patches/server/0784-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0783-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0784-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0784-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0784-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0785-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0786-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0785-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0786-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0786-Kick-on-main-for-illegal-chat.patch b/patches/server/0787-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0786-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0787-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0787-Multi-Block-Change-API-Implementation.patch b/patches/server/0788-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0787-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0788-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0788-Fix-NotePlayEvent.patch b/patches/server/0789-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0788-Fix-NotePlayEvent.patch
rename to patches/server/0789-Fix-NotePlayEvent.patch
diff --git a/patches/server/0789-Freeze-Tick-Lock-API.patch b/patches/server/0790-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0789-Freeze-Tick-Lock-API.patch
rename to patches/server/0790-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0790-Dolphin-API.patch b/patches/server/0791-Dolphin-API.patch
similarity index 100%
rename from patches/server/0790-Dolphin-API.patch
rename to patches/server/0791-Dolphin-API.patch
diff --git a/patches/server/0791-More-PotionEffectType-API.patch b/patches/server/0792-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0791-More-PotionEffectType-API.patch
rename to patches/server/0792-More-PotionEffectType-API.patch
diff --git a/patches/server/0792-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0792-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0793-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0793-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0794-Add-missing-structure-set-seed-configs.patch b/patches/server/0795-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0794-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0795-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0795-Implement-regenerateChunk.patch b/patches/server/0796-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0795-Implement-regenerateChunk.patch
rename to patches/server/0796-Implement-regenerateChunk.patch
diff --git a/patches/server/0796-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0796-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0797-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0797-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0798-Add-GameEvent-tags.patch b/patches/server/0799-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0798-Add-GameEvent-tags.patch
rename to patches/server/0799-Add-GameEvent-tags.patch
diff --git a/patches/server/0799-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0799-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0800-Furnace-RecipesUsed-API.patch b/patches/server/0801-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0800-Furnace-RecipesUsed-API.patch
rename to patches/server/0801-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0801-Configurable-sculk-sensor-listener-range.patch b/patches/server/0802-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0801-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0802-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0802-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0803-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0802-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0803-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0803-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0803-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0804-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0804-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0805-Fix-Entity-Position-Desync.patch b/patches/server/0806-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0805-Fix-Entity-Position-Desync.patch
rename to patches/server/0806-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0806-Custom-Potion-Mixes.patch b/patches/server/0807-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0806-Custom-Potion-Mixes.patch
rename to patches/server/0807-Custom-Potion-Mixes.patch
diff --git a/patches/server/0807-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0808-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0807-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0808-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0808-Force-close-world-loading-screen.patch b/patches/server/0809-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0808-Force-close-world-loading-screen.patch
rename to patches/server/0809-Force-close-world-loading-screen.patch
diff --git a/patches/server/0809-Fix-falling-block-spawn-methods.patch b/patches/server/0810-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0809-Fix-falling-block-spawn-methods.patch
rename to patches/server/0810-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0810-Expose-furnace-minecart-push-values.patch b/patches/server/0811-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0810-Expose-furnace-minecart-push-values.patch
rename to patches/server/0811-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0812-More-Projectile-API.patch b/patches/server/0813-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0812-More-Projectile-API.patch
rename to patches/server/0813-More-Projectile-API.patch
diff --git a/patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0815-Implement-getComputedBiome-API.patch b/patches/server/0816-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0815-Implement-getComputedBiome-API.patch
rename to patches/server/0816-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0816-Make-some-itemstacks-nonnull.patch b/patches/server/0817-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0816-Make-some-itemstacks-nonnull.patch
rename to patches/server/0817-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0817-Implement-enchantWithLevels-API.patch b/patches/server/0818-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0817-Implement-enchantWithLevels-API.patch
rename to patches/server/0818-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0818-Fix-saving-in-unloadWorld.patch b/patches/server/0819-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0818-Fix-saving-in-unloadWorld.patch
rename to patches/server/0819-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0819-Buffer-OOB-setBlock-calls.patch b/patches/server/0820-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0819-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0820-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0820-Add-TameableDeathMessageEvent.patch b/patches/server/0821-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0820-Add-TameableDeathMessageEvent.patch
rename to patches/server/0821-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0824-Guard-against-invalid-entity-positions.patch b/patches/server/0825-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0824-Guard-against-invalid-entity-positions.patch
rename to patches/server/0825-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0825-cache-resource-keys.patch b/patches/server/0826-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0825-cache-resource-keys.patch
rename to patches/server/0826-cache-resource-keys.patch
diff --git a/patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0834-WorldCreator-keepSpawnLoaded.patch b/patches/server/0835-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0834-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0835-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0840-Add-PlayerStopUsingItemEvent.patch b/patches/server/0841-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0840-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0841-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0841-FallingBlock-auto-expire-setting.patch b/patches/server/0842-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0841-FallingBlock-auto-expire-setting.patch
rename to patches/server/0842-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0842-Don-t-tick-markers.patch b/patches/server/0843-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0842-Don-t-tick-markers.patch
rename to patches/server/0843-Don-t-tick-markers.patch
diff --git a/patches/server/0843-Do-not-accept-invalid-client-settings.patch b/patches/server/0844-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0843-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0844-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0844-Add-support-for-Proxy-Protocol.patch b/patches/server/0845-Add-support-for-Proxy-Protocol.patch
similarity index 97%
rename from patches/server/0844-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0845-Add-support-for-Proxy-Protocol.patch
index f5843be478..434262e860 100644
--- a/patches/server/0844-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0845-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9411103b2d68e46ef9889f7a512362a4701486dc..781609605d25283009e5f3e61649ecde9ea9a4cb 100644
+index da408b67c42f6cc0b5322f57ff86f93f66eb8c06..6a1853f3d988820f357c11371e32d50682e60401 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -20,6 +20,7 @@ dependencies {
diff --git a/patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0851-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0852-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0851-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0852-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0852-Dont-resent-entity-on-art-update.patch b/patches/server/0853-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0852-Dont-resent-entity-on-art-update.patch
rename to patches/server/0853-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0853-Add-WardenAngerChangeEvent.patch b/patches/server/0854-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0853-Add-WardenAngerChangeEvent.patch
rename to patches/server/0854-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0856-Nameable-Banner-API.patch b/patches/server/0857-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0856-Nameable-Banner-API.patch
rename to patches/server/0857-Nameable-Banner-API.patch
diff --git a/patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0861-Add-Player-getFishHook.patch b/patches/server/0862-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0861-Add-Player-getFishHook.patch
rename to patches/server/0862-Add-Player-getFishHook.patch
diff --git a/patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0865-Fix-Bee-flower-NPE.patch b/patches/server/0866-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0865-Fix-Bee-flower-NPE.patch
rename to patches/server/0866-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0867-More-Teleport-API.patch b/patches/server/0868-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0867-More-Teleport-API.patch
rename to patches/server/0868-More-Teleport-API.patch
diff --git a/patches/server/0868-Add-EntityPortalReadyEvent.patch b/patches/server/0869-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0868-Add-EntityPortalReadyEvent.patch
rename to patches/server/0869-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0870-Send-block-entities-after-destroy-prediction.patch b/patches/server/0871-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0870-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0871-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0873-Add-missing-BlockFadeEvents.patch b/patches/server/0874-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0873-Add-missing-BlockFadeEvents.patch
rename to patches/server/0874-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0874-Collision-API.patch b/patches/server/0875-Collision-API.patch
similarity index 100%
rename from patches/server/0874-Collision-API.patch
rename to patches/server/0875-Collision-API.patch
diff --git a/patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0876-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0877-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0876-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0877-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 100%
rename from patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0878-Block-Ticking-API.patch b/patches/server/0879-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0878-Block-Ticking-API.patch
rename to patches/server/0879-Block-Ticking-API.patch
diff --git a/patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0881-Add-NamespacedKey-biome-methods.patch b/patches/server/0882-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0881-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0882-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0888-Missing-eating-regain-reason.patch b/patches/server/0889-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0888-Missing-eating-regain-reason.patch
rename to patches/server/0889-Missing-eating-regain-reason.patch
diff --git a/patches/server/0889-Missing-effect-cause.patch b/patches/server/0890-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0889-Missing-effect-cause.patch
rename to patches/server/0890-Missing-effect-cause.patch
diff --git a/patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0892-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0893-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0892-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0893-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0893-Configurable-chat-thread-limit.patch b/patches/server/0894-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0893-Configurable-chat-thread-limit.patch
rename to patches/server/0894-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0896-fix-Jigsaw-block-kicking-user.patch b/patches/server/0897-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0896-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0897-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0898-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0898-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0901-Fix-custom-piglin-loved-items.patch b/patches/server/0902-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0901-Fix-custom-piglin-loved-items.patch
rename to patches/server/0902-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0902-EntityPickupItemEvent-fixes.patch b/patches/server/0903-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0902-EntityPickupItemEvent-fixes.patch
rename to patches/server/0903-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0905-Elder-Guardian-appearance-API.patch b/patches/server/0906-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0905-Elder-Guardian-appearance-API.patch
rename to patches/server/0906-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0906-Allow-changing-bed-s-occupied-property.patch b/patches/server/0907-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0906-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0907-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0907-Add-entity-knockback-API.patch b/patches/server/0908-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0907-Add-entity-knockback-API.patch
rename to patches/server/0908-Add-entity-knockback-API.patch
diff --git a/patches/server/0908-Detect-headless-JREs.patch b/patches/server/0909-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0908-Detect-headless-JREs.patch
rename to patches/server/0909-Detect-headless-JREs.patch
diff --git a/patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0910-optimized-dirt-and-snow-spreading.patch b/patches/server/0911-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0910-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0911-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0911-Added-EntityToggleSitEvent.patch b/patches/server/0912-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0911-Added-EntityToggleSitEvent.patch
rename to patches/server/0912-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0912-Add-fire-tick-delay-option.patch b/patches/server/0913-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0912-Add-fire-tick-delay-option.patch
rename to patches/server/0913-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0913-Add-Moving-Piston-API.patch b/patches/server/0914-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0913-Add-Moving-Piston-API.patch
rename to patches/server/0914-Add-Moving-Piston-API.patch
diff --git a/patches/server/0914-Ignore-impossible-spawn-tick.patch b/patches/server/0915-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0914-Ignore-impossible-spawn-tick.patch
rename to patches/server/0915-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0918-Prevent-compass-from-loading-chunks.patch b/patches/server/0919-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0918-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0919-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0919-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0920-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0919-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0920-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0922-Add-Player-Warden-Warning-API.patch b/patches/server/0923-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0922-Add-Player-Warden-Warning-API.patch
rename to patches/server/0923-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0924-Add-paper-dumplisteners-command.patch b/patches/server/0925-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0924-Add-paper-dumplisteners-command.patch
rename to patches/server/0925-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0925-check-global-player-list-where-appropriate.patch b/patches/server/0926-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0925-check-global-player-list-where-appropriate.patch
rename to patches/server/0926-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0927-ItemStack-damage-API.patch b/patches/server/0928-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0927-ItemStack-damage-API.patch
rename to patches/server/0928-ItemStack-damage-API.patch
diff --git a/patches/server/0928-Friction-API.patch b/patches/server/0929-Friction-API.patch
similarity index 100%
rename from patches/server/0928-Friction-API.patch
rename to patches/server/0929-Friction-API.patch
diff --git a/patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0930-Fix-player-kick-on-shutdown.patch b/patches/server/0931-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0930-Fix-player-kick-on-shutdown.patch
rename to patches/server/0931-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0931-Sync-offhand-slot-in-menus.patch b/patches/server/0932-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0931-Sync-offhand-slot-in-menus.patch
rename to patches/server/0932-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0932-Player-Entity-Tracking-Events.patch b/patches/server/0933-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0932-Player-Entity-Tracking-Events.patch
rename to patches/server/0933-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0933-Limit-pet-look-distance.patch b/patches/server/0934-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0933-Limit-pet-look-distance.patch
rename to patches/server/0934-Limit-pet-look-distance.patch
diff --git a/patches/server/0934-Properly-resend-entities.patch b/patches/server/0935-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0934-Properly-resend-entities.patch
rename to patches/server/0935-Properly-resend-entities.patch
diff --git a/patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0936-fix-Instruments.patch b/patches/server/0937-fix-Instruments.patch
similarity index 100%
rename from patches/server/0936-fix-Instruments.patch
rename to patches/server/0937-fix-Instruments.patch
diff --git a/patches/server/0937-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0938-Fix-chunk-snapshot-biome-getter.patch
similarity index 100%
rename from patches/server/0937-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0938-Fix-chunk-snapshot-biome-getter.patch
diff --git a/patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0941-Improve-logging-and-errors.patch b/patches/server/0942-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0941-Improve-logging-and-errors.patch
rename to patches/server/0942-Improve-logging-and-errors.patch
diff --git a/patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch
similarity index 100%
rename from patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch
rename to patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch
diff --git a/patches/server/0943-Add-BlockLockCheckEvent.patch b/patches/server/0944-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0943-Add-BlockLockCheckEvent.patch
rename to patches/server/0944-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0944-Add-Sneaking-API-for-Entities.patch b/patches/server/0945-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0944-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0945-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0945-Improve-PortalEvents.patch b/patches/server/0946-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0945-Improve-PortalEvents.patch
rename to patches/server/0946-Improve-PortalEvents.patch
diff --git a/patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0950-Flying-Fall-Damage.patch b/patches/server/0951-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0950-Flying-Fall-Damage.patch
rename to patches/server/0951-Flying-Fall-Damage.patch
diff --git a/patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0952-config-for-disabling-entity-tag-tags.patch b/patches/server/0953-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0952-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0953-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0953-Use-single-player-info-update-packet-on-join.patch b/patches/server/0954-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0953-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0954-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0955-Add-Player-sendEquipmentChange-Map-API.patch b/patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch
similarity index 100%
rename from patches/server/0955-Add-Player-sendEquipmentChange-Map-API.patch
rename to patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch
diff --git a/patches/server/0956-Win-Screen-API.patch b/patches/server/0957-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0956-Win-Screen-API.patch
rename to patches/server/0957-Win-Screen-API.patch
diff --git a/patches/server/0957-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0957-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0958-Fix-force-opening-enchantment-tables.patch b/patches/server/0959-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0958-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0959-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0959-Add-Entity-Body-Yaw-API.patch b/patches/server/0960-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0959-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0960-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0960-Add-missing-isFuel-Material-entries.patch b/patches/server/0961-Add-missing-isFuel-Material-entries.patch
similarity index 94%
rename from patches/server/0960-Add-missing-isFuel-Material-entries.patch
rename to patches/server/0961-Add-missing-isFuel-Material-entries.patch
index e7e6d73e7f..c7898bdfbf 100644
--- a/patches/server/0960-Add-missing-isFuel-Material-entries.patch
+++ b/patches/server/0961-Add-missing-isFuel-Material-entries.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing isFuel Material entries
 
 
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 084c48ffabac2cd753609add745203e8a55bc09e..f1be92753106abedc3617257517bbb66d02923b1 100644
+index a41c386a60d004f065d837aaf10d1d6c0e2f8976..c74ea594248450c76ccec097aa090bd05f94661e 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -44,7 +44,12 @@ public abstract class AbstractTestingBase {