From 2b8d06aed3a19559785c8956d672a9f8a50ca267 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Wed, 16 Jun 2021 13:07:43 +0200
Subject: [PATCH] Definitely readd this patch for the first time

---
 ...blocking-on-Network-Manager-creation.patch | 45 +++++++++++++++++++
 ...-profiles-that-have-no-UUID-and-no-.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  0
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  2 +-
 ...5-Configurable-flying-kick-messages.patch} |  2 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  0
 ...to-fix-bad-Y-levels-on-player-login.patch} |  2 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  0
 ...nt.patch => 0109-Add-EntityZapEvent.patch} |  4 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  2 +-
 ...11-Cache-user-authenticator-threads.patch} |  2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  2 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  0
 ... => 0115-Add-ProjectileCollideEvent.patch} |  4 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  0
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  0
 ... => 0120-Optimize-ItemStack.isEmpty.patch} |  2 +-
 ...o-control-if-armour-stands-can-move.patch} |  2 +-
 ...=> 0122-String-based-Action-Bar-API.patch} |  0
 ...3-Properly-fix-item-duplication-bug.patch} |  4 +-
 ...-API-s.patch => 0124-Firework-API-s.patch} |  0
 ... 0125-PlayerTeleportEndGatewayEvent.patch} |  2 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...h => 0127-Enforce-Sync-Player-Saves.patch} |  0
 ...low-entities-to-ride-themselves-572.patch} |  2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  8 ++--
 ...patch => 0130-Cap-Entity-Collisions.patch} |  2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...ore-aggressive-in-the-chunk-unload-.patch} |  2 +-
 ...> 0133-Do-not-let-armorstands-drown.patch} |  2 +-
 ...e-async-calls-to-restart-the-server.patch} |  0
 ...roperty-to-disable-book-size-limits.patch} |  0
 ...e-parrots-stay-on-shoulders-despite.patch} |  0
 ...-option-to-prevent-player-names-fro.patch} |  0
 ...leAppender-for-console-improvements.patch} |  0
 ...rable-option-to-disable-creeper-lin.patch} |  0
 ....patch => 0140-Item-canEntityPickup.patch} |  2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0142-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0143-Add-UnknownCommandEvent.patch} |  2 +-
 ...tch => 0144-Basic-PlayerProfile-API.patch} |  0
 ... 0145-Shoulder-Entities-Release-API.patch} |  2 +-
 ...patch => 0146-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  2 +-
 ...patch => 0148-Entity-fromMobSpawner.patch} |  2 +-
 ...9-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...plement-ensureServerConversions-API.patch} |  0
 ...> 0151-Implement-getI18NDisplayName.patch} |  0
 ...=> 0152-ProfileWhitelistVerifyEvent.patch} |  0
 ...ch => 0153-Fix-this-stupid-bullshit.patch} |  0
 ...atch => 0154-LivingEntity-setKiller.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  0
 ...a-custom-authentication-servers-dow.patch} |  2 +-
 ...-prefixes-using-Log4J-configuration.patch} |  0
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0160-Add-PlayerJumpEvent.patch} |  2 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} |  2 +-
 ...t-serverside-behavior-of-keepalives.patch} |  2 +-
 ...Effects-only-to-players-who-can-see.patch} |  2 +-
 ... => 0165-Add-PlayerArmorChangeEvent.patch} |  2 +-
 ...om-being-processed-when-the-player-.patch} |  2 +-
 ...7-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0170-AsyncTabCompleteEvent.patch} |  0
 ...=> 0171-PlayerPickupExperienceEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...patch => 0175-PreCreatureSpawnEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0177-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0179-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0181-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0185-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0187-Player.setPlayerProfile-API.patch} |  0
 ...patch => 0188-getPlayerUniqueId-API.patch} |  0
 ...ake-player-data-saving-configurable.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...2-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  0
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0196-EndermanEscapeEvent.patch} |  0
 ...h => 0197-Enderman.teleportRandomly.patch} |  0
 ...198-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...h => 0201-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0202-WitchConsumePotionEvent.patch} |  0
 ...patch => 0203-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0205-WitchReadyPotionEvent.patch} |  0
 ...206-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0209-Fix-CraftEntity-hashCode.patch} |  2 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  0
 ...=> 0213-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0214-PlayerReadyArrowEvent.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0216-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0218-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0221-InventoryCloseEvent-Reason-API.patch} |  2 +-
 ...tch => 0222-Vex-get-setSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...25-Use-asynchronous-Log4j-2-loggers.patch} |  0
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...ts.patch => 0228-EnderDragon-Events.patch} |  0
 ...atch => 0229-PlayerElytraBoostEvent.patch} |  0
 ...=> 0230-PlayerLaunchProjectileEvent.patch} |  0
 ...0231-Improve-BlockPosition-inlining.patch} |  0
 ...timize-IntIdentityHashBiMiap-nextId.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 => 0236-SkeletonHorse-Additions.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...8-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0239-AnvilDamageEvent.patch} |  0
 ...h => 0240-Add-hand-to-bucket-events.patch} |  2 +-
 ...ent.patch => 0241-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  6 +--
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  0
 ...0247-Make-EnderDragon-implement-Mob.patch} |  0
 ...8-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...9-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...fault-mob-spawn-range-and-water-ani.patch} |  0
 ...tch => 0253-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...55-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0256-Optimize-MappedRegistry.patch} |  0
 ...ch => 0257-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0258-Add-More-Creeper-API.patch} |  0
 ...=> 0259-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...1-Asynchronous-chunk-IO-and-loading.patch} |  2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0264-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0266-Mob-Pathfinding-API.patch} |  0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.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
 ...=> 0273-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0275-Hook-into-CB-plugin-rewrites.patch} |  0
 ...I.patch => 0276-Add-sun-related-API.patch} |  0
 ...77-Add-LivingEntity-getTargetEntity.patch} |  2 +-
 ...Turtle-API.patch => 0278-Turtle-API.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...PI.patch => 0282-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0284-Here-s-Johnny.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  0
 ...6-Reset-players-airTicks-on-respawn.patch} |  2 +-
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0289-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0291-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0292-Fix-SpongeAbsortEvent-handling.patch} |  0
 ....patch => 0293-PreSpawnerSpawnEvent.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} |  2 +-
 ...I.patch => 0299-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0300-Book-Size-Limits.patch} |  0
 ...0301-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0307-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ... 0309-Limit-Client-Sign-length-more.patch} |  0
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} | 25 +++++++++++
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0317-Entity-getEntitySpawnReason.patch} |  2 +-
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...tch => 0319-Fire-event-on-GS4-query.patch} |  0
 ...20-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0322-Server-Tick-Events.patch} |  0
 ...323-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0325-Add-Heightmap-API.patch} |  0
 ...> 0326-Mob-Spawner-API-Enhancements.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  0
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...30-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ....patch => 0332-ChunkMapDistance-CME.patch} |  0
 ...0333-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0334-Chunk-debug-command.patch} |  0
 ...35-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...36-Fix-World-isChunkGenerated-calls.patch} |  2 +-
 ...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 => 0340-offset-item-frame-ticking.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0342-Fix-MC-158900.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...gs.patch => 0344-Generator-Settings.patch} |  4 +-
 ...-161754.patch => 0345-Fix-MC-161754.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...47-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0353-Duplicate-UUID-Resolve-Option.patch} |  2 +-
 ...pers.patch => 0354-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} |  2 +-
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  2 +-
 ...360-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0361-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0365-Entity-Activation-Range-2.0.patch} |  2 +-
 ...h => 0366-Increase-Light-Queue-Size.patch} |  0
 ...and.patch => 0367-Fix-Light-Command.patch} |  2 +-
 ...7-Anti-Xray.patch => 0368-Anti-Xray.patch} |  6 +--
 ...o-Tick-view-distance-implementation.patch} |  2 +-
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0371-Tracking-Range-Improvements.patch} |  2 +-
 ...-items-vanishing-through-end-portal.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...0377-Add-debug-for-sync-chunk-loads.patch} |  2 +-
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0379-Add-ThrownEggHatchEvent.patch} |  0
 ... 0380-Optimise-random-block-ticking.patch} |  2 +-
 ...p-API.patch => 0381-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  2 +-
 ... => 0383-Make-the-GUI-graph-fancier.patch} |  0
 ...84-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...5-Prevent-teleporting-dead-entities.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 => 0389-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  2 +-
 ...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} |  4 +-
 ...timize-Collision-to-not-load-chunks.patch} |  2 +-
 ...tch => 0396-Don-t-tick-dead-players.patch} |  0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  2 +-
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  2 +-
 ...ove-existing-players-to-world-spawn.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...02-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...4-Remove-streams-from-Mob-AI-System.patch} |  0
 ... => 0405-Async-command-map-building.patch} |  0
 ...h => 0406-Improved-Watchdog-Support.patch} |  2 +-
 ....patch => 0407-Optimize-Pathfinding.patch} |  0
 ...8-Reduce-Either-Optional-allocation.patch} |  0
 ...409-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...12-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  2 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...8-Broadcast-join-message-to-console.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  2 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  2 +-
 ...0427-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0428-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0430-Expose-game-version.patch} |  0
 ...> 0431-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0433-Implement-Mob-Goal-API.patch} |  0
 ...ance-map-to-optimise-entity-tracker.patch} |  4 +-
 ...isOutsideRange-to-use-distance-maps.patch} |  2 +-
 ...=> 0436-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0438-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0441-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} |  2 +-
 ...> 0447-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  2 +-
 ...packets-to-nearby-locations-sounds-.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0452-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0460-Fix-sand-duping.patch} |  2 +-
 ...desync-in-playerconnection-causing-.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0463-Expose-Arrow-getItemStack.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} |  2 +-
 ...orldBorder-collision-checks-and-air.patch} |  2 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0470-Paper-dumpitem-command.patch} |  0
 ...71-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...474-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
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...0480-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0482-Add-entity-liquid-API.patch} |  2 +-
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  0
 ...atch => 0485-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.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
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0494-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
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  2 +-
 ...support.patch => 0503-Brand-support.patch} |  0
 ...patch => 0504-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0506-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0508-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0510-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0512-Buffer-joins-to-world.patch} |  0
 ...=> 0513-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0516-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0517-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0520-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
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0528-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0534-Optimise-getType-calls.patch} |  0
 ....patch => 0535-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0540-Player-elytra-boost-API.patch} |  0
 ...41-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0544-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0547-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...549-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0550-Add-API-for-quit-reason.patch} |  0
 ...h => 0551-Seed-based-feature-search.patch} |  0
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0554-Expose-world-spawn-angle.patch} |  0
 ...patch => 0555-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...57-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0558-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0559-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0562-Add-PlayerShearBlockEvent.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0565-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0567-MC-4-Fix-item-position-desync.patch} |  0
 ...568-Player-Chunk-Load-Unload-Events.patch} |  0
 ...9-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
 ...atch => 0573-added-PlayerTradeEvent.patch} |  0
 ...ch => 0574-Implement-TargetHitEvent.patch} |  0
 ...575-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0576-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0578-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 => 0583-Zombie-API-breaking-doors.patch} |  0
 ...584-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0585-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0586-Guardian-beam-workaround.patch} |  0
 ...0587-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 => 0596-Remove-stale-POIs.patch} |  0
 ...h => 0597-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0598-Add-sendOpLevel-API.patch} |  0
 ...ch => 0599-Add-StructureLocateEvent.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
 ...603-Make-schedule-command-per-world.patch} |  0
 ...604-Configurable-max-leash-distance.patch} |  0
 ...605-Implement-BlockPreDispenseEvent.patch} |  0
 ...h => 0606-Added-Vanilla-Entity-Tags.patch} |  0
 ...-API.patch => 0607-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-spam-when-removing-chests-in-water.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...e-map-update-when-spawning-disabled.patch} |  0
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0615-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0616-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0618-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
 ....patch => 0624-misc-debugging-dumps.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0626-Expose-Tracked-Players.patch} |  0
 ...7-Remove-streams-from-SensorNearest.patch} |  0
 ...ix-Wither-hostility-towards-players.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0630-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...632-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0633-Add-worldborder-events.patch} |  0
 ...=> 0634-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0636-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0637-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0639-Implement-Keyed-on-World.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0641-Item-Rarity-API.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.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
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0648-Expose-protocol-version.patch} |  0
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0652-Add-bypass-host-check.patch} |  0
 ...0653-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...ting-give-items-on-item-drop-cancel.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0661-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0662-More-World-API.patch} |  0
 ... 0663-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} |  6 +--
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0670-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0674-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0677-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0678-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ...fo.patch => 0681-Clear-SyncLoadInfo.patch} |  0
 ... => 0682-ItemStack-repair-check-API.patch} |  0
 ....patch => 0683-More-Enchantment-API.patch} |  0
 ...option-to-load-extra-plugin-jars-no.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0686-Add-Mob-lookAt-API.patch} |  0
 ...0687-Add-Unix-domain-socket-support.patch} |  8 ++--
 ... => 0688-Add-EntityInsideBlockEvent.patch} |  0
 ...89-Attributes-API-for-item-defaults.patch} |  0
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0692-More-Lidded-Block-API.patch} |  0
 ...93-Limit-item-frame-cursors-on-maps.patch} |  0
 ...0694-Add-PufferFishStateChangeEvent.patch} |  0
 ... => 0695-Add-PlayerKickEvent-causes.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ReentrantLo.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0699-Add-BellRevealRaiderEvent.patch} |  0
 ... 0700-Fix-invulnerable-end-crystals.patch} |  0
 ...01-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...inventory-on-cancelled-pickup-event.patch} |  0
 ...0703-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...0706-Add-more-line-of-sight-methods.patch} |  0
 ... => 0707-add-per-world-spawn-limits.patch} |  0
 ...plashEvent-for-water-splash-potions.patch} |  0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |  0
 610 files changed, 170 insertions(+), 100 deletions(-)
 create mode 100644 patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
 rename patches/server/{0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename patches/server/{0101-Add-setting-for-proxy-online-mode-status.patch => 0102-Add-setting-for-proxy-online-mode-status.patch} (100%)
 rename patches/server/{0102-Optimise-BlockState-s-hashCode-equals.patch => 0103-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0103-Configurable-packet-in-spam-threshold.patch => 0104-Configurable-packet-in-spam-threshold.patch} (96%)
 rename patches/server/{0104-Configurable-flying-kick-messages.patch => 0105-Configurable-flying-kick-messages.patch} (96%)
 rename patches/server/{0105-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (100%)
 rename patches/server/{0106-Auto-fix-bad-Y-levels-on-player-login.patch => 0107-Auto-fix-bad-Y-levels-on-player-login.patch} (91%)
 rename patches/server/{0107-Option-to-remove-corrupt-tile-entities.patch => 0108-Option-to-remove-corrupt-tile-entities.patch} (100%)
 rename patches/server/{0108-Add-EntityZapEvent.patch => 0109-Add-EntityZapEvent.patch} (95%)
 rename patches/server/{0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (96%)
 rename patches/server/{0110-Cache-user-authenticator-threads.patch => 0111-Cache-user-authenticator-threads.patch} (97%)
 rename patches/server/{0111-Allow-Reloading-of-Command-Aliases.patch => 0112-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename patches/server/{0112-Add-source-to-PlayerExpChangeEvent.patch => 0113-Add-source-to-PlayerExpChangeEvent.patch} (96%)
 rename patches/server/{0113-Don-t-let-fishinghooks-use-portals.patch => 0114-Don-t-let-fishinghooks-use-portals.patch} (100%)
 rename patches/server/{0114-Add-ProjectileCollideEvent.patch => 0115-Add-ProjectileCollideEvent.patch} (97%)
 rename patches/server/{0115-Prevent-Pathfinding-out-of-World-Border.patch => 0116-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0116-Optimize-World.isLoaded-BlockPosition-Z.patch => 0117-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename patches/server/{0117-Bound-Treasure-Maps-to-World-Border.patch => 0118-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename patches/server/{0118-Configurable-Cartographer-Treasure-Maps.patch => 0119-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0119-Optimize-ItemStack.isEmpty.patch => 0120-Optimize-ItemStack.isEmpty.patch} (90%)
 rename patches/server/{0120-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0121-Add-API-methods-to-control-if-armour-stands-can-move.patch} (95%)
 rename patches/server/{0121-String-based-Action-Bar-API.patch => 0122-String-based-Action-Bar-API.patch} (100%)
 rename patches/server/{0122-Properly-fix-item-duplication-bug.patch => 0123-Properly-fix-item-duplication-bug.patch} (88%)
 rename patches/server/{0123-Firework-API-s.patch => 0124-Firework-API-s.patch} (100%)
 rename patches/server/{0124-PlayerTeleportEndGatewayEvent.patch => 0125-PlayerTeleportEndGatewayEvent.patch} (95%)
 rename patches/server/{0125-Provide-E-TE-Chunk-count-stat-methods.patch => 0126-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename patches/server/{0126-Enforce-Sync-Player-Saves.patch => 0127-Enforce-Sync-Player-Saves.patch} (100%)
 rename patches/server/{0127-Don-t-allow-entities-to-ride-themselves-572.patch => 0128-Don-t-allow-entities-to-ride-themselves-572.patch} (90%)
 rename patches/server/{0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (98%)
 rename patches/server/{0129-Cap-Entity-Collisions.patch => 0130-Cap-Entity-Collisions.patch} (96%)
 rename patches/server/{0130-Remove-CraftScheduler-Async-Task-Debugger.patch => 0131-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0131-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (96%)
 rename patches/server/{0132-Do-not-let-armorstands-drown.patch => 0133-Do-not-let-armorstands-drown.patch} (89%)
 rename patches/server/{0133-Properly-handle-async-calls-to-restart-the-server.patch => 0134-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename patches/server/{0134-Add-system-property-to-disable-book-size-limits.patch => 0135-Add-system-property-to-disable-book-size-limits.patch} (100%)
 rename patches/server/{0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (100%)
 rename patches/server/{0136-Add-configuration-option-to-prevent-player-names-fro.patch => 0137-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename patches/server/{0137-Use-TerminalConsoleAppender-for-console-improvements.patch => 0138-Use-TerminalConsoleAppender-for-console-improvements.patch} (100%)
 rename patches/server/{0138-provide-a-configurable-option-to-disable-creeper-lin.patch => 0139-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0139-Item-canEntityPickup.patch => 0140-Item-canEntityPickup.patch} (96%)
 rename patches/server/{0140-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0141-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0141-PlayerAttemptPickupItemEvent.patch => 0142-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0142-Add-UnknownCommandEvent.patch => 0143-Add-UnknownCommandEvent.patch} (92%)
 rename patches/server/{0143-Basic-PlayerProfile-API.patch => 0144-Basic-PlayerProfile-API.patch} (100%)
 rename patches/server/{0144-Shoulder-Entities-Release-API.patch => 0145-Shoulder-Entities-Release-API.patch} (97%)
 rename patches/server/{0145-Profile-Lookup-Events.patch => 0146-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0146-Block-player-logins-during-server-shutdown.patch => 0147-Block-player-logins-during-server-shutdown.patch} (92%)
 rename patches/server/{0147-Entity-fromMobSpawner.patch => 0148-Entity-fromMobSpawner.patch} (97%)
 rename patches/server/{0148-Improve-the-Saddle-API-for-Horses.patch => 0149-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0149-Implement-ensureServerConversions-API.patch => 0150-Implement-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0150-Implement-getI18NDisplayName.patch => 0151-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0151-ProfileWhitelistVerifyEvent.patch => 0152-ProfileWhitelistVerifyEvent.patch} (100%)
 rename patches/server/{0152-Fix-this-stupid-bullshit.patch => 0153-Fix-this-stupid-bullshit.patch} (100%)
 rename patches/server/{0153-LivingEntity-setKiller.patch => 0154-LivingEntity-setKiller.patch} (100%)
 rename patches/server/{0154-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0155-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename patches/server/{0156-Allow-specifying-a-custom-authentication-servers-dow.patch => 0157-Allow-specifying-a-custom-authentication-servers-dow.patch} (96%)
 rename patches/server/{0157-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0158-Handle-plugin-prefixes-using-Log4J-configuration.patch} (100%)
 rename patches/server/{0158-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0159-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0159-Add-PlayerJumpEvent.patch => 0160-Add-PlayerJumpEvent.patch} (96%)
 rename patches/server/{0160-handle-PacketPlayInKeepAlive-async.patch => 0161-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename patches/server/{0161-Expose-client-protocol-version-and-virtual-host.patch => 0162-Expose-client-protocol-version-and-virtual-host.patch} (97%)
 rename patches/server/{0162-revert-serverside-behavior-of-keepalives.patch => 0163-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename patches/server/{0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (98%)
 rename patches/server/{0164-Add-PlayerArmorChangeEvent.patch => 0165-Add-PlayerArmorChangeEvent.patch} (94%)
 rename patches/server/{0165-Prevent-logins-from-being-processed-when-the-player-.patch => 0166-Prevent-logins-from-being-processed-when-the-player-.patch} (92%)
 rename patches/server/{0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (100%)
 rename patches/server/{0167-use-CB-BlockState-implementations-for-captured-block.patch => 0168-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename patches/server/{0168-API-to-get-a-BlockState-without-a-snapshot.patch => 0169-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0169-AsyncTabCompleteEvent.patch => 0170-AsyncTabCompleteEvent.patch} (100%)
 rename patches/server/{0170-PlayerPickupExperienceEvent.patch => 0171-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0171-Ability-to-apply-mending-to-XP-API.patch => 0172-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename patches/server/{0172-Make-max-squid-spawn-height-configurable.patch => 0173-Make-max-squid-spawn-height-configurable.patch} (100%)
 rename patches/server/{0173-PlayerNaturallySpawnCreaturesEvent.patch => 0174-PlayerNaturallySpawnCreaturesEvent.patch} (98%)
 rename patches/server/{0174-PreCreatureSpawnEvent.patch => 0175-PreCreatureSpawnEvent.patch} (100%)
 rename patches/server/{0175-Add-setPlayerProfile-API-for-Skulls.patch => 0176-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0176-Fill-Profile-Property-Events.patch => 0177-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0177-PlayerAdvancementCriterionGrantEvent.patch => 0178-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0178-Add-ArmorStand-Item-Meta.patch => 0179-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0179-Extend-Player-Interact-cancellation.patch => 0180-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0180-Tameable-getOwnerUniqueId-API.patch => 0181-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename patches/server/{0182-Disable-Explicit-Network-Manager-Flushing.patch => 0183-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0183-Implement-extended-PaperServerListPingEvent.patch => 0184-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/server/{0184-Improved-Async-Task-Scheduler.patch => 0185-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename patches/server/{0186-Player.setPlayerProfile-API.patch => 0187-Player.setPlayerProfile-API.patch} (100%)
 rename patches/server/{0187-getPlayerUniqueId-API.patch => 0188-getPlayerUniqueId-API.patch} (100%)
 rename patches/server/{0188-Make-player-data-saving-configurable.patch => 0189-Make-player-data-saving-configurable.patch} (100%)
 rename patches/server/{0189-Make-legacy-ping-handler-more-reliable.patch => 0190-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0190-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0191-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0191-Flag-to-disable-the-channel-limit.patch => 0192-Flag-to-disable-the-channel-limit.patch} (100%)
 rename patches/server/{0192-Add-method-to-open-already-placed-sign.patch => 0193-Add-method-to-open-already-placed-sign.patch} (100%)
 rename patches/server/{0193-Configurable-sprint-interruption-on-attack.patch => 0194-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename patches/server/{0195-EndermanEscapeEvent.patch => 0196-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0196-Enderman.teleportRandomly.patch => 0197-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0197-Block-Enderpearl-Travel-Exploit.patch => 0198-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename patches/server/{0198-Expand-World.spawnParticle-API-and-add-Builder.patch => 0199-Expand-World.spawnParticle-API-and-add-Builder.patch} (97%)
 rename patches/server/{0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0200-EndermanAttackPlayerEvent.patch => 0201-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0201-WitchConsumePotionEvent.patch => 0202-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0202-WitchThrowPotionEvent.patch => 0203-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0204-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0204-WitchReadyPotionEvent.patch => 0205-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0205-ItemStack-getMaxItemUseDuration.patch => 0206-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0206-Implement-EntityTeleportEndGatewayEvent.patch => 0207-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0208-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0208-Fix-CraftEntity-hashCode.patch => 0209-Fix-CraftEntity-hashCode.patch} (94%)
 rename patches/server/{0209-Configurable-Alternative-LootPool-Luck-Formula.patch => 0210-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0210-Print-Error-details-when-failing-to-save-player-data.patch => 0211-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0211-Make-shield-blocking-delay-configurable.patch => 0212-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/server/{0212-Improve-EntityShootBowEvent.patch => 0213-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0213-PlayerReadyArrowEvent.patch => 0214-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0214-Implement-EntityKnockbackByEntityEvent.patch => 0215-Implement-EntityKnockbackByEntityEvent.patch} (100%)
 rename patches/server/{0215-Expand-Explosions-API.patch => 0216-Expand-Explosions-API.patch} (100%)
 rename patches/server/{0216-LivingEntity-Hand-Raised-Item-Use-API.patch => 0217-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0217-RangedEntity-API.patch => 0218-RangedEntity-API.patch} (100%)
 rename patches/server/{0218-Add-config-to-disable-ender-dragon-legacy-check.patch => 0219-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0219-Implement-World.getEntity-UUID-API.patch => 0220-Implement-World.getEntity-UUID-API.patch} (100%)
 rename patches/server/{0220-InventoryCloseEvent-Reason-API.patch => 0221-InventoryCloseEvent-Reason-API.patch} (99%)
 rename patches/server/{0221-Vex-get-setSummoner-API.patch => 0222-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename patches/server/{0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0224-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename patches/server/{0224-Use-asynchronous-Log4j-2-loggers.patch => 0225-Use-asynchronous-Log4j-2-loggers.patch} (100%)
 rename patches/server/{0225-add-more-information-to-Entity.toString.patch => 0226-add-more-information-to-Entity.toString.patch} (93%)
 rename patches/server/{0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0227-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename patches/server/{0227-EnderDragon-Events.patch => 0228-EnderDragon-Events.patch} (100%)
 rename patches/server/{0228-PlayerElytraBoostEvent.patch => 0229-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0229-PlayerLaunchProjectileEvent.patch => 0230-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0230-Improve-BlockPosition-inlining.patch => 0231-Improve-BlockPosition-inlining.patch} (100%)
 rename patches/server/{0231-Optimize-IntIdentityHashBiMiap-nextId.patch => 0232-Optimize-IntIdentityHashBiMiap-nextId.patch} (100%)
 rename patches/server/{0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename patches/server/{0233-Vanished-players-don-t-have-rights.patch => 0234-Vanished-players-don-t-have-rights.patch} (100%)
 rename patches/server/{0234-Allow-disabling-armour-stand-ticking.patch => 0235-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/server/{0235-SkeletonHorse-Additions.patch => 0236-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0236-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0237-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0237-Implement-Expanded-ArmorStand-API.patch => 0238-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0238-AnvilDamageEvent.patch => 0239-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0239-Add-hand-to-bucket-events.patch => 0240-Add-hand-to-bucket-events.patch} (99%)
 rename patches/server/{0240-Add-TNTPrimeEvent.patch => 0241-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0241-Break-up-and-make-tab-spam-limits-configurable.patch => 0242-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename patches/server/{0242-MC-135506-Experience-should-save-as-Integers.patch => 0243-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename patches/server/{0243-Fix-client-rendering-skulls-from-same-user.patch => 0244-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename patches/server/{0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename patches/server/{0245-Add-Early-Warning-Feature-to-WatchDog.patch => 0246-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename patches/server/{0246-Make-EnderDragon-implement-Mob.patch => 0247-Make-EnderDragon-implement-Mob.patch} (100%)
 rename patches/server/{0247-Use-ConcurrentHashMap-in-JsonList.patch => 0248-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0248-Use-a-Queue-for-Queueing-Commands.patch => 0249-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0250-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0250-Optimize-BlockPosition-helper-methods.patch => 0251-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0252-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (100%)
 rename patches/server/{0252-Slime-Pathfinder-Events.patch => 0253-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0253-Configurable-speed-for-water-flowing-over-lava.patch => 0254-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0254-Optimize-CraftBlockData-Creation.patch => 0255-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0255-Optimize-MappedRegistry.patch => 0256-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0256-Add-PhantomPreSpawnEvent.patch => 0257-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0257-Add-More-Creeper-API.patch => 0258-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0258-Inventory-removeItemAnySlot.patch => 0259-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0260-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0260-Asynchronous-chunk-IO-and-loading.patch => 0261-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename patches/server/{0261-Add-ray-tracing-methods-to-LivingEntity.patch => 0262-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0262-Expose-attack-cooldown-methods-for-Player.patch => 0263-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0263-Improve-death-events.patch => 0264-Improve-death-events.patch} (100%)
 rename patches/server/{0264-Allow-chests-to-be-placed-with-NBT-data.patch => 0265-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0265-Mob-Pathfinding-API.patch => 0266-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0266-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0267-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0268-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0269-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0269-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0270-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0270-Implement-furnace-cook-speed-multiplier-API.patch => 0271-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0271-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0272-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0272-Honor-EntityAgeable.ageLock.patch => 0273-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0273-Configurable-connection-throttle-kick-message.patch => 0274-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0274-Hook-into-CB-plugin-rewrites.patch => 0275-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0275-Add-sun-related-API.patch => 0276-Add-sun-related-API.patch} (100%)
 rename patches/server/{0276-Add-LivingEntity-getTargetEntity.patch => 0277-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename patches/server/{0277-Turtle-API.patch => 0278-Turtle-API.patch} (100%)
 rename patches/server/{0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0279-Call-player-spectator-target-events-and-improve-impl.patch => 0280-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0280-Add-Velocity-IP-Forwarding-Support.patch => 0281-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0281-Add-more-Witch-API.patch => 0282-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0282-Check-Drowned-for-Villager-Aggression-Config.patch => 0283-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0283-Here-s-Johnny.patch => 0284-Here-s-Johnny.patch} (100%)
 rename patches/server/{0284-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0285-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename patches/server/{0285-Reset-players-airTicks-on-respawn.patch => 0286-Reset-players-airTicks-on-respawn.patch} (93%)
 rename patches/server/{0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0287-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0288-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0288-Optimize-World-Time-Updates.patch => 0289-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0289-Restore-custom-InventoryHolder-support.patch => 0290-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0290-Use-Vanilla-Minecart-Speeds.patch => 0291-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0291-Fix-SpongeAbsortEvent-handling.patch => 0292-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0292-PreSpawnerSpawnEvent.patch => 0293-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0293-Don-t-allow-digging-into-unloaded-chunks.patch => 0294-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename patches/server/{0294-Make-the-default-permission-message-configurable.patch => 0295-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/server/{0295-Prevent-rayTrace-from-loading-chunks.patch => 0296-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0296-Handle-Large-Packets-disconnecting-client.patch => 0297-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0297-force-entity-dismount-during-teleportation.patch => 0298-force-entity-dismount-during-teleportation.patch} (98%)
 rename patches/server/{0298-Add-more-Zombie-API.patch => 0299-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0299-Book-Size-Limits.patch => 0300-Book-Size-Limits.patch} (100%)
 rename patches/server/{0300-Add-PlayerConnectionCloseEvent.patch => 0301-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0301-Prevent-Enderman-from-loading-chunks.patch => 0302-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/server/{0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0305-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename patches/server/{0305-Block-Entity-remove-from-being-called-on-Players.patch => 0306-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0306-BlockDestroyEvent.patch => 0307-BlockDestroyEvent.patch} (100%)
 rename patches/server/{0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0308-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0308-Limit-Client-Sign-length-more.patch => 0309-Limit-Client-Sign-length-more.patch} (100%)
 rename patches/server/{0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0310-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (87%)
 rename patches/server/{0311-Handle-Oversized-Tile-Entities-in-chunks.patch => 0312-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0313-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename patches/server/{0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0314-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename patches/server/{0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0315-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0316-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename patches/server/{0316-Entity-getEntitySpawnReason.patch => 0317-Entity-getEntitySpawnReason.patch} (98%)
 rename patches/server/{0317-Update-entity-Metadata-for-all-tracked-players.patch => 0318-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename patches/server/{0318-Fire-event-on-GS4-query.patch => 0319-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0319-Implement-PlayerPostRespawnEvent.patch => 0320-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0321-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0321-Server-Tick-Events.patch => 0322-Server-Tick-Events.patch} (100%)
 rename patches/server/{0322-PlayerDeathEvent-getItemsToKeep.patch => 0323-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/server/{0323-Optimize-Captured-TileEntity-Lookup.patch => 0324-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename patches/server/{0324-Add-Heightmap-API.patch => 0325-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0325-Mob-Spawner-API-Enhancements.patch => 0326-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0326-Fix-CB-call-to-changed-postToMainThread-method.patch => 0327-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename patches/server/{0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0328-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0329-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename patches/server/{0329-improve-CraftWorld-isChunkLoaded.patch => 0330-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename patches/server/{0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename patches/server/{0331-ChunkMapDistance-CME.patch => 0332-ChunkMapDistance-CME.patch} (100%)
 rename patches/server/{0332-Implement-CraftBlockSoundGroup.patch => 0333-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0333-Chunk-debug-command.patch => 0334-Chunk-debug-command.patch} (100%)
 rename patches/server/{0334-Allow-Saving-of-Oversized-Chunks.patch => 0335-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0335-Fix-World-isChunkGenerated-calls.patch => 0336-Fix-World-isChunkGenerated-calls.patch} (99%)
 rename patches/server/{0336-Show-blockstate-location-if-we-failed-to-read-it.patch => 0337-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0338-Configurable-projectile-relative-velocity.patch => 0339-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0339-offset-item-frame-ticking.patch => 0340-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0340-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename patches/server/{0341-Fix-MC-158900.patch => 0342-Fix-MC-158900.patch} (100%)
 rename patches/server/{0342-Prevent-consuming-the-wrong-itemstack.patch => 0343-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0343-Generator-Settings.patch => 0344-Generator-Settings.patch} (98%)
 rename patches/server/{0344-Fix-MC-161754.patch => 0345-Fix-MC-161754.patch} (100%)
 rename patches/server/{0345-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename patches/server/{0346-Expose-the-internal-current-tick.patch => 0347-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename patches/server/{0348-Add-option-to-disable-pillager-patrols.patch => 0349-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0350-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename patches/server/{0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0351-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0351-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0352-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0352-Duplicate-UUID-Resolve-Option.patch => 0353-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename patches/server/{0353-Optimize-Hoppers.patch => 0354-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0354-PlayerDeathEvent-shouldDropExperience.patch => 0355-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/server/{0355-Prevent-bees-loading-chunks-checking-hive-position.patch => 0356-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0357-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0357-Guard-against-serializing-mismatching-chunk-coordina.patch => 0358-Guard-against-serializing-mismatching-chunk-coordina.patch} (97%)
 rename patches/server/{0358-Optimise-IEntityAccess-getPlayerByUUID.patch => 0359-Optimise-IEntityAccess-getPlayerByUUID.patch} (94%)
 rename patches/server/{0359-Fix-items-not-falling-correctly.patch => 0360-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0360-Lag-compensate-eating.patch => 0361-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0361-Optimize-call-to-getFluid-for-explosions.patch => 0362-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0363-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0363-Add-effect-to-block-break-naturally.patch => 0364-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0364-Entity-Activation-Range-2.0.patch => 0365-Entity-Activation-Range-2.0.patch} (99%)
 rename patches/server/{0365-Increase-Light-Queue-Size.patch => 0366-Increase-Light-Queue-Size.patch} (100%)
 rename patches/server/{0366-Fix-Light-Command.patch => 0367-Fix-Light-Command.patch} (98%)
 rename patches/server/{0367-Anti-Xray.patch => 0368-Anti-Xray.patch} (99%)
 rename patches/server/{0368-No-Tick-view-distance-implementation.patch => 0369-No-Tick-view-distance-implementation.patch} (99%)
 rename patches/server/{0369-Implement-alternative-item-despawn-rate.patch => 0370-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0370-Tracking-Range-Improvements.patch => 0371-Tracking-Range-Improvements.patch} (97%)
 rename patches/server/{0371-Fix-items-vanishing-through-end-portal.patch => 0372-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename patches/server/{0372-implement-optional-per-player-mob-spawns.patch => 0373-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0373-Avoid-hopper-searches-if-there-are-no-items.patch => 0374-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename patches/server/{0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0375-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0376-Add-debug-for-sync-chunk-loads.patch => 0377-Add-debug-for-sync-chunk-loads.patch} (99%)
 rename patches/server/{0377-Allow-overriding-the-java-version-check.patch => 0378-Allow-overriding-the-java-version-check.patch} (100%)
 rename patches/server/{0378-Add-ThrownEggHatchEvent.patch => 0379-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0379-Optimise-random-block-ticking.patch => 0380-Optimise-random-block-ticking.patch} (99%)
 rename patches/server/{0380-Entity-Jump-API.patch => 0381-Entity-Jump-API.patch} (100%)
 rename patches/server/{0381-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0382-Add-option-to-nerf-pigmen-from-nether-portals.patch} (97%)
 rename patches/server/{0382-Make-the-GUI-graph-fancier.patch => 0383-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0383-add-hand-to-BlockMultiPlaceEvent.patch => 0384-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0384-Prevent-teleporting-dead-entities.patch => 0385-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0385-Validate-tripwire-hook-placement-before-update.patch => 0386-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0387-Configurable-chance-of-villager-zombie-infection.patch => 0388-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0388-Optimise-Chunk-getFluid.patch => 0389-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0389-Optimise-TickListServer-by-rewriting-it.patch => 0390-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename patches/server/{0390-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0391-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0392-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0393-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (93%)
 rename patches/server/{0394-Optimize-Collision-to-not-load-chunks.patch => 0395-Optimize-Collision-to-not-load-chunks.patch} (98%)
 rename patches/server/{0395-Don-t-tick-dead-players.patch => 0396-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0396-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0397-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (99%)
 rename patches/server/{0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (99%)
 rename patches/server/{0399-Don-t-move-existing-players-to-world-spawn.patch => 0400-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0400-Add-tick-times-API-and-mspt-command.patch => 0401-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0401-Expose-MinecraftServer-isRunning.patch => 0402-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0402-Add-Raw-Byte-ItemStack-Serialization.patch => 0403-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0403-Remove-streams-from-Mob-AI-System.patch => 0404-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename patches/server/{0404-Async-command-map-building.patch => 0405-Async-command-map-building.patch} (100%)
 rename patches/server/{0405-Improved-Watchdog-Support.patch => 0406-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0406-Optimize-Pathfinding.patch => 0407-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0407-Reduce-Either-Optional-allocation.patch => 0408-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0408-Remove-streams-from-PairedQueue.patch => 0409-Remove-streams-from-PairedQueue.patch} (100%)
 rename patches/server/{0409-Reduce-memory-footprint-of-NBTTagCompound.patch => 0410-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0410-Prevent-opening-inventories-when-frozen.patch => 0411-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0411-Optimise-ArraySetSorted-removeIf.patch => 0412-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0412-Don-t-run-entity-collision-code-if-not-needed.patch => 0413-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0413-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0414-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename patches/server/{0414-Implement-Player-Client-Options-API.patch => 0415-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0415-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0416-Fix-Chunk-Post-Processing-deadlock-risk.patch} (97%)
 rename patches/server/{0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0417-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0417-Broadcast-join-message-to-console.patch => 0418-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename patches/server/{0419-Load-Chunks-for-Login-Asynchronously.patch => 0420-Load-Chunks-for-Login-Asynchronously.patch} (99%)
 rename patches/server/{0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (93%)
 rename patches/server/{0421-Add-PlayerAttackEntityCooldownResetEvent.patch => 0422-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (95%)
 rename patches/server/{0423-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0424-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0424-Add-phantom-creative-and-insomniac-controls.patch => 0425-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (98%)
 rename patches/server/{0426-Implement-Brigadier-Mojang-API.patch => 0427-Implement-Brigadier-Mojang-API.patch} (100%)
 rename patches/server/{0427-Villager-Restocks-API.patch => 0428-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0428-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0429-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0429-Expose-game-version.patch => 0430-Expose-game-version.patch} (100%)
 rename patches/server/{0430-Optimize-Voxel-Shape-Merging.patch => 0431-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0432-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0432-Implement-Mob-Goal-API.patch => 0433-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0433-Use-distance-map-to-optimise-entity-tracker.patch => 0434-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0434-Optimize-isOutsideRange-to-use-distance-maps.patch => 0435-Optimize-isOutsideRange-to-use-distance-maps.patch} (99%)
 rename patches/server/{0435-Add-villager-reputation-API.patch => 0436-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0436-Option-for-maximum-exp-value-when-merging-orbs.patch => 0437-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0437-ExperienceOrbMergeEvent.patch => 0438-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0438-Fix-PotionEffect-ignores-icon-flag.patch => 0439-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0439-Optimize-brigadier-child-sorting-performance.patch => 0440-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0440-Potential-bed-API.patch => 0441-Potential-bed-API.patch} (100%)
 rename patches/server/{0441-Wait-for-Async-Tasks-during-shutdown.patch => 0442-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0442-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0443-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0444-Reduce-MutableInt-allocations-from-light-engine.patch => 0445-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename patches/server/{0446-Ensure-safe-gateway-teleport.patch => 0447-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0447-Add-option-for-console-having-all-permissions.patch => 0448-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (98%)
 rename patches/server/{0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0450-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename patches/server/{0450-Fix-villager-trading-demand-MC-163962.patch => 0451-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0451-Maps-shouldn-t-load-chunks.patch => 0452-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0453-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename patches/server/{0454-Optimize-Bit-Operations-by-inlining.patch => 0455-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0456-Fix-missing-chunks-due-to-integer-overflow.patch => 0457-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0458-Fix-piston-physics-inconsistency-MC-188840.patch => 0459-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0459-Fix-sand-duping.patch => 0460-Fix-sand-duping.patch} (94%)
 rename patches/server/{0460-Prevent-position-desync-in-playerconnection-causing-.patch => 0461-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0461-Inventory-getHolder-method-without-block-snapshot.patch => 0462-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0462-Expose-Arrow-getItemStack.patch => 0463-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0463-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0464-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0464-Hide-sync-chunk-writes-behind-flag.patch => 0465-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0465-Add-permission-for-command-blocks.patch => 0466-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0466-Ensure-Entity-AABB-s-are-never-invalid.patch => 0467-Ensure-Entity-AABB-s-are-never-invalid.patch} (94%)
 rename patches/server/{0467-Optimize-WorldBorder-collision-checks-and-air.patch => 0468-Optimize-WorldBorder-collision-checks-and-air.patch} (97%)
 rename patches/server/{0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename patches/server/{0469-Paper-dumpitem-command.patch => 0470-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0470-Don-t-allow-null-UUID-s-for-chat.patch => 0471-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0471-Improve-Legacy-Component-serialization-size.patch => 0472-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0472-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0473-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0473-Support-old-UUID-format-for-NBT.patch => 0474-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0474-Clean-up-duplicated-GameProfile-Properties.patch => 0475-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0475-Convert-legacy-attributes-in-Item-Meta.patch => 0476-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0476-Remove-some-streams-from-structures.patch => 0477-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0477-Remove-streams-from-classes-related-villager-gossip.patch => 0478-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0478-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0479-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename patches/server/{0479-Support-components-in-ItemMeta.patch => 0480-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0481-Add-entity-liquid-API.patch => 0482-Add-entity-liquid-API.patch} (95%)
 rename patches/server/{0482-Update-itemstack-legacy-name-and-lore.patch => 0483-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0483-Spawn-player-in-correct-world-on-login.patch => 0484-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0484-Add-PrepareResultEvent.patch => 0485-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0485-Allow-delegation-to-vanilla-chunk-gen.patch => 0486-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename patches/server/{0488-Optimize-NetworkManager-Exception-Handling.patch => 0489-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0489-Optimize-the-advancement-data-player-iteration-to-be.patch => 0490-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0490-Fix-arrows-never-despawning-MC-125757.patch => 0491-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0491-Thread-Safe-Vanilla-Command-permission-checking.patch => 0492-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0492-Move-range-check-for-block-placing-up.patch => 0493-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0493-Fix-SPIGOT-5989.patch => 0494-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0498-Fix-some-rails-connecting-improperly.patch => 0499-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0499-Fix-MC-187716-Use-configured-height.patch => 0500-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0501-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0502-Do-not-let-the-server-load-chunks-from-newer-version.patch} (96%)
 rename patches/server/{0502-Brand-support.patch => 0503-Brand-support.patch} (100%)
 rename patches/server/{0503-Add-setMaxPlayers-API.patch => 0504-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0504-Add-playPickupItemAnimation-to-LivingEntity.patch => 0505-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0505-Don-t-require-FACING-data.patch => 0506-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0507-Add-moon-phase-API.patch => 0508-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0508-Prevent-headless-pistons-from-being-created.patch => 0509-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0509-Add-BellRingEvent.patch => 0510-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0510-Add-zombie-targets-turtle-egg-config.patch => 0511-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0511-Buffer-joins-to-world.patch => 0512-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0512-Optimize-redstone-algorithm.patch => 0513-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0513-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0514-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0514-PortalCreateEvent-needs-to-know-its-entity.patch => 0515-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0515-Fix-CraftTeam-null-check.patch => 0516-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0516-Add-more-Evoker-API.patch => 0517-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0517-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename patches/server/{0518-Create-HoverEvent-from-ItemStack-Entity.patch => 0519-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0519-Cache-block-data-strings.patch => 0520-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0521-Add-additional-open-container-api-to-HumanEntity.patch => 0522-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0523-Extend-block-drop-capture-to-capture-all-items-added.patch => 0524-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0526-Lazily-track-plugin-scoreboards-by-default.patch => 0527-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0527-Entity-isTicking.patch => 0528-Entity-isTicking.patch} (100%)
 rename patches/server/{0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0529-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename patches/server/{0530-Fix-Concurrency-issue-in-WeightedList.patch => 0531-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0531-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0532-Fix-for-large-move-vectors-crashing-server.patch => 0533-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0533-Optimise-getType-calls.patch => 0534-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0534-Villager-resetOffers.patch => 0535-Villager-resetOffers.patch} (100%)
 rename patches/server/{0535-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0536-Retain-block-place-order-when-capturing-blockstates.patch => 0537-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0537-Reduce-blockpos-allocation-from-pathfinding.patch => 0538-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0538-Fix-item-locations-dropped-from-campfires.patch => 0539-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0539-Player-elytra-boost-API.patch => 0540-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0540-Fixed-TileEntityBell-memory-leak.patch => 0541-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0541-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0542-Add-getOfflinePlayerIfCached-String.patch => 0543-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0543-Add-ignore-discounts-API.patch => 0544-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0544-Toggle-for-removing-existing-dragon.patch => 0545-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0545-Fix-client-lag-on-advancement-loading.patch => 0546-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0546-Item-no-age-no-player-pickup.patch => 0547-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0547-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0548-Beacon-API-custom-effect-ranges.patch => 0549-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0549-Add-API-for-quit-reason.patch => 0550-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0550-Seed-based-feature-search.patch => 0551-Seed-based-feature-search.patch} (100%)
 rename patches/server/{0551-Add-Wandering-Trader-spawn-rate-config-options.patch => 0552-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0552-Significantly-improve-performance-of-the-end-generat.patch => 0553-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0553-Expose-world-spawn-angle.patch => 0554-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0554-Add-Destroy-Speed-API.patch => 0555-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0556-Add-LivingEntity-clearActiveItem.patch => 0557-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0557-Add-PlayerItemCooldownEvent.patch => 0558-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0558-More-lightning-API.patch => 0559-More-lightning-API.patch} (100%)
 rename patches/server/{0559-Climbing-should-not-bypass-cramming-gamerule.patch => 0560-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0560-Added-missing-default-perms-for-commands.patch => 0561-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0561-Add-PlayerShearBlockEvent.patch => 0562-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0562-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0563-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0563-Fix-curing-zombie-villager-discount-exploit.patch => 0564-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0564-Limit-recipe-packets.patch => 0565-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0565-Fix-CraftSound-backwards-compatibility.patch => 0566-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0566-MC-4-Fix-item-position-desync.patch => 0567-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0567-Player-Chunk-Load-Unload-Events.patch => 0568-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0568-Optimize-Dynamic-get-Missing-Keys.patch => 0569-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0569-Expose-LivingEntity-hurt-direction.patch => 0570-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0570-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0571-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0572-added-PlayerTradeEvent.patch => 0573-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0573-Implement-TargetHitEvent.patch => 0574-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0574-Additional-Block-Material-API-s.patch => 0575-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0575-Fix-harming-potion-dupe.patch => 0576-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0576-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0577-Cache-burn-durations.patch => 0578-Cache-burn-durations.patch} (100%)
 rename patches/server/{0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0579-Fix-Not-a-string-Map-Conversion-spam.patch => 0580-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0580-Implement-PlayerFlowerPotManipulateEvent.patch => 0581-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0581-Fix-interact-event-not-being-called-in-adventure.patch => 0582-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0582-Zombie-API-breaking-doors.patch => 0583-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0583-Fix-nerfed-slime-when-splitting.patch => 0584-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0584-Add-EntityLoadCrossbowEvent.patch => 0585-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0585-Guardian-beam-workaround.patch => 0586-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0586-Added-WorldGameRuleChangeEvent.patch => 0587-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0587-Added-ServerResourcesReloadedEvent.patch => 0588-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0588-Added-world-settings-for-mobs-picking-up-loot.patch => 0589-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0589-Implemented-BlockFailedDispenseEvent.patch => 0590-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0590-Added-PlayerLecternPageChangeEvent.patch => 0591-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0591-Added-PlayerLoomPatternSelectEvent.patch => 0592-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0592-Configurable-door-breaking-difficulty.patch => 0593-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0593-Empty-commands-shall-not-be-dispatched.patch => 0594-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0594-Implement-API-to-expose-exact-interaction-point.patch => 0595-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0595-Remove-stale-POIs.patch => 0596-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0596-Fix-villager-boat-exploit.patch => 0597-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0597-Add-sendOpLevel-API.patch => 0598-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0598-Add-StructureLocateEvent.patch => 0599-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0599-Collision-option-for-requiring-a-player-participant.patch => 0600-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0600-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0601-Return-chat-component-with-empty-text-instead-of-thr.patch => 0602-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0602-Make-schedule-command-per-world.patch => 0603-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0603-Configurable-max-leash-distance.patch => 0604-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0604-Implement-BlockPreDispenseEvent.patch => 0605-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0605-Added-Vanilla-Entity-Tags.patch => 0606-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/server/{0606-added-Wither-API.patch => 0607-added-Wither-API.patch} (100%)
 rename patches/server/{0607-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0608-Fix-console-spam-when-removing-chests-in-water.patch => 0609-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0609-Add-toggle-for-always-placing-the-dragon-egg.patch => 0610-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0610-Added-PlayerStonecutterRecipeSelectEvent.patch => 0611-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0612-Skip-distance-map-update-when-spawning-disabled.patch => 0613-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename patches/server/{0613-Reset-shield-blocking-on-dimension-change.patch => 0614-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0614-add-DragonEggFormEvent.patch => 0615-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0615-EntityMoveEvent.patch => 0616-EntityMoveEvent.patch} (100%)
 rename patches/server/{0616-added-option-to-disable-pathfinding-updates-on-block.patch => 0617-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0617-Inline-shift-direction-fields.patch => 0618-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0618-Allow-adding-items-to-BlockDropItemEvent.patch => 0619-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0620-living-entity-allow-attribute-registration.patch => 0621-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0621-fix-dead-slime-setSize-invincibility.patch => 0622-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0622-Merchant-getRecipes-should-return-an-immutable-list.patch => 0623-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0623-misc-debugging-dumps.patch => 0624-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0624-Add-support-for-hex-color-codes-in-console.patch => 0625-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0625-Expose-Tracked-Players.patch => 0626-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0626-Remove-streams-from-SensorNearest.patch => 0627-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0627-MC-29274-Fix-Wither-hostility-towards-players.patch => 0628-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0628-Throw-proper-exception-on-empty-JsonList-file.patch => 0629-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0629-Improve-ServerGUI.patch => 0630-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0630-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0631-fix-converting-txt-to-json-file.patch => 0632-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0632-Add-worldborder-events.patch => 0633-Add-worldborder-events.patch} (100%)
 rename patches/server/{0633-added-PlayerNameEntityEvent.patch => 0634-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0634-Prevent-grindstones-from-overstacking-items.patch => 0635-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0635-Add-recipe-to-cook-events.patch => 0636-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0636-Add-Block-isValidTool.patch => 0637-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0637-Allow-using-signs-inside-spawn-protection.patch => 0638-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0638-Implement-Keyed-on-World.patch => 0639-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0639-Add-fast-alternative-constructor-for-Rotations.patch => 0640-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0640-Item-Rarity-API.patch => 0641-Item-Rarity-API.patch} (100%)
 rename patches/server/{0641-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0642-copy-TESign-isEditable-from-snapshots.patch => 0643-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0643-Drop-carried-item-when-player-has-disconnected.patch => 0644-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0644-forced-whitelist-use-configurable-kick-message.patch => 0645-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0645-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0646-fix-cancelling-block-falling-causing-client-desync.patch => 0647-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0647-Expose-protocol-version.patch => 0648-Expose-protocol-version.patch} (100%)
 rename patches/server/{0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0649-Enhance-console-tab-completions-for-brigadier-comman.patch => 0650-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0651-Add-bypass-host-check.patch => 0652-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0652-Set-area-affect-cloud-rotation.patch => 0653-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0653-add-isDeeplySleeping-to-HumanEntity.patch => 0654-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0654-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0655-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0655-add-consumeFuel-to-FurnaceBurnEvent.patch => 0656-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0656-add-get-set-drop-chance-to-EntityEquipment.patch => 0657-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0657-fix-PigZombieAngerEvent-cancellation.patch => 0658-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0658-Fix-checkReach-check-for-Shulker-boxes.patch => 0659-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0659-fix-PlayerItemHeldEvent-firing-twice.patch => 0660-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0660-Added-PlayerDeepSleepEvent.patch => 0661-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0661-More-World-API.patch => 0662-More-World-API.patch} (100%)
 rename patches/server/{0662-Added-PlayerBedFailEnterEvent.patch => 0663-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0663-Implement-methods-to-convert-between-Component-and-B.patch => 0664-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0665-Introduce-beacon-activation-deactivation-events.patch => 0666-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0666-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0667-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0667-Add-Channel-initialization-listeners.patch => 0668-Add-Channel-initialization-listeners.patch} (94%)
 rename patches/server/{0668-Send-empty-commands-if-tab-completion-is-disabled.patch => 0669-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0669-Add-more-WanderingTrader-API.patch => 0670-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0670-Add-EntityBlockStorage-clearEntities.patch => 0671-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0673-Inventory-close.patch => 0674-Inventory-close.patch} (100%)
 rename patches/server/{0674-call-PortalCreateEvent-players-and-end-platform.patch => 0675-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0676-Fix-CraftPotionBrewer-cache.patch => 0677-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0677-Add-basic-Datapack-API.patch => 0678-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0678-Add-environment-variable-to-disable-server-gui.patch => 0679-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0679-additions-to-PlayerGameModeChangeEvent.patch => 0680-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0680-Clear-SyncLoadInfo.patch => 0681-Clear-SyncLoadInfo.patch} (100%)
 rename patches/server/{0681-ItemStack-repair-check-API.patch => 0682-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0682-More-Enchantment-API.patch => 0683-More-Enchantment-API.patch} (100%)
 rename patches/server/{0683-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0684-Fix-and-optimise-world-force-upgrading.patch => 0685-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0685-Add-Mob-lookAt-API.patch => 0686-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0686-Add-Unix-domain-socket-support.patch => 0687-Add-Unix-domain-socket-support.patch} (97%)
 rename patches/server/{0687-Add-EntityInsideBlockEvent.patch => 0688-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0688-Attributes-API-for-item-defaults.patch => 0689-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0689-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0690-Add-cause-to-Weather-ThunderChangeEvents.patch => 0691-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0691-More-Lidded-Block-API.patch => 0692-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0692-Limit-item-frame-cursors-on-maps.patch => 0693-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0693-Add-PufferFishStateChangeEvent.patch => 0694-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0694-Add-PlayerKickEvent-causes.patch => 0695-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0695-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0696-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0697-Add-option-to-fix-items-merging-through-walls.patch => 0698-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0698-Add-BellRevealRaiderEvent.patch => 0699-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0699-Fix-invulnerable-end-crystals.patch => 0700-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0700-Add-ElderGuardianAppearanceEvent.patch => 0701-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0701-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0702-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0702-Fix-dangerous-end-portal-logic.patch => 0703-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0704-Make-item-validations-configurable.patch => 0705-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0705-Add-more-line-of-sight-methods.patch => 0706-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/server/{0706-add-per-world-spawn-limits.patch => 0707-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0707-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0708-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
new file mode 100644
index 0000000000..a23cfb9f34
--- /dev/null
+++ b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 16 May 2016 23:19:16 -0400
+Subject: [PATCH] Avoid blocking on Network Manager creation
+
+Per Paper issue 294
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+index 8fffe354d40c5fac4daa03af87c2323e307bd3ea..abcd335f5577dae6d613e5e0dd2656e1ab3ee9f0 100644
+--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
++++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+@@ -61,6 +61,15 @@ public class ServerConnectionListener {
+     public volatile boolean running;
+     private final List<ChannelFuture> channels = Collections.synchronizedList(Lists.newArrayList());
+     final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
++    // Paper start - prevent blocking on adding a new network manager while the server is ticking
++    private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
++    private final void addPending() {
++        Connection manager = null;
++        while ((manager = pending.poll()) != null) {
++            connections.add(manager);
++        }
++    }
++    // Paper end
+ 
+     public ServerConnectionListener(MinecraftServer server) {
+         this.server = server;
+@@ -96,7 +105,8 @@ public class ServerConnectionListener {
+                     int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
+                     Object object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND);
+ 
+-                    ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
++                    // ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
++                    pending.add((Connection) object); // Paper
+                     channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
+                     ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
+                 }
+@@ -155,6 +165,7 @@ public class ServerConnectionListener {
+ 
+         synchronized (this.connections) {
+             // Spigot Start
++            this.addPending(); // Paper
+             // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
+             if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
+             {
diff --git a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 24d14ed9f5..55abd4d655 100644
--- a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 95682f63c7ae1460b069e13f11295f72c1f262a8..b2bd204879badfe1cab6bea9db2d6c412505a9ce 100644
+index c70b4727fe0ae9ff7b9db08a9711272994159b96..87f5f4108796aa12b454bbf39b8c1d699bac78f2 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -100,7 +100,7 @@ public class GameProfileCache {
diff --git a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0103-Configurable-packet-in-spam-threshold.patch b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
similarity index 96%
rename from patches/server/0103-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0104-Configurable-packet-in-spam-threshold.patch
index 302ac0bc5a..b67b855a64 100644
--- a/patches/server/0103-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
@@ -23,7 +23,7 @@ index c52dc0346f93527965ef29a0ccdc4bf3debe302e..64d7c9058ee757a6d3cf3b648596092a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fa6d414387950d522243370714d5425f09e351e8..b1285521d41e09fcb99c836a90b4f8b6a121ba98 100644
+index 8e751e9821dc76f33e9e844990c701f69c817c4b..13077dcc0ce4e7cfa8146ee71db4c2cce9e36f4a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1496,13 +1496,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0104-Configurable-flying-kick-messages.patch b/patches/server/0105-Configurable-flying-kick-messages.patch
similarity index 96%
rename from patches/server/0104-Configurable-flying-kick-messages.patch
rename to patches/server/0105-Configurable-flying-kick-messages.patch
index 82277164d7..d6c717ce3d 100644
--- a/patches/server/0104-Configurable-flying-kick-messages.patch
+++ b/patches/server/0105-Configurable-flying-kick-messages.patch
@@ -21,7 +21,7 @@ index 64d7c9058ee757a6d3cf3b648596092a810e105c..4e2f243faa209925dcb7c3ef89df3ed8
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 37a25af3697e06a7f8aeaf462fbf50f8bc250dd3..b33ef48a4372dd8ac4a86bdd386a5a7d42583c72 100644
+index 13077dcc0ce4e7cfa8146ee71db4c2cce9e36f4a..d05f284b943340fef24481adaa4da4e6d9e0169d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -302,7 +302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0105-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/server/0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from patches/server/0105-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to patches/server/0106-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/patches/server/0106-Auto-fix-bad-Y-levels-on-player-login.patch b/patches/server/0107-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 91%
rename from patches/server/0106-Auto-fix-bad-Y-levels-on-player-login.patch
rename to patches/server/0107-Auto-fix-bad-Y-levels-on-player-login.patch
index a26e728784..a625bd3ac7 100644
--- a/patches/server/0106-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/patches/server/0107-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f48d7205242fc38c00e496c88090e0e98e394b39..c60d42c835ed9a1bcc938aa1647c5266b87a05c5 100644
+index e512cd033317ce2e1437c0ac28f71db47703bc57..3c51b0c3c0cdb55852ca9d9f1609518d5905589a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -401,6 +401,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0107-Option-to-remove-corrupt-tile-entities.patch b/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
similarity index 100%
rename from patches/server/0107-Option-to-remove-corrupt-tile-entities.patch
rename to patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
diff --git a/patches/server/0108-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
similarity index 95%
rename from patches/server/0108-Add-EntityZapEvent.patch
rename to patches/server/0109-Add-EntityZapEvent.patch
index e449ca9ca2..917f292244 100644
--- a/patches/server/0108-Add-EntityZapEvent.patch
+++ b/patches/server/0109-Add-EntityZapEvent.patch
@@ -21,7 +21,7 @@ index d414b111386e18dec8992b510b93c19ece8d60dd..2c95b6eddfe46e5d2ad495bfc86ccc24
              if (CraftEventFactory.callPigZapEvent(this, lightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index df8c953fffcc6063abd1929b8d3a07943da86e21..731aea63eedb8cb37291bb2238ff8ab2e3a5f6eb 100644
+index e61abd923cc1ca469f01249563da7ff31ead7bdd..f7b3b11bd6b395d199e725bc0c0192c28cc3cd86 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -826,9 +826,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -44,7 +44,7 @@ index df8c953fffcc6063abd1929b8d3a07943da86e21..731aea63eedb8cb37291bb2238ff8ab2
              entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
              entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e96ce62978e2cca454f797c4ce1ab1d306f9d7e4..68a3cc357a7f2a837d434a4defc0eeb9a2dc7c31 100644
+index ae12d4a7b56ec70ac5f529e0f336019e97f667ce..8e9ae16441057fb5e42154c081f8677f4575587d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1098,6 +1098,14 @@ public class CraftEventFactory {
diff --git a/patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 96%
rename from patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 0cef3ad756..194ae62399 100644
--- a/patches/server/0109-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -22,7 +22,7 @@ index 96247356d7888d5681bff60567add1188aedb18b..e83216be5a00d5b927d8c2fc364551bd
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index eb838fcad0593573f536d5e043cbd3f4bbe25d74..2332a00780edcf054ec63a60a42962033d0cc74a 100644
+index 6c262832ba5259ec92d336114c203c254a39924c..0d476aa50170ad3623462306769020518c55cffb 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -308,6 +308,18 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0110-Cache-user-authenticator-threads.patch b/patches/server/0111-Cache-user-authenticator-threads.patch
similarity index 97%
rename from patches/server/0110-Cache-user-authenticator-threads.patch
rename to patches/server/0111-Cache-user-authenticator-threads.patch
index 01bdd6b870..8709457081 100644
--- a/patches/server/0110-Cache-user-authenticator-threads.patch
+++ b/patches/server/0111-Cache-user-authenticator-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 11c0da9b36aecc1a7d3acb2dccdae962426dd2e7..3e57eb2e50f94085fd23b54a54d4cf7a0b7919c7 100644
+index 0df683b7503d4c34fc8af33b82a4440383702043..16c1cf342532988d3e319fb41cc4dbde09403e1a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -117,6 +117,18 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0111-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
similarity index 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 96%
rename from patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index 2ff5ffaa3c..28f8911dc0 100644
--- a/patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index ec47da6c086a6f6640ea2f41d766c900fa992459..919fbe73f46238a1846c969bf64c309f
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 68a3cc357a7f2a837d434a4defc0eeb9a2dc7c31..f32a2a96da71c1cbcf0d153d882ff60ca66ffd2a 100644
+index 8e9ae16441057fb5e42154c081f8677f4575587d..2f6aef39f1f9f3da09a596936f57e1cf51c9d6db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1057,6 +1057,17 @@ public class CraftEventFactory {
diff --git a/patches/server/0113-Don-t-let-fishinghooks-use-portals.patch b/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from patches/server/0113-Don-t-let-fishinghooks-use-portals.patch
rename to patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
similarity index 97%
rename from patches/server/0114-Add-ProjectileCollideEvent.patch
rename to patches/server/0115-Add-ProjectileCollideEvent.patch
index 67389db8d6..90e592d68c 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0115-Add-ProjectileCollideEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 676e5ad3a23bfdccd8f5f7bb9e79c3fa004dc95f..71f0de893fe0243cc226fd36685f2a3fba02575f 100644
+index 97a4d3b3709028d322617efdfe9a5aabe2197d82..65faf775b786f9c237ee33c1fb0f8ab9f37d738c 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -225,6 +225,17 @@ public abstract class AbstractArrow extends Projectile {
@@ -87,7 +87,7 @@ index f81be1c6a5efc5090fbb8832f44dbb2ae6aa2f4a..8e81b19706a14c21b5ffdc4f12818fe7
  
          this.checkInsideBlocks();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f32a2a96da71c1cbcf0d153d882ff60ca66ffd2a..1fce91a05a6b04a8d93d2707637c5b96c318a641 100644
+index 2f6aef39f1f9f3da09a596936f57e1cf51c9d6db..deb331a95d1c8e53c21e2ab68f205c2427cdbef4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1201,6 +1201,16 @@ public class CraftEventFactory {
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0119-Optimize-ItemStack.isEmpty.patch b/patches/server/0120-Optimize-ItemStack.isEmpty.patch
similarity index 90%
rename from patches/server/0119-Optimize-ItemStack.isEmpty.patch
rename to patches/server/0120-Optimize-ItemStack.isEmpty.patch
index 01d8825e96..cea59f6d21 100644
--- a/patches/server/0119-Optimize-ItemStack.isEmpty.patch
+++ b/patches/server/0120-Optimize-ItemStack.isEmpty.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d3267cdef523b62f9985e49b768e6ad22fbe874d..4d4b471bbfb2d9174391c8adc6075ec11295408b 100644
+index bbaf615a150bc9c1ad61d509209350eec922a9f2..55e2ac3fc3d6e1da40f766ac42c9ca24b8b6e872 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -241,7 +241,7 @@ public final class ItemStack {
diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 95%
rename from patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 4c9bea0528..21b0ca0238 100644
--- a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index fd2d0eaa190068646250956c4d5e5e9aeee7b1e4..ef382aaeb86ca41356a076ff4adfe5fb652b43c5 100644
+index bca3388c51917bd7b690c42e63c20f98d38c5baf..de2ec66790b3e86b9e8feff56b28697695b0ab2c 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -92,6 +92,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0121-String-based-Action-Bar-API.patch b/patches/server/0122-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/server/0121-String-based-Action-Bar-API.patch
rename to patches/server/0122-String-based-Action-Bar-API.patch
diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/server/0123-Properly-fix-item-duplication-bug.patch
similarity index 88%
rename from patches/server/0122-Properly-fix-item-duplication-bug.patch
rename to patches/server/0123-Properly-fix-item-duplication-bug.patch
index 220ce9ab61..b789a87f73 100644
--- a/patches/server/0122-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0123-Properly-fix-item-duplication-bug.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4ea1e8b1442c9dc9d282b8cb51c2e588fe4b19a7..ce77dc9e046be1e22d2a6d485d8f17a5fd11949e 100644
+index 3c51b0c3c0cdb55852ca9d9f1609518d5905589a..a580ac8a39612f7b2cc9aad2815e987d4ba77b42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2117,7 +2117,7 @@ public class ServerPlayer extends Player {
@@ -19,7 +19,7 @@ index 4ea1e8b1442c9dc9d282b8cb51c2e588fe4b19a7..ce77dc9e046be1e22d2a6d485d8f17a5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 35aa8b40a26a5941d07421f96b424b975a32224e..55cd070c2dbf4cf4d8d0fc62067e9bde69ac7e84 100644
+index d05f284b943340fef24481adaa4da4e6d9e0169d..a6891c43b674919eecaac5e826b4d979478b300c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2822,7 +2822,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0123-Firework-API-s.patch b/patches/server/0124-Firework-API-s.patch
similarity index 100%
rename from patches/server/0123-Firework-API-s.patch
rename to patches/server/0124-Firework-API-s.patch
diff --git a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch b/patches/server/0125-PlayerTeleportEndGatewayEvent.patch
similarity index 95%
rename from patches/server/0124-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0125-PlayerTeleportEndGatewayEvent.patch
index 99e4760063..6b50c5ecd4 100644
--- a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0125-PlayerTeleportEndGatewayEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index cf57c89db3082edf22bad89a3e2f1974f682aaa6..2bf65c8da827c6bdbfb74a9d8ee5754584c40c53 100644
+index fe33ed6fde98de61a9db594e8752b978b16db3e4..07c786b3988a2cc3a7bd3910dd909b887395a194 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -11,6 +11,7 @@ import net.minecraft.data.worldgen.Features;
diff --git a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/server/0127-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/0126-Enforce-Sync-Player-Saves.patch
rename to patches/server/0127-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 90%
rename from patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
rename to patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
index 00b383f456..29f31ca4b4 100644
--- a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a015bee73ae4d0aebeb12beb50f6f6d9b1758805..739fee2b1f9df1dd13f7a0f9acb27fc5d40c16a5 100644
+index 3cc6b1afe465ca57df2f22d4d735a95439174e30..7f080d8aac9198dd935a8af090ee82f618551203 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2240,6 +2240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 98%
rename from patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 26eef0feb7..6a64c09fd0 100644
--- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -129,7 +129,7 @@ index 919fbe73f46238a1846c969bf64c309f3b9ad9d6..9662104a85faff2cdafd8cf001a82221
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 041a61e037e7f6fddd94567f2954be600c737811..971e4c6d742e0c63b3c5dfa6d87b2468f8ce5010 100644
+index 2654ff0b458df689d1d27f9e4d3e3b56dc1296da..70804eb057cc7d6605e045baf6b9ffdb8cb2d477 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1699,7 +1699,8 @@ public abstract class LivingEntity extends Entity {
@@ -169,7 +169,7 @@ index 0fd1dfacca88cd5399e05cb7ebc0150491e8f59c..c1cdb1905536bda76f34ad3fc7969964
                      // CraftBukkit end
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 593442f0f2d58e2e0a0a86d6f16aea90cc36d184..b782d278463a72b8514719e9b14986f268828772 100644
+index bae8340abda9f400450c835946b30aacec261f6d..fa551b1338a21b7b0864bdb9f31cb365c918facf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -455,7 +455,7 @@ public class Turtle extends Animal {
@@ -182,7 +182,7 @@ index 593442f0f2d58e2e0a0a86d6f16aea90cc36d184..b782d278463a72b8514719e9b14986f2
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 9d6d8bf5f38ec11f26665ae676c46e4ef089670b..e286d4ed03eba05b862741cb98db8a031224cd98 100644
+index 9d5b78880ea9d7efb8a6c5ffa26122e08b45f494..401a105a161c23a8d3fe45d0a7c845072afb8bd9 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -634,7 +634,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -204,7 +204,7 @@ index 9d6d8bf5f38ec11f26665ae676c46e4ef089670b..e286d4ed03eba05b862741cb98db8a03
  
              if (this.dragonFight != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 731aea63eedb8cb37291bb2238ff8ab2e3a5f6eb..6a9e2105b2d9a4ee83c0a2516d5ef26dc3b99053 100644
+index f7b3b11bd6b395d199e725bc0c0192c28cc3cd86..98085ea2b5baf99697f2992354918e15691c888f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -616,7 +616,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch
similarity index 96%
rename from patches/server/0129-Cap-Entity-Collisions.patch
rename to patches/server/0130-Cap-Entity-Collisions.patch
index 22a8161ec0..61c0a4afd1 100644
--- a/patches/server/0129-Cap-Entity-Collisions.patch
+++ b/patches/server/0130-Cap-Entity-Collisions.patch
@@ -27,7 +27,7 @@ index 2dc58b9f769ea43b737804456aafab47ecc143b8..c611b5a63498f5ad1f50a75ccd5d7299
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 739fee2b1f9df1dd13f7a0f9acb27fc5d40c16a5..23342cd50e4722dd80c0d32057b6473f68963652 100644
+index 7f080d8aac9198dd935a8af090ee82f618551203..927cc59705c662d319fbee47c8da00d8e6256e72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0131-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 96%
rename from patches/server/0131-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 091d6d3c36..1fb0880f4e 100644
--- a/patches/server/0131-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index da97afe93a98daac33f143c6da0b42f71db25dba..5a80ea6bee72921454fbbd6ee202dc114c481ea1 100644
+index b20c1a772abdbadb72f141a751e954b126ab3de9..f4f0982aa11da0b5bf88a42c02e86f652f8ea615 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -185,7 +185,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0132-Do-not-let-armorstands-drown.patch b/patches/server/0133-Do-not-let-armorstands-drown.patch
similarity index 89%
rename from patches/server/0132-Do-not-let-armorstands-drown.patch
rename to patches/server/0133-Do-not-let-armorstands-drown.patch
index 466f346419..6141df4e7a 100644
--- a/patches/server/0132-Do-not-let-armorstands-drown.patch
+++ b/patches/server/0133-Do-not-let-armorstands-drown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index ef382aaeb86ca41356a076ff4adfe5fb652b43c5..cda073a8ab9daed75f284cbbe4459991fba348f0 100644
+index de2ec66790b3e86b9e8feff56b28697695b0ab2c..6d717d3852afb3a3a4bef30c68980c402bdfefff 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -936,5 +936,12 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0134-Add-system-property-to-disable-book-size-limits.patch b/patches/server/0135-Add-system-property-to-disable-book-size-limits.patch
similarity index 100%
rename from patches/server/0134-Add-system-property-to-disable-book-size-limits.patch
rename to patches/server/0135-Add-system-property-to-disable-book-size-limits.patch
diff --git a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 100%
rename from patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0139-Item-canEntityPickup.patch b/patches/server/0140-Item-canEntityPickup.patch
similarity index 96%
rename from patches/server/0139-Item-canEntityPickup.patch
rename to patches/server/0140-Item-canEntityPickup.patch
index 6f930c25fa..0d7557f5b2 100644
--- a/patches/server/0139-Item-canEntityPickup.patch
+++ b/patches/server/0140-Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b13774873f795b149c15fddb8053d9419f1841ca..2ed756c73b0cfddb559126d85316f37c3f958c0c 100644
+index ac0f2d98a8b2f515696a6e3959b8ff4ff05ba19b..61c9b89b6ef41cde465d84f75f2dc6ef07048cc4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -614,6 +614,11 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0141-PlayerAttemptPickupItemEvent.patch b/patches/server/0142-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0141-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0142-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/server/0143-Add-UnknownCommandEvent.patch
similarity index 92%
rename from patches/server/0142-Add-UnknownCommandEvent.patch
rename to patches/server/0143-Add-UnknownCommandEvent.patch
index 59bbfebad4..c06c7465fc 100644
--- a/patches/server/0142-Add-UnknownCommandEvent.patch
+++ b/patches/server/0143-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dcc1a3856560ab0eb4de45a358e189134adeac17..55444b51e416857a3854a0f1a41f24390f744119 100644
+index 79fe58b09c9e0870a5ab55bc21b8ab933450a1d7..2f25e4c26f2f418de738ba2fcf7f2485bb2dda3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -792,7 +792,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/server/0144-Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/server/0143-Basic-PlayerProfile-API.patch
rename to patches/server/0144-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/server/0145-Shoulder-Entities-Release-API.patch
similarity index 97%
rename from patches/server/0144-Shoulder-Entities-Release-API.patch
rename to patches/server/0145-Shoulder-Entities-Release-API.patch
index 75a9f1a3ef..5c38ddf29e 100644
--- a/patches/server/0144-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0145-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 73277b04a45444edce02cce3e033741ebaf2ad0c..075bbc75d2e33be3a42c6c3ec279eeeba6408333 100644
+index 56ce24ab7213776285d09cc0ab91f012d3e58caf..64f916d290df16ecab9ccb8fa029839360b4f4c6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1953,20 +1953,44 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/server/0146-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0145-Profile-Lookup-Events.patch
rename to patches/server/0146-Profile-Lookup-Events.patch
diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/server/0147-Block-player-logins-during-server-shutdown.patch
similarity index 92%
rename from patches/server/0146-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0147-Block-player-logins-during-server-shutdown.patch
index 588fe4a932..f147615f02 100644
--- a/patches/server/0146-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0147-Block-player-logins-during-server-shutdown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 3e57eb2e50f94085fd23b54a54d4cf7a0b7919c7..29555323bcc7d7faa3af6ed4507a1646714ab84a 100644
+index 16c1cf342532988d3e319fb41cc4dbde09403e1a..da563f3dd075d4d0000f13e6b5a88e2b4a9bc871 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -69,6 +69,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/server/0148-Entity-fromMobSpawner.patch
similarity index 97%
rename from patches/server/0147-Entity-fromMobSpawner.patch
rename to patches/server/0148-Entity-fromMobSpawner.patch
index 3c896909a7..43a9b96d6c 100644
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/server/0148-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 23342cd50e4722dd80c0d32057b6473f68963652..01b3dca8b90d38c5fbe23e72769f54bd87144772 100644
+index 927cc59705c662d319fbee47c8da00d8e6256e72..609bffc7d8f21c8733b3fb861fe02f9d1302d796 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -321,6 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/server/0150-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0149-Implement-ensureServerConversions-API.patch
rename to patches/server/0150-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/server/0151-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0150-Implement-getI18NDisplayName.patch
rename to patches/server/0151-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/server/0152-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/0151-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0152-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/server/0153-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0152-Fix-this-stupid-bullshit.patch
rename to patches/server/0153-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/server/0154-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0153-LivingEntity-setKiller.patch
rename to patches/server/0154-LivingEntity-setKiller.patch
diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 96%
rename from patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
index c3a07caf8d..50ac315523 100644
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -27,7 +27,7 @@ index 48319aaf1c525c6fb7bdee5c2f570a0d056d4eae..52954fc3bf932cfc9d5ce63e3d3cace3
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 29555323bcc7d7faa3af6ed4507a1646714ab84a..700ab378f43b3841c82b7aadc1c3818dc0621a58 100644
+index da563f3dd075d4d0000f13e6b5a88e2b4a9bc871..cc7a4f8a4b351011dfd131b30c4b9386fde84e95 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -297,6 +297,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/server/0160-Add-PlayerJumpEvent.patch
similarity index 96%
rename from patches/server/0159-Add-PlayerJumpEvent.patch
rename to patches/server/0160-Add-PlayerJumpEvent.patch
index 3b4a67f82b..97514757b5 100644
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/server/0160-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 03dcaffb57436875baf1b1f85133f422f5b7bbe0..4a731fd42d92822ec3ca0091e108979047c8bc8b 100644
+index bb58cf52e69258a8c59b595f5fa28ced562965f3..24f6aeb862c9384ec11132cdf14ca73ee0762e2e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
rename to patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
index 0399cafb24..78fe63dd7a 100644
--- a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 049436f5cc373f6d076a62ae2b548b0154a43b78..6049c63b4f7abde0840738638d4bf19172a01200 100644
+index 24f6aeb862c9384ec11132cdf14ca73ee0762e2e..f188a55fda95abd5ccf9119ed4ab772841128d74 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2781,14 +2781,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
index d9c30bace1..d1ccdfcf60 100644
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index c4ba069f5124ec151e05813beddf293fddc3b804..484221e5a9c246aa91e0eacef3911b0e
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4f21d578a65778ab9022b09bee3b84af341ddbdd..1af5e3f3389d5f4e391f05b3f8e7df9d3c799981 100644
+index ea7a937dfd0769d734a056709d3af9d2f2ee5332..7badc90ec9e3b2dfffac6601e432c41224b701f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -192,6 +192,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/server/0163-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from patches/server/0162-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0163-revert-serverside-behavior-of-keepalives.patch
index 2864e66754..d5ab2c7b97 100644
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0163-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6049c63b4f7abde0840738638d4bf19172a01200..b2bbd25e5572f59add71579b676d5a4c719be239 100644
+index f188a55fda95abd5ccf9119ed4ab772841128d74..c2f614b64482be75b28d47e79b0531a9143a157d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -222,9 +222,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 98%
rename from patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index d7dc1deef3..b4adb22905 100644
--- a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 075bbc75d2e33be3a42c6c3ec279eeeba6408333..d3fe3eabf4465101760951113b23edf2ce03e57d 100644
+index 64f916d290df16ecab9ccb8fa029839360b4f4c6..eb71f050fcd673ee4d9d1da62e098e2e37d4dd9a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -30,6 +30,7 @@ import net.minecraft.network.chat.MutableComponent;
diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/server/0165-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from patches/server/0164-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0165-Add-PlayerArmorChangeEvent.patch
index 1c55b80d5e..d5de1db379 100644
--- a/patches/server/0164-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0165-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 89913edf98d65f08f379d0d201f9963c23573478..28de49c8b5771491b168bba26e6033669c48e3c9 100644
+index 8044082ed3ca6076af38e4299e50f1f690d02a72..0dc03f53c80aac91a914bea91958a6c11c4f2061 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 92%
rename from patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
index a2050f2e4b..4ef987839c 100644
--- a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 700ab378f43b3841c82b7aadc1c3818dc0621a58..7923078a4235a6169eb94b7c0ce85e4cd51eb593 100644
+index cc7a4f8a4b351011dfd131b30c4b9386fde84e95..7224aa974a3936a68d1c1210c671192812af93c9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -76,7 +76,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/server/0170-AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/server/0169-AsyncTabCompleteEvent.patch
rename to patches/server/0170-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/server/0171-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0170-PlayerPickupExperienceEvent.patch
rename to patches/server/0171-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0172-Make-max-squid-spawn-height-configurable.patch b/patches/server/0173-Make-max-squid-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0172-Make-max-squid-spawn-height-configurable.patch
rename to patches/server/0173-Make-max-squid-spawn-height-configurable.patch
diff --git a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 98%
rename from patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch
index 14d1eb009d..8f82380ee8 100644
--- a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b489307e64cab8c990cba775c299297ed8ccf05c..47167bbd2f167e9e266b0962a2034379ab8b7e77 100644
+index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec7fb1da91 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/server/0175-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0174-PreCreatureSpawnEvent.patch
rename to patches/server/0175-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0176-Fill-Profile-Property-Events.patch b/patches/server/0177-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0176-Fill-Profile-Property-Events.patch
rename to patches/server/0177-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0178-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0178-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0178-Add-ArmorStand-Item-Meta.patch b/patches/server/0179-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0178-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0179-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0179-Extend-Player-Interact-cancellation.patch b/patches/server/0180-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0179-Extend-Player-Interact-cancellation.patch
rename to patches/server/0180-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch b/patches/server/0181-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0180-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0181-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0183-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0183-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0184-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0184-Implement-extended-PaperServerListPingEvent.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-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0186-Player.setPlayerProfile-API.patch b/patches/server/0187-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0186-Player.setPlayerProfile-API.patch
rename to patches/server/0187-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0187-getPlayerUniqueId-API.patch b/patches/server/0188-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0187-getPlayerUniqueId-API.patch
rename to patches/server/0188-getPlayerUniqueId-API.patch
diff --git a/patches/server/0188-Make-player-data-saving-configurable.patch b/patches/server/0189-Make-player-data-saving-configurable.patch
similarity index 100%
rename from patches/server/0188-Make-player-data-saving-configurable.patch
rename to patches/server/0189-Make-player-data-saving-configurable.patch
diff --git a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0190-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0190-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0191-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0191-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0191-Flag-to-disable-the-channel-limit.patch b/patches/server/0192-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0191-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0192-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0192-Add-method-to-open-already-placed-sign.patch b/patches/server/0193-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/server/0192-Add-method-to-open-already-placed-sign.patch
rename to patches/server/0193-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch b/patches/server/0194-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0193-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0194-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0195-EndermanEscapeEvent.patch b/patches/server/0196-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0195-EndermanEscapeEvent.patch
rename to patches/server/0196-EndermanEscapeEvent.patch
diff --git a/patches/server/0196-Enderman.teleportRandomly.patch b/patches/server/0197-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0196-Enderman.teleportRandomly.patch
rename to patches/server/0197-Enderman.teleportRandomly.patch
diff --git a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0198-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0198-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 97%
rename from patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch
index fda64d9101..943ad3133f 100644
--- a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 097406c4c2ba72060efb4efd06fb1cbbb6bc4ad5..3634a9d2f76bc7cd4479026f7507fc6658a41a84 100644
+index 33b156a02b1b051b0cafb55af2804b1f3f4b4434..c29092954b0ea79184972d266d22570b343a9d70 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0200-EndermanAttackPlayerEvent.patch b/patches/server/0201-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0200-EndermanAttackPlayerEvent.patch
rename to patches/server/0201-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0201-WitchConsumePotionEvent.patch b/patches/server/0202-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0201-WitchConsumePotionEvent.patch
rename to patches/server/0202-WitchConsumePotionEvent.patch
diff --git a/patches/server/0202-WitchThrowPotionEvent.patch b/patches/server/0203-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0202-WitchThrowPotionEvent.patch
rename to patches/server/0203-WitchThrowPotionEvent.patch
diff --git a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0204-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0204-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0204-WitchReadyPotionEvent.patch b/patches/server/0205-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0204-WitchReadyPotionEvent.patch
rename to patches/server/0205-WitchReadyPotionEvent.patch
diff --git a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch b/patches/server/0206-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0205-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0206-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0207-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0207-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0208-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0208-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0208-Fix-CraftEntity-hashCode.patch b/patches/server/0209-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from patches/server/0208-Fix-CraftEntity-hashCode.patch
rename to patches/server/0209-Fix-CraftEntity-hashCode.patch
index b260b94401..c8a34f9ef5 100644
--- a/patches/server/0208-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0209-Fix-CraftEntity-hashCode.patch
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a2a7b6a62ea1292fce37581863bee931d1497223..e57fef24ee5159142ec4f05a9e76a34c6e153386 100644
+index e132d38199766e3e787169501d8bb05964506e0f..16e8cfb21f090e0c17e55c1b45ff56bed01839eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -784,14 +784,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0210-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0210-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0211-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0211-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0211-Make-shield-blocking-delay-configurable.patch b/patches/server/0212-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0211-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0212-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0212-Improve-EntityShootBowEvent.patch b/patches/server/0213-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0212-Improve-EntityShootBowEvent.patch
rename to patches/server/0213-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0213-PlayerReadyArrowEvent.patch b/patches/server/0214-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0213-PlayerReadyArrowEvent.patch
rename to patches/server/0214-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
rename to patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/0215-Expand-Explosions-API.patch b/patches/server/0216-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0215-Expand-Explosions-API.patch
rename to patches/server/0216-Expand-Explosions-API.patch
diff --git a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0217-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0217-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0217-RangedEntity-API.patch b/patches/server/0218-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0217-RangedEntity-API.patch
rename to patches/server/0218-RangedEntity-API.patch
diff --git a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0219-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0219-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0219-Implement-World.getEntity-UUID-API.patch b/patches/server/0220-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0219-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0220-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0220-InventoryCloseEvent-Reason-API.patch b/patches/server/0221-InventoryCloseEvent-Reason-API.patch
similarity index 99%
rename from patches/server/0220-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0221-InventoryCloseEvent-Reason-API.patch
index c11b93b676..b72795a64b 100644
--- a/patches/server/0220-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0221-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3634a9d2f76bc7cd4479026f7507fc6658a41a84..fdf64581f26112bb9f5135485a745e50dc4a8248 100644
+index c29092954b0ea79184972d266d22570b343a9d70..ab5059b5cdbcb8e4d47d21d2883c0cd52fc00cf7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1055,7 +1055,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0221-Vex-get-setSummoner-API.patch b/patches/server/0222-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0221-Vex-get-setSummoner-API.patch
rename to patches/server/0222-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0224-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to patches/server/0224-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch b/patches/server/0225-Use-asynchronous-Log4j-2-loggers.patch
similarity index 100%
rename from patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
rename to patches/server/0225-Use-asynchronous-Log4j-2-loggers.patch
diff --git a/patches/server/0225-add-more-information-to-Entity.toString.patch b/patches/server/0226-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from patches/server/0225-add-more-information-to-Entity.toString.patch
rename to patches/server/0226-add-more-information-to-Entity.toString.patch
index 17bf7bb6c8..5444102082 100644
--- a/patches/server/0225-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0226-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 01b3dca8b90d38c5fbe23e72769f54bd87144772..1533eaa192a0116bff94707ca7c2604c40f7d7bb 100644
+index 609bffc7d8f21c8733b3fb861fe02f9d1302d796..fc12ee50c275705b7ca33f7f1f2578d0857b47f0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2805,7 +2805,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0227-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0227-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0227-EnderDragon-Events.patch b/patches/server/0228-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0227-EnderDragon-Events.patch
rename to patches/server/0228-EnderDragon-Events.patch
diff --git a/patches/server/0228-PlayerElytraBoostEvent.patch b/patches/server/0229-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0228-PlayerElytraBoostEvent.patch
rename to patches/server/0229-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0229-PlayerLaunchProjectileEvent.patch b/patches/server/0230-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0229-PlayerLaunchProjectileEvent.patch
rename to patches/server/0230-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0230-Improve-BlockPosition-inlining.patch b/patches/server/0231-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0230-Improve-BlockPosition-inlining.patch
rename to patches/server/0231-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/server/0232-Optimize-IntIdentityHashBiMiap-nextId.patch
similarity index 100%
rename from patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
rename to patches/server/0232-Optimize-IntIdentityHashBiMiap-nextId.patch
diff --git a/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0233-Vanished-players-don-t-have-rights.patch b/patches/server/0234-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0233-Vanished-players-don-t-have-rights.patch
rename to patches/server/0234-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0234-Allow-disabling-armour-stand-ticking.patch b/patches/server/0235-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0234-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0235-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0235-SkeletonHorse-Additions.patch b/patches/server/0236-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0235-SkeletonHorse-Additions.patch
rename to patches/server/0236-SkeletonHorse-Additions.patch
diff --git a/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0237-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0237-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0237-Implement-Expanded-ArmorStand-API.patch b/patches/server/0238-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0237-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0238-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0238-AnvilDamageEvent.patch b/patches/server/0239-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0238-AnvilDamageEvent.patch
rename to patches/server/0239-AnvilDamageEvent.patch
diff --git a/patches/server/0239-Add-hand-to-bucket-events.patch b/patches/server/0240-Add-hand-to-bucket-events.patch
similarity index 99%
rename from patches/server/0239-Add-hand-to-bucket-events.patch
rename to patches/server/0240-Add-hand-to-bucket-events.patch
index 4120af0c2e..505743be98 100644
--- a/patches/server/0239-Add-hand-to-bucket-events.patch
+++ b/patches/server/0240-Add-hand-to-bucket-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fdf64581f26112bb9f5135485a745e50dc4a8248..bf06d2c5209f72eda22f1de351059eb7f1173ae0 100644
+index ab5059b5cdbcb8e4d47d21d2883c0cd52fc00cf7..b9468cc49573cee3c64f0be955fa6ec2cc10c58c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1419,15 +1419,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0240-Add-TNTPrimeEvent.patch b/patches/server/0241-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0240-Add-TNTPrimeEvent.patch
rename to patches/server/0241-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0243-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0243-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0244-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch
rename to patches/server/0244-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index f3da28c74d..b321f91654 100644
--- a/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information
 1.17: Needs to be reworked for new entity storage system
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 47167bbd2f167e9e266b0962a2034379ab8b7e77..a8c172c3742b8eb52c9cdd5adb65224f2e7bc736 100644
+index dd9cae17aa9ec02e25642a1a45409bec7fb1da91..52bcfcc7443b57b0e57024c0c4e78c5a7260410d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1156,6 +1156,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -29,7 +29,7 @@ index 47167bbd2f167e9e266b0962a2034379ab8b7e77..a8c172c3742b8eb52c9cdd5adb65224f
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bf06d2c5209f72eda22f1de351059eb7f1173ae0..a86757a96fea11de150fb48ac123c3493e5420b7 100644
+index b9468cc49573cee3c64f0be955fa6ec2cc10c58c..e299bf10c0bdd14398d590939d90cc723ecd4ce5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -202,6 +202,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -72,7 +72,7 @@ index bf06d2c5209f72eda22f1de351059eb7f1173ae0..a86757a96fea11de150fb48ac123c349
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2ec198a29b85bf118f05a639d6290334ab3810d6..0be7bd3c5deef99f9ffe6d3d6390c9297d5b5815 100644
+index fc12ee50c275705b7ca33f7f1f2578d0857b47f0..4c769a68c5c234b33d72d9ca17f8d1fef5d23478 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -171,6 +171,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0246-Make-EnderDragon-implement-Mob.patch b/patches/server/0247-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from patches/server/0246-Make-EnderDragon-implement-Mob.patch
rename to patches/server/0247-Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0248-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0248-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0249-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0249-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0250-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0250-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0250-Optimize-BlockPosition-helper-methods.patch b/patches/server/0251-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0250-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0251-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0252-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 100%
rename from patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/server/0252-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
diff --git a/patches/server/0252-Slime-Pathfinder-Events.patch b/patches/server/0253-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0252-Slime-Pathfinder-Events.patch
rename to patches/server/0253-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0254-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0254-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0254-Optimize-CraftBlockData-Creation.patch b/patches/server/0255-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0254-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0255-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0255-Optimize-MappedRegistry.patch b/patches/server/0256-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0255-Optimize-MappedRegistry.patch
rename to patches/server/0256-Optimize-MappedRegistry.patch
diff --git a/patches/server/0256-Add-PhantomPreSpawnEvent.patch b/patches/server/0257-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0256-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0257-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0257-Add-More-Creeper-API.patch b/patches/server/0258-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0257-Add-More-Creeper-API.patch
rename to patches/server/0258-Add-More-Creeper-API.patch
diff --git a/patches/server/0258-Inventory-removeItemAnySlot.patch b/patches/server/0259-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0258-Inventory-removeItemAnySlot.patch
rename to patches/server/0259-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0260-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0260-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0261-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0261-Asynchronous-chunk-IO-and-loading.patch
index f7566aecba..8823e0a856 100644
--- a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0261-Asynchronous-chunk-IO-and-loading.patch
@@ -2357,7 +2357,7 @@ index df32a8b1df60064c49702dca26d7310b7d27e94b..92faf96e12b443351ea146d4d1deccb0
                  completablefuture = (CompletableFuture) this.futures.get(i);
                  if (completablefuture == null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a8c172c3742b8eb52c9cdd5adb65224f2e7bc736..5585c72b3c79a8c5bcc9d84c6cf4c7d61b6a42e9 100644
+index 52bcfcc7443b57b0e57024c0c4e78c5a7260410d..63c7662cc27cf17a4221238b7ed4ed7ef5caec25 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -115,7 +115,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0262-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0262-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0263-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0263-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0263-Improve-death-events.patch b/patches/server/0264-Improve-death-events.patch
similarity index 100%
rename from patches/server/0263-Improve-death-events.patch
rename to patches/server/0264-Improve-death-events.patch
diff --git a/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0265-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0265-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0265-Mob-Pathfinding-API.patch b/patches/server/0266-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0265-Mob-Pathfinding-API.patch
rename to patches/server/0266-Mob-Pathfinding-API.patch
diff --git a/patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0267-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0267-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0268-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0268-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0269-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0269-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0270-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0270-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0271-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0271-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0272-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0272-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0272-Honor-EntityAgeable.ageLock.patch b/patches/server/0273-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0272-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0273-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0273-Configurable-connection-throttle-kick-message.patch b/patches/server/0274-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0273-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0274-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0274-Hook-into-CB-plugin-rewrites.patch b/patches/server/0275-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0274-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0275-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0275-Add-sun-related-API.patch b/patches/server/0276-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0275-Add-sun-related-API.patch
rename to patches/server/0276-Add-sun-related-API.patch
diff --git a/patches/server/0276-Add-LivingEntity-getTargetEntity.patch b/patches/server/0277-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from patches/server/0276-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0277-Add-LivingEntity-getTargetEntity.patch
index 9bd5d48c0e..573005e534 100644
--- a/patches/server/0276-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0277-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fc64814fd2db9e0eb2b54fd79c049c01e523c97d..6506626389e5dac0907747868b210f07d0a961d0 100644
+index 4c769a68c5c234b33d72d9ca17f8d1fef5d23478..7ba9193b3203ebc8c71e605bd80717bb16790565 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2362,6 +2362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0277-Turtle-API.patch b/patches/server/0278-Turtle-API.patch
similarity index 100%
rename from patches/server/0277-Turtle-API.patch
rename to patches/server/0278-Turtle-API.patch
diff --git a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0280-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0280-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0281-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0281-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0281-Add-more-Witch-API.patch b/patches/server/0282-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0281-Add-more-Witch-API.patch
rename to patches/server/0282-Add-more-Witch-API.patch
diff --git a/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0283-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0283-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0283-Here-s-Johnny.patch b/patches/server/0284-Here-s-Johnny.patch
similarity index 100%
rename from patches/server/0283-Here-s-Johnny.patch
rename to patches/server/0284-Here-s-Johnny.patch
diff --git a/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0285-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0285-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0285-Reset-players-airTicks-on-respawn.patch b/patches/server/0286-Reset-players-airTicks-on-respawn.patch
similarity index 93%
rename from patches/server/0285-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0286-Reset-players-airTicks-on-respawn.patch
index 7ee012db08..b5fd6a3600 100644
--- a/patches/server/0285-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0286-Reset-players-airTicks-on-respawn.patch
@@ -17,7 +17,7 @@ index 3ca3a1c16ea0900bfb868a6e2fc88e3522bf7752..8beca0412c65ad03376fb76e2d993bc8
          this.fallDistance = 0;
          this.foodData = new FoodData(this);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6506626389e5dac0907747868b210f07d0a961d0..5de194823ed9980cad5845268af123974853d6c1 100644
+index 7ba9193b3203ebc8c71e605bd80717bb16790565..1f00d9dfb6949010a146a4536e80ae4feaa07b25 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2608,6 +2608,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0287-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0287-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0288-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0288-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0288-Optimize-World-Time-Updates.patch b/patches/server/0289-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0288-Optimize-World-Time-Updates.patch
rename to patches/server/0289-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0289-Restore-custom-InventoryHolder-support.patch b/patches/server/0290-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0289-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0290-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0290-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0291-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0290-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0291-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0291-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0292-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0291-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0292-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0292-PreSpawnerSpawnEvent.patch b/patches/server/0293-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0292-PreSpawnerSpawnEvent.patch
rename to patches/server/0293-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0294-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0294-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0294-Make-the-default-permission-message-configurable.patch b/patches/server/0295-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0294-Make-the-default-permission-message-configurable.patch
rename to patches/server/0295-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0296-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0296-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0296-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0297-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0296-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0297-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0297-force-entity-dismount-during-teleportation.patch b/patches/server/0298-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from patches/server/0297-force-entity-dismount-during-teleportation.patch
rename to patches/server/0298-force-entity-dismount-during-teleportation.patch
index 7a2f0032d4..1d1023d1a7 100644
--- a/patches/server/0297-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0298-force-entity-dismount-during-teleportation.patch
@@ -41,7 +41,7 @@ index 8beca0412c65ad03376fb76e2d993bc841bf9e0b..77d9a4ce7be345b6a999a0269b26c0e6
  
          if (entity1 != entity && this.connection != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5de194823ed9980cad5845268af123974853d6c1..7cca53fbd5f56e274284ff6c26516e67f48acb5f 100644
+index 1f00d9dfb6949010a146a4536e80ae4feaa07b25..e34deb4c6773171280e0819914725f267d06ad2d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2235,12 +2235,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0298-Add-more-Zombie-API.patch b/patches/server/0299-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0298-Add-more-Zombie-API.patch
rename to patches/server/0299-Add-more-Zombie-API.patch
diff --git a/patches/server/0299-Book-Size-Limits.patch b/patches/server/0300-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0299-Book-Size-Limits.patch
rename to patches/server/0300-Book-Size-Limits.patch
diff --git a/patches/server/0300-Add-PlayerConnectionCloseEvent.patch b/patches/server/0301-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0300-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0301-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0301-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0302-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0301-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0302-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0305-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to patches/server/0305-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0306-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0306-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0306-BlockDestroyEvent.patch b/patches/server/0307-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0306-BlockDestroyEvent.patch
rename to patches/server/0307-BlockDestroyEvent.patch
diff --git a/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0308-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0308-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0308-Limit-Client-Sign-length-more.patch b/patches/server/0309-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0308-Limit-Client-Sign-length-more.patch
rename to patches/server/0309-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0310-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0310-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 87%
rename from patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 4a73f0aa96..e8113499d1 100644
--- a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -296,3 +296,28 @@ index 74bfe0d3942259c45702b099efdc4e101a4e3022..e8fcd56906d26f6dc87959e32c4c7c78
      default boolean packetTooLarge(net.minecraft.network.Connection manager) {
          return false;
      }
+diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+index abcd335f5577dae6d613e5e0dd2656e1ab3ee9f0..4e08fdf47fd201c26223fc8efb0ef4f6e884f8c7 100644
+--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
++++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+@@ -63,10 +63,12 @@ public class ServerConnectionListener {
+     final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
+     // Paper start - prevent blocking on adding a new network manager while the server is ticking
+     private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
++    private static final boolean disableFlushConsolidation = Boolean.getBoolean("Paper.disableFlushConsolidate"); // Paper
+     private final void addPending() {
+         Connection manager = null;
+         while ((manager = pending.poll()) != null) {
+             connections.add(manager);
++            manager.isPending = false;
+         }
+     }
+     // Paper end
+@@ -101,6 +103,7 @@ public class ServerConnectionListener {
+                         ;
+                     }
+ 
++                    if (!disableFlushConsolidation) channel.pipeline().addFirst(new io.netty.handler.flush.FlushConsolidationHandler()); // Paper
+                     channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyQueryHandler(ServerConnectionListener.this)).addLast("splitter", new Varint21FrameDecoder()).addLast("decoder", new PacketDecoder(PacketFlow.SERVERBOUND)).addLast("prepender", new Varint21LengthFieldPrepender()).addLast("encoder", new PacketEncoder(PacketFlow.CLIENTBOUND));
+                     int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
+                     Object object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND);
diff --git a/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0312-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0312-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0313-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to patches/server/0313-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0314-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0314-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0315-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0315-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0316-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/server/0316-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0316-Entity-getEntitySpawnReason.patch b/patches/server/0317-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0316-Entity-getEntitySpawnReason.patch
rename to patches/server/0317-Entity-getEntitySpawnReason.patch
index 294b499751..8ad994e1f1 100644
--- a/patches/server/0316-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0317-Entity-getEntitySpawnReason.patch
@@ -35,7 +35,7 @@ index ea336bdf2f15aabe74de82ef6c29b93573254e31..da3100d6577166e222164c174b280205
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7cca53fbd5f56e274284ff6c26516e67f48acb5f..44835dc1a22d485ec3205d375a14be165a87b613 100644
+index e34deb4c6773171280e0819914725f267d06ad2d..413d86b15c245a17246e23611cd65739e8fd18dd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -67,6 +67,8 @@ import net.minecraft.world.InteractionHand;
diff --git a/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0318-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0318-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0318-Fire-event-on-GS4-query.patch b/patches/server/0319-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0318-Fire-event-on-GS4-query.patch
rename to patches/server/0319-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0319-Implement-PlayerPostRespawnEvent.patch b/patches/server/0320-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0319-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0320-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0321-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0321-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0321-Server-Tick-Events.patch b/patches/server/0322-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0321-Server-Tick-Events.patch
rename to patches/server/0322-Server-Tick-Events.patch
diff --git a/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0323-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0323-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0324-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0324-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0324-Add-Heightmap-API.patch b/patches/server/0325-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0324-Add-Heightmap-API.patch
rename to patches/server/0325-Add-Heightmap-API.patch
diff --git a/patches/server/0325-Mob-Spawner-API-Enhancements.patch b/patches/server/0326-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0325-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0326-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0327-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0327-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0328-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0328-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0329-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0329-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0329-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0330-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from patches/server/0329-improve-CraftWorld-isChunkLoaded.patch
rename to patches/server/0330-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 792ca2c76e..89fb78ccfd 100644
--- a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -85,7 +85,7 @@ index c8a59de4673d430fc8ec2e53315f107293122e7e..40e48c3f1199b127066732e3c8a6d40c
          // CraftBukkit start
          // this.updateSpawnFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index efc4d75baca19bb2c89be26e6880116dd9774b1b..70c583827f6b947d57b477f6fc416857c70336c1 100644
+index 278d8cc1987fd6edf5bd316d6a9163f8824ee654..986147ba4e7a807a34cb136f49402973e03a0894 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -61,6 +61,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
diff --git a/patches/server/0331-ChunkMapDistance-CME.patch b/patches/server/0332-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0331-ChunkMapDistance-CME.patch
rename to patches/server/0332-ChunkMapDistance-CME.patch
diff --git a/patches/server/0332-Implement-CraftBlockSoundGroup.patch b/patches/server/0333-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0332-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0333-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0333-Chunk-debug-command.patch b/patches/server/0334-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0333-Chunk-debug-command.patch
rename to patches/server/0334-Chunk-debug-command.patch
diff --git a/patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0335-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0335-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0335-Fix-World-isChunkGenerated-calls.patch b/patches/server/0336-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from patches/server/0335-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0336-Fix-World-isChunkGenerated-calls.patch
index 70ae961b83..ac6d803499 100644
--- a/patches/server/0335-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0336-Fix-World-isChunkGenerated-calls.patch
@@ -32,7 +32,7 @@ index 1e52b8e97dcee512e7d2fbe157152df9e0779bf1..2aa86f35b8960273ad91b21e260bcf91
  
      public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getFutureIfPresentUnchecked(ChunkStatus leastStatus) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5585c72b3c79a8c5bcc9d84c6cf4c7d61b6a42e9..da58b2ee334a347eea375dafd37347635a4ab62f 100644
+index 63c7662cc27cf17a4221238b7ed4ed7ef5caec25..851489de98576a5ab5fdc040d459786b6633ff49 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -84,6 +84,7 @@ import net.minecraft.world.level.chunk.ProtoChunk;
diff --git a/patches/server/0336-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0336-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0338-Configurable-projectile-relative-velocity.patch b/patches/server/0339-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0338-Configurable-projectile-relative-velocity.patch
rename to patches/server/0339-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0339-offset-item-frame-ticking.patch b/patches/server/0340-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0339-offset-item-frame-ticking.patch
rename to patches/server/0340-offset-item-frame-ticking.patch
diff --git a/patches/server/0340-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from patches/server/0340-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/patches/server/0341-Fix-MC-158900.patch b/patches/server/0342-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0341-Fix-MC-158900.patch
rename to patches/server/0342-Fix-MC-158900.patch
diff --git a/patches/server/0342-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0342-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0343-Generator-Settings.patch b/patches/server/0344-Generator-Settings.patch
similarity index 98%
rename from patches/server/0343-Generator-Settings.patch
rename to patches/server/0344-Generator-Settings.patch
index f8115a02cc..c713d171db 100644
--- a/patches/server/0343-Generator-Settings.patch
+++ b/patches/server/0344-Generator-Settings.patch
@@ -20,7 +20,7 @@ index 4c177a383b277debe8a7c02a70d029d862e6b048..0c336a794d21d5084b9ea39308379b2f
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index da58b2ee334a347eea375dafd37347635a4ab62f..6d69f15d90e9096f0ee6cb7259effa87622c787b 100644
+index 851489de98576a5ab5fdc040d459786b6633ff49..9c7927d8529c6c15216b5714b23a053f9a30a716 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -678,7 +678,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -101,7 +101,7 @@ index da36e6d40ad3e8b7cdbe09ef911d1e5b8c28670f..245998e2cea32cf15ee2659639c647f4
          this.upgradeData = upgradeData;
          this.blockTicks = blockTickScheduler;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index fc320450878279a6aa48019fbde35bb183f5f06e..3cb35f2f47ba841915ac2825d30cc4c3274ce3c4 100644
+index 1c975b686c1e335d46e63ab12e0a97dd2dcaba13..34a026dbeafff07401187d22ef8fd537c17fc615 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -210,7 +210,7 @@ public class ChunkSerializer {
diff --git a/patches/server/0344-Fix-MC-161754.patch b/patches/server/0345-Fix-MC-161754.patch
similarity index 100%
rename from patches/server/0344-Fix-MC-161754.patch
rename to patches/server/0345-Fix-MC-161754.patch
diff --git a/patches/server/0345-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from patches/server/0345-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/patches/server/0346-Expose-the-internal-current-tick.patch b/patches/server/0347-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0346-Expose-the-internal-current-tick.patch
rename to patches/server/0347-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to patches/server/0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/patches/server/0348-Add-option-to-disable-pillager-patrols.patch b/patches/server/0349-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0348-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0349-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0350-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0350-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0351-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0351-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0352-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0352-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0352-Duplicate-UUID-Resolve-Option.patch b/patches/server/0353-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from patches/server/0352-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0353-Duplicate-UUID-Resolve-Option.patch
index 5238e1c3ff..22f96ef89d 100644
--- a/patches/server/0352-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0353-Duplicate-UUID-Resolve-Option.patch
@@ -83,7 +83,7 @@ index 8190c30346c0fd2d86fb7cbcfc7ce17333e05146..9860f5a0ddff83f1393ee13a96b38c3b
      private void countAllMobsForSpawning() {
          countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6d69f15d90e9096f0ee6cb7259effa87622c787b..7345d92ccebf6ca4011e2845628e2cf29b462277 100644
+index 9c7927d8529c6c15216b5714b23a053f9a30a716..dba2801b8e3101bd9c6fb87e57db634754f0c8cd 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,7 @@
diff --git a/patches/server/0353-Optimize-Hoppers.patch b/patches/server/0354-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0353-Optimize-Hoppers.patch
rename to patches/server/0354-Optimize-Hoppers.patch
diff --git a/patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0355-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0355-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0356-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0356-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0357-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0357-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0358-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 97%
rename from patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0358-Guard-against-serializing-mismatching-chunk-coordina.patch
index 5d846e842b..f5d53ad2df 100644
--- a/patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0358-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate
 Should help if something dumb happens
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 3cb35f2f47ba841915ac2825d30cc4c3274ce3c4..7c04aef3eac54981ca1e34cb87d97104c3c9685b 100644
+index 34a026dbeafff07401187d22ef8fd537c17fc615..c131f6093c395b4d9e401d3c447e7fb13c631ecf 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -69,6 +69,13 @@ public class ChunkSerializer {
diff --git a/patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0359-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0359-Optimise-IEntityAccess-getPlayerByUUID.patch
index 9757f2d9ca..37c35b5ff5 100644
--- a/patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0359-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 70c583827f6b947d57b477f6fc416857c70336c1..30ccb9c0ffabfe5536c89d1dafb97afb467371a7 100644
+index 986147ba4e7a807a34cb136f49402973e03a0894..9f53a439fe196f2347dd4eb5b05c1fe80beb593f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -284,6 +284,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0359-Fix-items-not-falling-correctly.patch b/patches/server/0360-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0359-Fix-items-not-falling-correctly.patch
rename to patches/server/0360-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0360-Lag-compensate-eating.patch b/patches/server/0361-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0360-Lag-compensate-eating.patch
rename to patches/server/0361-Lag-compensate-eating.patch
diff --git a/patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0362-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0362-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0363-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0363-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0363-Add-effect-to-block-break-naturally.patch b/patches/server/0364-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0363-Add-effect-to-block-break-naturally.patch
rename to patches/server/0364-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0364-Entity-Activation-Range-2.0.patch b/patches/server/0365-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0364-Entity-Activation-Range-2.0.patch
rename to patches/server/0365-Entity-Activation-Range-2.0.patch
index b64c3d6668..9f184220cf 100644
--- a/patches/server/0364-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0365-Entity-Activation-Range-2.0.patch
@@ -124,7 +124,7 @@ index 9f53a439fe196f2347dd4eb5b05c1fe80beb593f..256ae7b9e587402648133498e35fa18f
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 44835dc1a22d485ec3205d375a14be165a87b613..751e87bc953192a5688ac84765dcb30916d85c3d 100644
+index 413d86b15c245a17246e23611cd65739e8fd18dd..4185041c576349adc14d20926d0f7ddd00145c53 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -326,6 +326,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0365-Increase-Light-Queue-Size.patch b/patches/server/0366-Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/0365-Increase-Light-Queue-Size.patch
rename to patches/server/0366-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0366-Fix-Light-Command.patch b/patches/server/0367-Fix-Light-Command.patch
similarity index 98%
rename from patches/server/0366-Fix-Light-Command.patch
rename to patches/server/0367-Fix-Light-Command.patch
index d203856b21..c72c15425a 100644
--- a/patches/server/0366-Fix-Light-Command.patch
+++ b/patches/server/0367-Fix-Light-Command.patch
@@ -134,7 +134,7 @@ index 71ffa66973d8994e2a480435ac1ada3fe61600a4..7b5afc5d34b78e6404c1a5c6bb823d95
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7345d92ccebf6ca4011e2845628e2cf29b462277..d11c04ddd2bb40f1d0bbc98da8eb43a9f7b57f63 100644
+index dba2801b8e3101bd9c6fb87e57db634754f0c8cd..63ff633834ec00479cc0916d5b2eef42fd6d5e42 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -128,6 +128,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0367-Anti-Xray.patch b/patches/server/0368-Anti-Xray.patch
similarity index 99%
rename from patches/server/0367-Anti-Xray.patch
rename to patches/server/0368-Anti-Xray.patch
index 5e46c5b212..590d002b25 100644
--- a/patches/server/0367-Anti-Xray.patch
+++ b/patches/server/0368-Anti-Xray.patch
@@ -1105,7 +1105,7 @@ index c28879f32b004f36ff746ea2274f91ddd9501e71..7762d8ff94f856d613a6f50311006b69
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d11c04ddd2bb40f1d0bbc98da8eb43a9f7b57f63..2e08fc8f9d139609e063f4c7d8f3f2bf440abf0d 100644
+index 63ff633834ec00479cc0916d5b2eef42fd6d5e42..4123f529e0bbd97a6a25a08e6e8d129c5e322eb7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1487,7 +1487,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1118,7 +1118,7 @@ index d11c04ddd2bb40f1d0bbc98da8eb43a9f7b57f63..2e08fc8f9d139609e063f4c7d8f3f2bf
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9514eace33ef9de9a1d92f602549552456dc4ceb..5a397c3f0f21ec8dc9b7ceecbc873cdf6843e203 100644
+index 256ae7b9e587402648133498e35fa18f8c0be455..0b457e12a590cc465a1d0a89a016f3f79504a9b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -292,7 +292,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -1446,7 +1446,7 @@ index 245998e2cea32cf15ee2659639c647f449704ec0..d455eafe3810b6d8f3c6cbbfc0df85d3
      @Override
      public FluidState getFluidIfLoaded(BlockPos blockposition) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 7c04aef3eac54981ca1e34cb87d97104c3c9685b..097d38f12ef324dbb529a833383e2da949377f9c 100644
+index c131f6093c395b4d9e401d3c447e7fb13c631ecf..c09a1c640075bde9f656b11258f5adbd2daa4b0b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -136,7 +136,7 @@ public class ChunkSerializer {
diff --git a/patches/server/0368-No-Tick-view-distance-implementation.patch b/patches/server/0369-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from patches/server/0368-No-Tick-view-distance-implementation.patch
rename to patches/server/0369-No-Tick-view-distance-implementation.patch
index 9ddb406934..9bdd1a024a 100644
--- a/patches/server/0368-No-Tick-view-distance-implementation.patch
+++ b/patches/server/0369-No-Tick-view-distance-implementation.patch
@@ -145,7 +145,7 @@ index 2aa86f35b8960273ad91b21e260bcf91cf861e08..8fff5580a88fd1643845967eb7bdab26
  
      public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getOrScheduleFuture(ChunkStatus targetStatus, ChunkMap chunkStorage) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2e08fc8f9d139609e063f4c7d8f3f2bf440abf0d..63608698747abc8577fe2bd6746e779122377895 100644
+index 4123f529e0bbd97a6a25a08e6e8d129c5e322eb7..4af8caff4231fbb8e1997dfa5479cf8fa932f0f4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -127,7 +127,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0369-Implement-alternative-item-despawn-rate.patch b/patches/server/0370-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0369-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0370-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0370-Tracking-Range-Improvements.patch b/patches/server/0371-Tracking-Range-Improvements.patch
similarity index 97%
rename from patches/server/0370-Tracking-Range-Improvements.patch
rename to patches/server/0371-Tracking-Range-Improvements.patch
index 06044634af..8e8ba3d546 100644
--- a/patches/server/0370-Tracking-Range-Improvements.patch
+++ b/patches/server/0371-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 63608698747abc8577fe2bd6746e779122377895..0cbb735f1b4753f373eaadf57476c0b522a5cfc7 100644
+index 4af8caff4231fbb8e1997dfa5479cf8fa932f0f4..c795575e5ae259e78dbd3cb265a2eeeabee6c789 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1834,6 +1834,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/patches/server/0371-Fix-items-vanishing-through-end-portal.patch b/patches/server/0372-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0371-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0372-Fix-items-vanishing-through-end-portal.patch
index b0348524a0..3c47bebf34 100644
--- a/patches/server/0371-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0372-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 751e87bc953192a5688ac84765dcb30916d85c3d..8e9dd40960bcf2c8685a2d8b33a2cc8eb4b292de 100644
+index 4185041c576349adc14d20926d0f7ddd00145c53..9f3447ba69fcbfb60b778b60851a0caf4cd3ddf9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3005,6 +3005,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0372-implement-optional-per-player-mob-spawns.patch b/patches/server/0373-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0372-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0373-implement-optional-per-player-mob-spawns.patch
index 02ebdb647f..2cbd9f051d 100644
--- a/patches/server/0372-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0373-implement-optional-per-player-mob-spawns.patch
@@ -545,7 +545,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0cbb735f1b4753f373eaadf57476c0b522a5cfc7..e10ded850c770a6aaa5321693525296ee77bb7e0 100644
+index c795575e5ae259e78dbd3cb265a2eeeabee6c789..d329d07532d4e4017a4c5cfad7b18795ab8a5186 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -145,6 +145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0374-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0374-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0375-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0375-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch b/patches/server/0377-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0376-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0377-Add-debug-for-sync-chunk-loads.patch
index c9a739c998..42c5243361 100644
--- a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0377-Add-debug-for-sync-chunk-loads.patch
@@ -291,7 +291,7 @@ index c22b7cfdcff46161444cd145a50678e982f2f645..acb710c25a3b1a151a6dbf579a871529
              chunkproviderserver_a.managedBlock(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5a397c3f0f21ec8dc9b7ceecbc873cdf6843e203..0eed1e0c2c87f9c5ab14ad2d4971e3724ab2135d 100644
+index 0b457e12a590cc465a1d0a89a016f3f79504a9b1..3b7585760483b077783a28de8d04ba438eb25c16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -280,6 +280,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0377-Allow-overriding-the-java-version-check.patch b/patches/server/0378-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0377-Allow-overriding-the-java-version-check.patch
rename to patches/server/0378-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0378-Add-ThrownEggHatchEvent.patch b/patches/server/0379-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0378-Add-ThrownEggHatchEvent.patch
rename to patches/server/0379-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0379-Optimise-random-block-ticking.patch b/patches/server/0380-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0379-Optimise-random-block-ticking.patch
rename to patches/server/0380-Optimise-random-block-ticking.patch
index 65d4abd3ea..1e3109e778 100644
--- a/patches/server/0379-Optimise-random-block-ticking.patch
+++ b/patches/server/0380-Optimise-random-block-ticking.patch
@@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..3edc8e52e06a62ce9f8cc734fd7458b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0eed1e0c2c87f9c5ab14ad2d4971e3724ab2135d..69207f264d68e7181b8d3681ac18e0f9c5d74ec8 100644
+index 3b7585760483b077783a28de8d04ba438eb25c16..5f499f2d8e62fc6f28c180c857582bd6c895c98c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -673,7 +673,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0380-Entity-Jump-API.patch b/patches/server/0381-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0380-Entity-Jump-API.patch
rename to patches/server/0381-Entity-Jump-API.patch
diff --git a/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 97%
rename from patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 433631fa2f..1b41ae13af 100644
--- a/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -21,7 +21,7 @@ index b6d680d6d6762125db180638ee43bf9ece4dc51a..c9b5f662b94e47a25949449af8ce42ed
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8e9dd40960bcf2c8685a2d8b33a2cc8eb4b292de..ed46bb23229b80c929e28bc0b128dfa494460a55 100644
+index 9f3447ba69fcbfb60b778b60851a0caf4cd3ddf9..c1b52e5a54bc7a2a623f7b2ec439ca9dbc76328d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -328,6 +328,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0382-Make-the-GUI-graph-fancier.patch b/patches/server/0383-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0382-Make-the-GUI-graph-fancier.patch
rename to patches/server/0383-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0384-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0384-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0384-Prevent-teleporting-dead-entities.patch b/patches/server/0385-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0384-Prevent-teleporting-dead-entities.patch
rename to patches/server/0385-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0385-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0386-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0385-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0386-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0388-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0388-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0388-Optimise-Chunk-getFluid.patch b/patches/server/0389-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0388-Optimise-Chunk-getFluid.patch
rename to patches/server/0389-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch
rename to patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch
index e2b948537b..990782ae6c 100644
--- a/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch
+++ b/patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch
@@ -941,7 +941,7 @@ index acb710c25a3b1a151a6dbf579a871529f077b70f..b0ff4a46807994e3afe4c8dc3810ecdd
      public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean flag, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<DimensionDataStorage> supplier) {
          this.level = world;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 69207f264d68e7181b8d3681ac18e0f9c5d74ec8..ee5d6c21f49749cfd40e81c2cdff72b0b3ed6fba 100644
+index 5f499f2d8e62fc6f28c180c857582bd6c895c98c..6d2cad8e6bee4f83e39bc0d6949c3c94b1961bc2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -295,6 +295,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0391-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0391-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0392-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0392-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0393-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0393-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 366bd6c27e..802b6b56ae 100644
--- a/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e10ded850c770a6aaa5321693525296ee77bb7e0..aa671a25e458ab2f382b37fc1517c98ab99949fb 100644
+index d329d07532d4e4017a4c5cfad7b18795ab8a5186..d3966c1e648df8714b422644703b4d27f0db31ad 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1509,6 +1509,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -26,7 +26,7 @@ index e10ded850c770a6aaa5321693525296ee77bb7e0..aa671a25e458ab2f382b37fc1517c98a
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ee5d6c21f49749cfd40e81c2cdff72b0b3ed6fba..5a73812bace35923bb4dbbfcf691427aa9eaa671 100644
+index 6d2cad8e6bee4f83e39bc0d6949c3c94b1961bc2..7ab4d8459b3396640f711f2670d91ba4945dc074 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2126,7 +2126,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0394-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0395-Optimize-Collision-to-not-load-chunks.patch
similarity index 98%
rename from patches/server/0394-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0395-Optimize-Collision-to-not-load-chunks.patch
index 1566f7452d..b1a80407db 100644
--- a/patches/server/0394-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0395-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 2730923bd0bf3b0f928765b9e09e2299fa9a393d..f98a1c32e0c209473cf7268cbd8245ab
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 745d540572b901ae4a20dd13486d0bbc8aba9573..581f80c490932f66f57e7a91d8738e09521f5a1c 100644
+index c1b52e5a54bc7a2a623f7b2ec439ca9dbc76328d..7120400af3e6a36f9b097fe9dfaff655209b03ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0395-Don-t-tick-dead-players.patch b/patches/server/0396-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0395-Don-t-tick-dead-players.patch
rename to patches/server/0396-Don-t-tick-dead-players.patch
diff --git a/patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0397-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0397-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 99%
rename from patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to patches/server/0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 706bb9dac5..f73be2dfad 100644
--- a/patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/patches/server/0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -70,7 +70,7 @@ index 9c88426ab1275ee5fb6e28be8b213533dc4ab859..87c9a5c1b43f6010898d72136b5eb997
              List<ChunkHolder> allChunks = new ArrayList<>(visibleChunks.values());
              List<ServerPlayer> players = world.players;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index aa671a25e458ab2f382b37fc1517c98ab99949fb..fbb58957c925fbefa623f7cf9856f2c427bd006d 100644
+index d3966c1e648df8714b422644703b4d27f0db31ad..69b6b510f12a0743aac2100cd7b58687d59e919c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -112,9 +112,36 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 99%
rename from patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index 48733b701c..506c1b1a98 100644
--- a/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -226,7 +226,7 @@ index d8cd652f76232b43b104b11247682288e99d9521..b464db85829f2f97926791056b339b93
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
          public boolean pollTask() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5a73812bace35923bb4dbbfcf691427aa9eaa671..2188666675192cb02e0bccf845cf7863486a305b 100644
+index 7ab4d8459b3396640f711f2670d91ba4945dc074..0d553955460bf54181b8e3674c783c0febc30ce9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -587,6 +587,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0399-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0400-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0399-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0400-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0400-Add-tick-times-API-and-mspt-command.patch b/patches/server/0401-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0400-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0401-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0401-Expose-MinecraftServer-isRunning.patch b/patches/server/0402-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0401-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0402-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0402-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0403-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0402-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0403-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0403-Remove-streams-from-Mob-AI-System.patch b/patches/server/0404-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/0403-Remove-streams-from-Mob-AI-System.patch
rename to patches/server/0404-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0404-Async-command-map-building.patch b/patches/server/0405-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0404-Async-command-map-building.patch
rename to patches/server/0405-Async-command-map-building.patch
diff --git a/patches/server/0405-Improved-Watchdog-Support.patch b/patches/server/0406-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0405-Improved-Watchdog-Support.patch
rename to patches/server/0406-Improved-Watchdog-Support.patch
index a1771d1af6..0646c4bf19 100644
--- a/patches/server/0405-Improved-Watchdog-Support.patch
+++ b/patches/server/0406-Improved-Watchdog-Support.patch
@@ -262,7 +262,7 @@ index 0511f1921193b78cbf4d8426136bf1f79746f955..e5f7f043cbdb28d85b8aa0eea7cbaeb5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fbb58957c925fbefa623f7cf9856f2c427bd006d..719671e363af86023faae1e41bd5cacdea235908 100644
+index 69b6b510f12a0743aac2100cd7b58687d59e919c..dbd256b7be670d30fc68ceaa9e498bf55b405b56 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -611,6 +611,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0406-Optimize-Pathfinding.patch b/patches/server/0407-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0406-Optimize-Pathfinding.patch
rename to patches/server/0407-Optimize-Pathfinding.patch
diff --git a/patches/server/0407-Reduce-Either-Optional-allocation.patch b/patches/server/0408-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0407-Reduce-Either-Optional-allocation.patch
rename to patches/server/0408-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0408-Remove-streams-from-PairedQueue.patch b/patches/server/0409-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/0408-Remove-streams-from-PairedQueue.patch
rename to patches/server/0409-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0409-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0410-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0409-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0410-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0410-Prevent-opening-inventories-when-frozen.patch b/patches/server/0411-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0410-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0411-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0411-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0412-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0411-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0412-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0412-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0413-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0412-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0413-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0413-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0414-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/0413-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/server/0414-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0414-Implement-Player-Client-Options-API.patch b/patches/server/0415-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0414-Implement-Player-Client-Options-API.patch
rename to patches/server/0415-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0415-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0416-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 97%
rename from patches/server/0415-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0416-Fix-Chunk-Post-Processing-deadlock-risk.patch
index edeaef0e7c..0a3c8ecd84 100644
--- a/patches/server/0415-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0416-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash
 for heightmaps.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 719671e363af86023faae1e41bd5cacdea235908..c133b7784aa0ed496c08c6a4bb252e36faf173cb 100644
+index dbd256b7be670d30fc68ceaa9e498bf55b405b56..9e17cfcf24d3c4358e650adac45d0ade81119fc2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -195,6 +195,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0417-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0417-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0417-Broadcast-join-message-to-console.patch b/patches/server/0418-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0417-Broadcast-join-message-to-console.patch
rename to patches/server/0418-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 6d00bd91c0..b4e4b68eeb 100644
--- a/patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c133b7784aa0ed496c08c6a4bb252e36faf173cb..333c41812159df37c27b632686c836e6cd62885e 100644
+index 9e17cfcf24d3c4358e650adac45d0ade81119fc2..4fde1b06f0f10b59386b7f510e2ca494d507397b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1602,6 +1602,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0420-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0420-Load-Chunks-for-Login-Asynchronously.patch
index eeb4ef8eda..aa3b0897a6 100644
--- a/patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0420-Load-Chunks-for-Login-Asynchronously.patch
@@ -250,7 +250,7 @@ index 3a13c151066c8784fdc844e1d6310f77ff32e7f1..c4242a1602bbb02541c330bc02016f15
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca458234ec19708954fc051b3594ca3004f245ed..03c915c52f81d7a96c858000d58bfcec329df85f 100644
+index 7120400af3e6a36f9b097fe9dfaff655209b03ce..d9ed724d07309f23c91f20c9af888cce5127e323 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1511,7 +1511,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 93%
rename from patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 6167869a0a..af838ecc21 100644
--- a/patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 03c915c52f81d7a96c858000d58bfcec329df85f..309bd9d45b74ccb1f72cabe0911b5979091a796d 100644
+index d9ed724d07309f23c91f20c9af888cce5127e323..16257d3d0e822d562e1a309fc6ab109dbdd7c13e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2000,9 +2000,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0422-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0422-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 95%
rename from patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to patches/server/0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index 23018abe5b..727c614ce9 100644
--- a/patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/patches/server/0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 333c41812159df37c27b632686c836e6cd62885e..8c83a5ba2be36a113c3a7a694b075ac8bc070bd5 100644
+index 4fde1b06f0f10b59386b7f510e2ca494d507397b..d36b38088adf19273cc5ee55788090da40f4b746 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -178,17 +178,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0424-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0424-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0425-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0425-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 98%
rename from patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 21b70c084e..0c5142cd5d 100644
--- a/patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 309bd9d45b74ccb1f72cabe0911b5979091a796d..2003e18898a12ad8ef0312ec4d9f337263ae7d33 100644
+index 16257d3d0e822d562e1a309fc6ab109dbdd7c13e..58b5d3442ac90e15bd35e4d423af44b88ca257dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2147,11 +2147,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0426-Implement-Brigadier-Mojang-API.patch b/patches/server/0427-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0426-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0427-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0427-Villager-Restocks-API.patch b/patches/server/0428-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0427-Villager-Restocks-API.patch
rename to patches/server/0428-Villager-Restocks-API.patch
diff --git a/patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0429-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0429-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0429-Expose-game-version.patch b/patches/server/0430-Expose-game-version.patch
similarity index 100%
rename from patches/server/0429-Expose-game-version.patch
rename to patches/server/0430-Expose-game-version.patch
diff --git a/patches/server/0430-Optimize-Voxel-Shape-Merging.patch b/patches/server/0431-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0430-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0431-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0432-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0432-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0432-Implement-Mob-Goal-API.patch b/patches/server/0433-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0432-Implement-Mob-Goal-API.patch
rename to patches/server/0433-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
index 83a503ff69..e73d52a92c 100644
--- a/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
@@ -18,7 +18,7 @@ index 11fd6d24ed0612e4df1a0493907178fb9c455d1c..d7023cb0974f6c28a0fb8a0a6e5a6600
          return initialDistance;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8c83a5ba2be36a113c3a7a694b075ac8bc070bd5..d309a80a3f8f6aadb9c8b7b84d2c4e2379334ef9 100644
+index d36b38088adf19273cc5ee55788090da40f4b746..ad85a7c86de78323b8ef31a9d4c06614500edcb6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -63,6 +63,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
@@ -312,7 +312,7 @@ index 28afe2f238ded241acf77c3272a44068646b9133..6b492b72b177e3c58580561585609b17
          List<Entity> list = this.entity.getPassengers();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2003e18898a12ad8ef0312ec4d9f337263ae7d33..3816c478551df2dad89d6fc42576d8050d4cb249 100644
+index 58b5d3442ac90e15bd35e4d423af44b88ca257dc..1afb2cf4fd5938346ab035fab2af960049b5d7d3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -50,6 +50,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0435-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0435-Optimize-isOutsideRange-to-use-distance-maps.patch
index f98f39f83b..20a894e489 100644
--- a/patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/patches/server/0435-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -37,7 +37,7 @@ index 97faf7ece336928f22e518a14653b4fbc672d876..c2401b2ff0547335ddbbeb05c07b7455
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d309a80a3f8f6aadb9c8b7b84d2c4e2379334ef9..5617839ad26e2b349746ca82e00ba17c677ebeab 100644
+index ad85a7c86de78323b8ef31a9d4c06614500edcb6..20cdfe69f7023e4711277839d05e14d6c6bdf0da 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -241,6 +241,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0435-Add-villager-reputation-API.patch b/patches/server/0436-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0435-Add-villager-reputation-API.patch
rename to patches/server/0436-Add-villager-reputation-API.patch
diff --git a/patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0437-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0437-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0437-ExperienceOrbMergeEvent.patch b/patches/server/0438-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0437-ExperienceOrbMergeEvent.patch
rename to patches/server/0438-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0439-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0439-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0439-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0440-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0439-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0440-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0440-Potential-bed-API.patch b/patches/server/0441-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0440-Potential-bed-API.patch
rename to patches/server/0441-Potential-bed-API.patch
diff --git a/patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0442-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0442-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0442-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0443-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0442-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0443-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0444-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0445-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0444-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0445-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 0038885ce3..9c45b359c7 100644
--- a/patches/server/0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5617839ad26e2b349746ca82e00ba17c677ebeab..b9049dd6e5f254289f20aefefaf68e2ef5adac1b 100644
+index 20cdfe69f7023e4711277839d05e14d6c6bdf0da..ee37c952a91cac91145d3c2418a817633e04f573 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -2144,9 +2144,14 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/patches/server/0446-Ensure-safe-gateway-teleport.patch b/patches/server/0447-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0446-Ensure-safe-gateway-teleport.patch
rename to patches/server/0447-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0447-Add-option-for-console-having-all-permissions.patch b/patches/server/0448-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0447-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0448-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 98%
rename from patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
index 7b2d1c7f8f..713c10ae21 100644
--- a/patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
+++ b/patches/server/0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
@@ -16,7 +16,7 @@ We further improve it by making a copy of the nbt tag with only the memory
 it needs, so that we dont have to hold a copy to the entire compound.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 097d38f12ef324dbb529a833383e2da949377f9c..1f95ac18990822a64f0bb2af947693c4b88cdf73 100644
+index c09a1c640075bde9f656b11258f5adbd2daa4b0b..dfa628aa486dff135a32a023421c803b8259271a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -27,6 +27,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0450-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0450-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0450-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0451-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0450-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0451-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0451-Maps-shouldn-t-load-chunks.patch b/patches/server/0452-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0451-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0452-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0453-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0453-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0455-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0455-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0459-Fix-sand-duping.patch b/patches/server/0460-Fix-sand-duping.patch
similarity index 94%
rename from patches/server/0459-Fix-sand-duping.patch
rename to patches/server/0460-Fix-sand-duping.patch
index dd88074406..7b6db3480b 100644
--- a/patches/server/0459-Fix-sand-duping.patch
+++ b/patches/server/0460-Fix-sand-duping.patch
@@ -7,7 +7,7 @@ If the falling block dies during teleportation (entity#move), then we need
 to detect that by placing a check after the move.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 2332a00780edcf054ec63a60a42962033d0cc74a..2fad050547242028d4ff2deb613e074190f51341 100644
+index 0d476aa50170ad3623462306769020518c55cffb..5d89acffe7df54b79733bebba342ea694339ac4b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -106,6 +106,11 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0462-Expose-Arrow-getItemStack.patch b/patches/server/0463-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0462-Expose-Arrow-getItemStack.patch
rename to patches/server/0463-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0465-Add-permission-for-command-blocks.patch b/patches/server/0466-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0465-Add-permission-for-command-blocks.patch
rename to patches/server/0466-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 94%
rename from patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
index f2f0cbbf3f..40bc833f57 100644
--- a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3816c478551df2dad89d6fc42576d8050d4cb249..2dcf344bcbc17fbe1ebca29756c36e36b06b7185 100644
+index 1afb2cf4fd5938346ab035fab2af960049b5d7d3..5db6b853e61e62e40e55034d5738717664cb9245 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -560,7 +560,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 97%
rename from patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
index 451b0b42d2..4fa55c2806 100644
--- a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2dcf344bcbc17fbe1ebca29756c36e36b06b7185..3352097dfbee8ed374e55d4ef9b7f9b2e0c8b58c 100644
+index 5db6b853e61e62e40e55034d5738717664cb9245..4965d6beb0486400f5d28220d6e132e2029cf86e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1044,7 +1044,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0469-Paper-dumpitem-command.patch b/patches/server/0470-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0469-Paper-dumpitem-command.patch
rename to patches/server/0470-Paper-dumpitem-command.patch
diff --git a/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0471-Improve-Legacy-Component-serialization-size.patch b/patches/server/0472-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0471-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0472-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0473-Support-old-UUID-format-for-NBT.patch b/patches/server/0474-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0473-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0474-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0476-Remove-some-streams-from-structures.patch b/patches/server/0477-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0476-Remove-some-streams-from-structures.patch
rename to patches/server/0477-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0479-Support-components-in-ItemMeta.patch b/patches/server/0480-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0479-Support-components-in-ItemMeta.patch
rename to patches/server/0480-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0481-Add-entity-liquid-API.patch b/patches/server/0482-Add-entity-liquid-API.patch
similarity index 95%
rename from patches/server/0481-Add-entity-liquid-API.patch
rename to patches/server/0482-Add-entity-liquid-API.patch
index 1c45a1feef..d3b308c4d5 100644
--- a/patches/server/0481-Add-entity-liquid-API.patch
+++ b/patches/server/0482-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3352097dfbee8ed374e55d4ef9b7f9b2e0c8b58c..831290b1f2a6fd0e683085b0cbaee68ee7d1cf5e 100644
+index 4965d6beb0486400f5d28220d6e132e2029cf86e..b410001403e4a984e1ea7f5fdb3adc866631e80f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1339,7 +1339,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0483-Spawn-player-in-correct-world-on-login.patch b/patches/server/0484-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0483-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0484-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0484-Add-PrepareResultEvent.patch b/patches/server/0485-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0484-Add-PrepareResultEvent.patch
rename to patches/server/0485-Add-PrepareResultEvent.patch
diff --git a/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0492-Move-range-check-for-block-placing-up.patch b/patches/server/0493-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0492-Move-range-check-for-block-placing-up.patch
rename to patches/server/0493-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0493-Fix-SPIGOT-5989.patch b/patches/server/0494-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0493-Fix-SPIGOT-5989.patch
rename to patches/server/0494-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0498-Fix-some-rails-connecting-improperly.patch b/patches/server/0499-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0498-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0499-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0499-Fix-MC-187716-Use-configured-height.patch b/patches/server/0500-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0499-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0500-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 96%
rename from patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 1295fddae3..4f0b103ed2 100644
--- a/patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch
@@ -9,7 +9,7 @@ the game, immediately stop the server to prevent data corruption.
 You can override this functionality at your own peril.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index e1330caba0574c94e5343ea1e444b511edf07b05..76fbb61fc863577aa8627c7b1d9a84b8929e42b6 100644
+index f4f41b8e807c462aa5f06aed6488b1ef52bae330..6ada9cbdc04ebde65c833b5c74a5cf2161c53a1a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -98,10 +98,25 @@ public class ChunkSerializer {
diff --git a/patches/server/0502-Brand-support.patch b/patches/server/0503-Brand-support.patch
similarity index 100%
rename from patches/server/0502-Brand-support.patch
rename to patches/server/0503-Brand-support.patch
diff --git a/patches/server/0503-Add-setMaxPlayers-API.patch b/patches/server/0504-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0503-Add-setMaxPlayers-API.patch
rename to patches/server/0504-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0505-Don-t-require-FACING-data.patch b/patches/server/0506-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0505-Don-t-require-FACING-data.patch
rename to patches/server/0506-Don-t-require-FACING-data.patch
diff --git a/patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0507-Add-moon-phase-API.patch b/patches/server/0508-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0507-Add-moon-phase-API.patch
rename to patches/server/0508-Add-moon-phase-API.patch
diff --git a/patches/server/0508-Prevent-headless-pistons-from-being-created.patch b/patches/server/0509-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0508-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0509-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0509-Add-BellRingEvent.patch b/patches/server/0510-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0509-Add-BellRingEvent.patch
rename to patches/server/0510-Add-BellRingEvent.patch
diff --git a/patches/server/0510-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0510-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0511-Buffer-joins-to-world.patch b/patches/server/0512-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0511-Buffer-joins-to-world.patch
rename to patches/server/0512-Buffer-joins-to-world.patch
diff --git a/patches/server/0512-Optimize-redstone-algorithm.patch b/patches/server/0513-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0512-Optimize-redstone-algorithm.patch
rename to patches/server/0513-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0515-Fix-CraftTeam-null-check.patch b/patches/server/0516-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0515-Fix-CraftTeam-null-check.patch
rename to patches/server/0516-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0516-Add-more-Evoker-API.patch b/patches/server/0517-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0516-Add-more-Evoker-API.patch
rename to patches/server/0517-Add-more-Evoker-API.patch
diff --git a/patches/server/0517-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0517-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0519-Cache-block-data-strings.patch b/patches/server/0520-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0519-Cache-block-data-strings.patch
rename to patches/server/0520-Cache-block-data-strings.patch
diff --git a/patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0527-Entity-isTicking.patch b/patches/server/0528-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0527-Entity-isTicking.patch
rename to patches/server/0528-Entity-isTicking.patch
diff --git a/patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0529-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0529-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0530-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0530-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0531-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0531-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0532-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0532-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0533-Optimise-getType-calls.patch b/patches/server/0534-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0533-Optimise-getType-calls.patch
rename to patches/server/0534-Optimise-getType-calls.patch
diff --git a/patches/server/0534-Villager-resetOffers.patch b/patches/server/0535-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0534-Villager-resetOffers.patch
rename to patches/server/0535-Villager-resetOffers.patch
diff --git a/patches/server/0535-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0535-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0536-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0536-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0537-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0537-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0538-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0538-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0539-Player-elytra-boost-API.patch b/patches/server/0540-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0539-Player-elytra-boost-API.patch
rename to patches/server/0540-Player-elytra-boost-API.patch
diff --git a/patches/server/0540-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0540-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0541-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0541-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0542-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0542-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0543-Add-ignore-discounts-API.patch b/patches/server/0544-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0543-Add-ignore-discounts-API.patch
rename to patches/server/0544-Add-ignore-discounts-API.patch
diff --git a/patches/server/0544-Toggle-for-removing-existing-dragon.patch b/patches/server/0545-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0544-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0545-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0545-Fix-client-lag-on-advancement-loading.patch b/patches/server/0546-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0545-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0546-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0546-Item-no-age-no-player-pickup.patch b/patches/server/0547-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0546-Item-no-age-no-player-pickup.patch
rename to patches/server/0547-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0547-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0547-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0548-Beacon-API-custom-effect-ranges.patch b/patches/server/0549-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0548-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0549-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0549-Add-API-for-quit-reason.patch b/patches/server/0550-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0549-Add-API-for-quit-reason.patch
rename to patches/server/0550-Add-API-for-quit-reason.patch
diff --git a/patches/server/0550-Seed-based-feature-search.patch b/patches/server/0551-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0550-Seed-based-feature-search.patch
rename to patches/server/0551-Seed-based-feature-search.patch
diff --git a/patches/server/0551-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0551-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0552-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0552-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0553-Expose-world-spawn-angle.patch b/patches/server/0554-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0553-Expose-world-spawn-angle.patch
rename to patches/server/0554-Expose-world-spawn-angle.patch
diff --git a/patches/server/0554-Add-Destroy-Speed-API.patch b/patches/server/0555-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0554-Add-Destroy-Speed-API.patch
rename to patches/server/0555-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0556-Add-LivingEntity-clearActiveItem.patch b/patches/server/0557-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0556-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0557-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0557-Add-PlayerItemCooldownEvent.patch b/patches/server/0558-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0557-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0558-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0558-More-lightning-API.patch b/patches/server/0559-More-lightning-API.patch
similarity index 100%
rename from patches/server/0558-More-lightning-API.patch
rename to patches/server/0559-More-lightning-API.patch
diff --git a/patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0560-Added-missing-default-perms-for-commands.patch b/patches/server/0561-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0560-Added-missing-default-perms-for-commands.patch
rename to patches/server/0561-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0561-Add-PlayerShearBlockEvent.patch b/patches/server/0562-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0561-Add-PlayerShearBlockEvent.patch
rename to patches/server/0562-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0562-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0562-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0563-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0563-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0564-Limit-recipe-packets.patch b/patches/server/0565-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0564-Limit-recipe-packets.patch
rename to patches/server/0565-Limit-recipe-packets.patch
diff --git a/patches/server/0565-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0565-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0566-MC-4-Fix-item-position-desync.patch b/patches/server/0567-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0566-MC-4-Fix-item-position-desync.patch
rename to patches/server/0567-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0567-Player-Chunk-Load-Unload-Events.patch b/patches/server/0568-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0567-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0568-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0568-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0568-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0569-Expose-LivingEntity-hurt-direction.patch b/patches/server/0570-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0569-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0570-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0570-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0570-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0571-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0571-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0572-added-PlayerTradeEvent.patch b/patches/server/0573-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0572-added-PlayerTradeEvent.patch
rename to patches/server/0573-added-PlayerTradeEvent.patch
diff --git a/patches/server/0573-Implement-TargetHitEvent.patch b/patches/server/0574-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0573-Implement-TargetHitEvent.patch
rename to patches/server/0574-Implement-TargetHitEvent.patch
diff --git a/patches/server/0574-Additional-Block-Material-API-s.patch b/patches/server/0575-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0574-Additional-Block-Material-API-s.patch
rename to patches/server/0575-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0575-Fix-harming-potion-dupe.patch b/patches/server/0576-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0575-Fix-harming-potion-dupe.patch
rename to patches/server/0576-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0576-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0576-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0577-Cache-burn-durations.patch b/patches/server/0578-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0577-Cache-burn-durations.patch
rename to patches/server/0578-Cache-burn-durations.patch
diff --git a/patches/server/0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0579-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0579-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0580-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0580-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0581-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0581-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0582-Zombie-API-breaking-doors.patch b/patches/server/0583-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0582-Zombie-API-breaking-doors.patch
rename to patches/server/0583-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0583-Fix-nerfed-slime-when-splitting.patch b/patches/server/0584-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0583-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0584-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0584-Add-EntityLoadCrossbowEvent.patch b/patches/server/0585-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0584-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0585-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0585-Guardian-beam-workaround.patch b/patches/server/0586-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0585-Guardian-beam-workaround.patch
rename to patches/server/0586-Guardian-beam-workaround.patch
diff --git a/patches/server/0586-Added-WorldGameRuleChangeEvent.patch b/patches/server/0587-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0586-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0587-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0587-Added-ServerResourcesReloadedEvent.patch b/patches/server/0588-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0587-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0588-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0588-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0588-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0589-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0589-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0590-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0590-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0591-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0591-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0592-Configurable-door-breaking-difficulty.patch b/patches/server/0593-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0592-Configurable-door-breaking-difficulty.patch
rename to patches/server/0593-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0593-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0593-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0594-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0594-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0595-Remove-stale-POIs.patch b/patches/server/0596-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0595-Remove-stale-POIs.patch
rename to patches/server/0596-Remove-stale-POIs.patch
diff --git a/patches/server/0596-Fix-villager-boat-exploit.patch b/patches/server/0597-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0596-Fix-villager-boat-exploit.patch
rename to patches/server/0597-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0597-Add-sendOpLevel-API.patch b/patches/server/0598-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0597-Add-sendOpLevel-API.patch
rename to patches/server/0598-Add-sendOpLevel-API.patch
diff --git a/patches/server/0598-Add-StructureLocateEvent.patch b/patches/server/0599-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0598-Add-StructureLocateEvent.patch
rename to patches/server/0599-Add-StructureLocateEvent.patch
diff --git a/patches/server/0599-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0599-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0600-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0600-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0601-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0601-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0602-Make-schedule-command-per-world.patch b/patches/server/0603-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0602-Make-schedule-command-per-world.patch
rename to patches/server/0603-Make-schedule-command-per-world.patch
diff --git a/patches/server/0603-Configurable-max-leash-distance.patch b/patches/server/0604-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0603-Configurable-max-leash-distance.patch
rename to patches/server/0604-Configurable-max-leash-distance.patch
diff --git a/patches/server/0604-Implement-BlockPreDispenseEvent.patch b/patches/server/0605-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0604-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0605-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0605-Added-Vanilla-Entity-Tags.patch b/patches/server/0606-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0605-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0606-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0606-added-Wither-API.patch b/patches/server/0607-added-Wither-API.patch
similarity index 100%
rename from patches/server/0606-added-Wither-API.patch
rename to patches/server/0607-added-Wither-API.patch
diff --git a/patches/server/0607-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0607-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0608-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0608-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0614-add-DragonEggFormEvent.patch b/patches/server/0615-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0614-add-DragonEggFormEvent.patch
rename to patches/server/0615-add-DragonEggFormEvent.patch
diff --git a/patches/server/0615-EntityMoveEvent.patch b/patches/server/0616-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0615-EntityMoveEvent.patch
rename to patches/server/0616-EntityMoveEvent.patch
diff --git a/patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0617-Inline-shift-direction-fields.patch b/patches/server/0618-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0617-Inline-shift-direction-fields.patch
rename to patches/server/0618-Inline-shift-direction-fields.patch
diff --git a/patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0620-living-entity-allow-attribute-registration.patch b/patches/server/0621-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0620-living-entity-allow-attribute-registration.patch
rename to patches/server/0621-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0621-fix-dead-slime-setSize-invincibility.patch b/patches/server/0622-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0621-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0622-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0623-misc-debugging-dumps.patch b/patches/server/0624-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0623-misc-debugging-dumps.patch
rename to patches/server/0624-misc-debugging-dumps.patch
diff --git a/patches/server/0624-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0625-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0624-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0625-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0625-Expose-Tracked-Players.patch b/patches/server/0626-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0625-Expose-Tracked-Players.patch
rename to patches/server/0626-Expose-Tracked-Players.patch
diff --git a/patches/server/0626-Remove-streams-from-SensorNearest.patch b/patches/server/0627-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0626-Remove-streams-from-SensorNearest.patch
rename to patches/server/0627-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0627-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0627-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0628-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0628-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0629-Improve-ServerGUI.patch b/patches/server/0630-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0629-Improve-ServerGUI.patch
rename to patches/server/0630-Improve-ServerGUI.patch
diff --git a/patches/server/0630-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0630-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0631-fix-converting-txt-to-json-file.patch b/patches/server/0632-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0631-fix-converting-txt-to-json-file.patch
rename to patches/server/0632-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0632-Add-worldborder-events.patch b/patches/server/0633-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0632-Add-worldborder-events.patch
rename to patches/server/0633-Add-worldborder-events.patch
diff --git a/patches/server/0633-added-PlayerNameEntityEvent.patch b/patches/server/0634-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0633-added-PlayerNameEntityEvent.patch
rename to patches/server/0634-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0634-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0635-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0634-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0635-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0635-Add-recipe-to-cook-events.patch b/patches/server/0636-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0635-Add-recipe-to-cook-events.patch
rename to patches/server/0636-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0636-Add-Block-isValidTool.patch b/patches/server/0637-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0636-Add-Block-isValidTool.patch
rename to patches/server/0637-Add-Block-isValidTool.patch
diff --git a/patches/server/0637-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0637-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0638-Implement-Keyed-on-World.patch b/patches/server/0639-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0638-Implement-Keyed-on-World.patch
rename to patches/server/0639-Implement-Keyed-on-World.patch
diff --git a/patches/server/0639-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0639-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0640-Item-Rarity-API.patch b/patches/server/0641-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0640-Item-Rarity-API.patch
rename to patches/server/0641-Item-Rarity-API.patch
diff --git a/patches/server/0641-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0641-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0642-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0643-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0642-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0643-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0643-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0643-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0644-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0644-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0645-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0645-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0647-Expose-protocol-version.patch b/patches/server/0648-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0647-Expose-protocol-version.patch
rename to patches/server/0648-Expose-protocol-version.patch
diff --git a/patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0651-Add-bypass-host-check.patch b/patches/server/0652-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0651-Add-bypass-host-check.patch
rename to patches/server/0652-Add-bypass-host-check.patch
diff --git a/patches/server/0652-Set-area-affect-cloud-rotation.patch b/patches/server/0653-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0652-Set-area-affect-cloud-rotation.patch
rename to patches/server/0653-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0660-Added-PlayerDeepSleepEvent.patch b/patches/server/0661-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0660-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0661-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0661-More-World-API.patch b/patches/server/0662-More-World-API.patch
similarity index 100%
rename from patches/server/0661-More-World-API.patch
rename to patches/server/0662-More-World-API.patch
diff --git a/patches/server/0662-Added-PlayerBedFailEnterEvent.patch b/patches/server/0663-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0662-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0663-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0665-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0666-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0665-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0666-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0667-Add-Channel-initialization-listeners.patch b/patches/server/0668-Add-Channel-initialization-listeners.patch
similarity index 94%
rename from patches/server/0667-Add-Channel-initialization-listeners.patch
rename to patches/server/0668-Add-Channel-initialization-listeners.patch
index 0fb730c943..1e37cc2720 100644
--- a/patches/server/0667-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0668-Add-Channel-initialization-listeners.patch
@@ -106,11 +106,11 @@ index 0000000000000000000000000000000000000000..30e62719e0a83525daa33cf41cb61df3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 8fffe354d40c5fac4daa03af87c2323e307bd3ea..9c9368628845f316e157f6ae15b89c24af082d97 100644
+index 4e08fdf47fd201c26223fc8efb0ef4f6e884f8c7..5baf51571398d6af626dfa6be3b2e42d6dd29059 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -99,6 +99,7 @@ public class ServerConnectionListener {
-                     ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
+@@ -112,6 +112,7 @@ public class ServerConnectionListener {
+                     pending.add((Connection) object); // Paper
                      channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
                      ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
 +                    io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
diff --git a/patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0669-Add-more-WanderingTrader-API.patch b/patches/server/0670-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0669-Add-more-WanderingTrader-API.patch
rename to patches/server/0670-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0670-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0671-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0670-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0671-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0673-Inventory-close.patch b/patches/server/0674-Inventory-close.patch
similarity index 100%
rename from patches/server/0673-Inventory-close.patch
rename to patches/server/0674-Inventory-close.patch
diff --git a/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0676-Fix-CraftPotionBrewer-cache.patch b/patches/server/0677-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0676-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0677-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0677-Add-basic-Datapack-API.patch b/patches/server/0678-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0677-Add-basic-Datapack-API.patch
rename to patches/server/0678-Add-basic-Datapack-API.patch
diff --git a/patches/server/0678-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0679-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0678-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0679-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0680-Clear-SyncLoadInfo.patch b/patches/server/0681-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0680-Clear-SyncLoadInfo.patch
rename to patches/server/0681-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0681-ItemStack-repair-check-API.patch b/patches/server/0682-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0681-ItemStack-repair-check-API.patch
rename to patches/server/0682-ItemStack-repair-check-API.patch
diff --git a/patches/server/0682-More-Enchantment-API.patch b/patches/server/0683-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0682-More-Enchantment-API.patch
rename to patches/server/0683-More-Enchantment-API.patch
diff --git a/patches/server/0683-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0683-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0684-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0684-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0685-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0685-Add-Mob-lookAt-API.patch b/patches/server/0686-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0685-Add-Mob-lookAt-API.patch
rename to patches/server/0686-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0686-Add-Unix-domain-socket-support.patch b/patches/server/0687-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0686-Add-Unix-domain-socket-support.patch
rename to patches/server/0687-Add-Unix-domain-socket-support.patch
index 8f002d50bd..8eed70b82b 100644
--- a/patches/server/0686-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0687-Add-Unix-domain-socket-support.patch
@@ -69,10 +69,10 @@ index f5cb59aa72dfd22ec143360a131818bef4f1b701..eeefbb86cb88bd1b132bb6e22b4a4572
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 9c9368628845f316e157f6ae15b89c24af082d97..158933a67beadd7f667351d9826ba56f6cc7d781 100644
+index 5baf51571398d6af626dfa6be3b2e42d6dd29059..961660f6f9e00b93252519e38b74c66c53388ed2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -67,7 +67,12 @@ public class ServerConnectionListener {
+@@ -78,7 +78,12 @@ public class ServerConnectionListener {
          this.running = true;
      }
  
@@ -85,7 +85,7 @@ index 9c9368628845f316e157f6ae15b89c24af082d97..158933a67beadd7f667351d9826ba56f
          List list = this.channels;
  
          synchronized (this.channels) {
-@@ -75,7 +80,11 @@ public class ServerConnectionListener {
+@@ -86,7 +91,11 @@ public class ServerConnectionListener {
              LazyLoadedValue lazyinitvar;
  
              if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
@@ -97,7 +97,7 @@ index 9c9368628845f316e157f6ae15b89c24af082d97..158933a67beadd7f667351d9826ba56f
                  lazyinitvar = ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP;
                  ServerConnectionListener.LOGGER.info("Using epoll channel type");
              } else {
-@@ -101,7 +110,7 @@ public class ServerConnectionListener {
+@@ -114,7 +123,7 @@ public class ServerConnectionListener {
                      ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
                      io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
                  }
diff --git a/patches/server/0687-Add-EntityInsideBlockEvent.patch b/patches/server/0688-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0687-Add-EntityInsideBlockEvent.patch
rename to patches/server/0688-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0688-Attributes-API-for-item-defaults.patch b/patches/server/0689-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0688-Attributes-API-for-item-defaults.patch
rename to patches/server/0689-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0689-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0689-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0690-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0690-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0691-More-Lidded-Block-API.patch b/patches/server/0692-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0691-More-Lidded-Block-API.patch
rename to patches/server/0692-More-Lidded-Block-API.patch
diff --git a/patches/server/0692-Limit-item-frame-cursors-on-maps.patch b/patches/server/0693-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0692-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0693-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0693-Add-PufferFishStateChangeEvent.patch b/patches/server/0694-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0693-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0694-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0694-Add-PlayerKickEvent-causes.patch b/patches/server/0695-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0694-Add-PlayerKickEvent-causes.patch
rename to patches/server/0695-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0695-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0695-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0696-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0696-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0697-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0697-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0698-Add-BellRevealRaiderEvent.patch b/patches/server/0699-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0698-Add-BellRevealRaiderEvent.patch
rename to patches/server/0699-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0699-Fix-invulnerable-end-crystals.patch b/patches/server/0700-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0699-Fix-invulnerable-end-crystals.patch
rename to patches/server/0700-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0700-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0701-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0700-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0701-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0701-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0701-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0702-Fix-dangerous-end-portal-logic.patch b/patches/server/0703-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0702-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0703-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0704-Make-item-validations-configurable.patch b/patches/server/0705-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0704-Make-item-validations-configurable.patch
rename to patches/server/0705-Make-item-validations-configurable.patch
diff --git a/patches/server/0705-Add-more-line-of-sight-methods.patch b/patches/server/0706-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0705-Add-more-line-of-sight-methods.patch
rename to patches/server/0706-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0706-add-per-world-spawn-limits.patch b/patches/server/0707-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0706-add-per-world-spawn-limits.patch
rename to patches/server/0707-add-per-world-spawn-limits.patch
diff --git a/patches/server/0707-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0707-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch