From 72e87abc2db813ecd74a323c33a7b9c79b0c67b9 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 10 Sep 2023 12:28:03 +1000
Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight

Co-authored-by: Paul Sauve <paul@technove.co>
---
 ...cing-for-EntityLiving-hasLineOfSight.patch | 159 ++++++++++++++++++
 ...h-absorb-values-and-repair-bad-data.patch} |   2 +-
 ...75-Use-a-Shared-Random-for-Entities.patch} |   2 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |   0
 ...dBounds-and-getBlockState-for-inlin.patch} |   6 +-
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |   4 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   0
 ...0-Configurable-Chunk-Inhabited-Time.patch} |   0
 ...t.patch => 0081-EntityPathfindEvent.patch} |   0
 ...gionFileCache-and-make-configurable.patch} |   0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |   0
 ...084-Add-PlayerUseUnknownEntityEvent.patch} |   0
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   0
 ...-BlockPlaceEvent-triggering-physics.patch} |   0
 ...its.patch => 0087-Optimize-DataBits.patch} |   0
 ...illa-per-world-scoreboard-coloring-.patch} |   0
 ... 0089-Configurable-Player-Collision.patch} |   0
 ...nt-to-allow-plugins-to-handle-clien.patch} |   0
 ...> 0091-Configurable-RCON-IP-address.patch} |   0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   2 +-
 ...to-configure-frosted_ice-properties.patch} |   0
 ...possibility-for-getServer-singleton.patch} |   0
 ...tem-frames-performance-and-bug-fixe.patch} |   0
 ...API-Replenishable-Lootables-Feature.patch} |   0
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   0
 ...em-property-for-disabling-watchdoge.patch} |   0
 ... 0099-Async-GameProfileCache-saving.patch} |   2 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |   2 +-
 ...-redstone-torch-rapid-clock-removal.patch} |   2 +-
 ...h => 0102-Add-server-name-parameter.patch} |   2 +-
 ...sounds-to-same-world-if-limiting-ra.patch} |   2 +-
 ...locking-on-Network-Manager-creation.patch} |   0
 ...-profiles-that-have-no-UUID-and-no-.patch} |   0
 ...etting-for-proxy-online-mode-status.patch} |   0
 ...timise-BlockState-s-hashCode-equals.patch} |   0
 ...nfigurable-packet-in-spam-threshold.patch} |   2 +-
 ...9-Configurable-flying-kick-messages.patch} |   2 +-
 ...nt.patch => 0110-Add-EntityZapEvent.patch} |   0
 ...entity-nbt-data-from-falling-blocks.patch} |   0
 ...12-Cache-user-authenticator-threads.patch} |   0
 ...-Allow-Reloading-of-Command-Aliases.patch} |   0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   0
 ... => 0115-Add-ProjectileCollideEvent.patch} |   0
 ...ent-Pathfinding-out-of-World-Border.patch} |   0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   0
 ...igurable-Cartographer-Treasure-Maps.patch} |   0
 ...o-control-if-armour-stands-can-move.patch} |   0
 ...=> 0121-String-based-Action-Bar-API.patch} |   2 +-
 ...2-Properly-fix-item-duplication-bug.patch} |   2 +-
 ...-API-s.patch => 0123-Firework-API-s.patch} |   0
 ... 0124-PlayerTeleportEndGatewayEvent.patch} |   0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   4 +-
 ...h => 0126-Enforce-Sync-Player-Saves.patch} |   2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |   2 +-
 ...patch => 0128-Cap-Entity-Collisions.patch} |   4 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   0
 ...> 0130-Do-not-let-armorstands-drown.patch} |   0
 ...e-async-calls-to-restart-the-server.patch} |   0
 ...e-parrots-stay-on-shoulders-despite.patch} |   2 +-
 ...-option-to-prevent-player-names-fro.patch} |   0
 ...leAppender-for-console-improvements.patch} |   2 +-
 ...rable-option-to-disable-creeper-lin.patch} |   0
 ....patch => 0136-Item-canEntityPickup.patch} |   0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   0
 ...> 0138-PlayerAttemptPickupItemEvent.patch} |   0
 ...profile-lookups-to-worldgen-threads.patch} |   0
 ...tch => 0140-Add-UnknownCommandEvent.patch} |   0
 ...tch => 0141-Basic-PlayerProfile-API.patch} |   2 +-
 ... 0142-Shoulder-Entities-Release-API.patch} |   0
 ...patch => 0143-Profile-Lookup-Events.patch} |   0
 ...layer-logins-during-server-shutdown.patch} |   0
 ...patch => 0145-Entity-fromMobSpawner.patch} |   0
 ...6-Improve-the-Saddle-API-for-Horses.patch} |   0
 ...plement-ensureServerConversions-API.patch} |   0
 ...> 0148-Implement-getI18NDisplayName.patch} |   0
 ...=> 0149-ProfileWhitelistVerifyEvent.patch} |   0
 ...ch => 0150-Fix-this-stupid-bullshit.patch} |   0
 ...atch => 0151-LivingEntity-setKiller.patch} |   2 +-
 ...wns-should-honor-nametags-and-leash.patch} |   0
 ...mer-when-spawner-event-is-cancelled.patch} |   0
 ...a-custom-authentication-servers-dow.patch} |   0
 ...-prefixes-using-Log4J-configuration.patch} |   2 +-
 ...-Log4J-Configuration-Plugin-Loggers.patch} |   0
 ...t.patch => 0157-Add-PlayerJumpEvent.patch} |   2 +-
 ...le-ServerboundKeepAlivePacket-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} |   0
 ... => 0162-Add-PlayerArmorChangeEvent.patch} |   2 +-
 ...om-being-processed-when-the-player-.patch} |   0
 ...4-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   8 +-
 ...-implementations-for-captured-block.patch} |   8 +-
 ...get-a-BlockState-without-a-snapshot.patch} |   0
 ...patch => 0167-AsyncTabCompleteEvent.patch} |   2 +-
 ...=> 0168-PlayerPickupExperienceEvent.patch} |   0
 ...-Ability-to-apply-mending-to-XP-API.patch} |   2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   2 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   0
 ...patch => 0172-PreCreatureSpawnEvent.patch} |   0
 ...> 0173-Fill-Profile-Property-Events.patch} |   0
 ...layerAdvancementCriterionGrantEvent.patch} |   0
 ...ch => 0175-Add-ArmorStand-Item-Meta.patch} |   0
 ...Extend-Player-Interact-cancellation.patch} |   0
 ... 0177-Tameable-getOwnerUniqueId-API.patch} |   0
 ...-crits-helps-mitigate-hacked-client.patch} |   0
 ...e-Explicit-Network-Manager-Flushing.patch} |   0
 ...t-extended-PaperServerListPingEvent.patch} |   0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   0
 ...=> 0182-Player.setPlayerProfile-API.patch} |   4 +-
 ...patch => 0183-getPlayerUniqueId-API.patch} |   0
 ... 0184-Improved-Async-Task-Scheduler.patch} |   0
 ...e-legacy-ping-handler-more-reliable.patch} |   0
 ...erverListPingEvent-for-legacy-pings.patch} |   0
 ...7-Flag-to-disable-the-channel-limit.patch} |   2 +-
 ...-Add-openSign-method-to-HumanEntity.patch} |   0
 ...rable-sprint-interruption-on-attack.patch} |   0
 ...t.patch => 0190-EndermanEscapeEvent.patch} |   0
 ...h => 0191-Enderman.teleportRandomly.patch} |   0
 ...192-Block-Enderpearl-Travel-Exploit.patch} |   0
 ...d.spawnParticle-API-and-add-Builder.patch} |   0
 ...allowed-colored-signs-to-be-created.patch} |   2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |   0
 ...h => 0196-EndermanAttackPlayerEvent.patch} |   0
 ...tch => 0197-WitchConsumePotionEvent.patch} |   0
 ...patch => 0198-WitchThrowPotionEvent.patch} |   0
 ...tem-entities-with-World.spawnEntity.patch} |   0
 ...patch => 0200-WitchReadyPotionEvent.patch} |   0
 ...201-ItemStack-getMaxItemUseDuration.patch} |   0
 ...ement-EntityTeleportEndGatewayEvent.patch} |   0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   0
 ...ch => 0204-Fix-CraftEntity-hashCode.patch} |   0
 ...e-Alternative-LootPool-Luck-Formula.patch} |   0
 ...ls-when-failing-to-save-player-data.patch} |   0
 ...-shield-blocking-delay-configurable.patch} |   2 +-
 ...=> 0208-Improve-EntityShootBowEvent.patch} |   0
 ...patch => 0209-PlayerReadyArrowEvent.patch} |   0
 ...nockbackByEntityEvent-and-EntityPus.patch} |   4 +-
 ...patch => 0211-Expand-Explosions-API.patch} |   0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   0
 ...-API.patch => 0213-RangedEntity-API.patch} |   0
 ...o-disable-ender-dragon-legacy-check.patch} |   2 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   0
 ...0216-InventoryCloseEvent-Reason-API.patch} |   2 +-
 ...tch => 0217-Vex-get-setSummoner-API.patch} |   0
 ...ventory-when-cancelling-PlayerInter.patch} |   2 +-
 ...-to-keep-logging-IO-off-main-thread.patch} |   2 +-
 ...more-information-to-Entity.toString.patch} |   2 +-
 ...ts.patch => 0221-EnderDragon-Events.patch} |   0
 ...atch => 0222-PlayerElytraBoostEvent.patch} |   0
 ...=> 0223-PlayerLaunchProjectileEvent.patch} |   0
 ...0224-Improve-BlockPosition-inlining.patch} |   0
 ...-armor-stands-from-doing-entity-loo.patch} |   4 +-
 ...-Vanished-players-don-t-have-rights.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |   0
 ...tch => 0228-SkeletonHorse-Additions.patch} |   0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   0
 ...0-Implement-Expanded-ArmorStand-API.patch} |   0
 ...vent.patch => 0231-AnvilDamageEvent.patch} |   0
 ...ent.patch => 0232-Add-TNTPrimeEvent.patch} |   0
 ...d-make-tab-spam-limits-configurable.patch} |   2 +-
 ...s.patch => 0234-Fix-NBT-type-issues.patch} |   0
 ...emove-unnecessary-itemmeta-handling.patch} |   0
 ...es-option-to-debug-dupe-uuid-issues.patch} |   4 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |   2 +-
 ...8-Use-ConcurrentHashMap-in-JsonList.patch} |   0
 ...9-Use-a-Queue-for-Queueing-Commands.patch} |   2 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   0
 ...timize-BlockPosition-helper-methods.patch} |   0
 ...efault-mob-spawn-range-and-water-an.patch} |   0
 ...tch => 0243-Slime-Pathfinder-Events.patch} |   0
 ...e-speed-for-water-flowing-over-lava.patch} |   0
 ...45-Optimize-CraftBlockData-Creation.patch} |   0
 ...tch => 0246-Optimize-MappedRegistry.patch} |   0
 ...ch => 0247-Add-PhantomPreSpawnEvent.patch} |   0
 ....patch => 0248-Add-More-Creeper-API.patch} |   0
 ...=> 0249-Inventory-removeItemAnySlot.patch} |   0
 ...oadChunk-int-int-false-load-unconve.patch} |   0
 ...ray-tracing-methods-to-LivingEntity.patch} |   4 +-
 ...-attack-cooldown-methods-for-Player.patch} |   0
 ....patch => 0253-Improve-death-events.patch} |   2 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |   0
 ...I.patch => 0255-Mob-Pathfinding-API.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} |   2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   0
 ...=> 0260-Honor-EntityAgeable.ageLock.patch} |   0
 ...le-connection-throttle-kick-message.patch} |   0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   0
 ...> 0263-Hook-into-CB-plugin-rewrites.patch} |   0
 ....patch => 0264-PreSpawnerSpawnEvent.patch} |   0
 ...65-Add-LivingEntity-getTargetEntity.patch} |   4 +-
 ...I.patch => 0266-Add-sun-related-API.patch} |   0
 ...rseException-in-Entity-and-TE-names.patch} |   2 +-
 ...Turtle-API.patch => 0268-Turtle-API.patch} |   0
 ...ator-target-events-and-improve-impl.patch} |   2 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   0
 ...PI.patch => 0271-Add-more-Witch-API.patch} |   0
 ...wned-for-Villager-Aggression-Config.patch} |   0
 ...vent-players-from-moving-into-unloa.patch} |   2 +-
 ...4-Reset-players-airTicks-on-respawn.patch} |   2 +-
 ...after-profile-lookups-if-not-needed.patch} |   0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |   0
 ...=> 0277-Optimize-World-Time-Updates.patch} |   0
 ...tore-custom-InventoryHolder-support.patch} |   0
 ...=> 0279-Use-Vanilla-Minecart-Speeds.patch} |   0
 ...0280-Fix-SpongeAbsortEvent-handling.patch} |   0
 ...-allow-digging-into-unloaded-chunks.patch} |   2 +-
 ...ult-permission-message-configurable.patch} |   0
 ...revent-rayTrace-from-loading-chunks.patch} |   4 +-
 ...-Large-Packets-disconnecting-client.patch} |   0
 ...ntity-dismount-during-teleportation.patch} |   4 +-
 ...I.patch => 0286-Add-more-Zombie-API.patch} |   0
 ...mits.patch => 0287-Book-Size-Limits.patch} |   2 +-
 ...0288-Add-PlayerConnectionCloseEvent.patch} |   0
 ...revent-Enderman-from-loading-chunks.patch} |   0
 ...replace-OfflinePlayer-getLastPlayed.patch} |   2 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   2 +-
 ...remove-from-being-called-on-Players.patch} |   0
 ...ent.patch => 0293-BlockDestroyEvent.patch} |   4 +-
 ... => 0294-Async-command-map-building.patch} |   0
 ...0295-Implement-Brigadier-Mojang-API.patch} |   2 +-
 ...ove-exact-choice-recipe-ingredients.patch} |   0
 ... 0297-Limit-Client-Sign-length-more.patch} |   2 +-
 ...Manager-and-add-advanced-packet-sup.patch} |   0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |   0
 ...ggleEvent-when-whitelist-is-toggled.patch} |   0
 ...=> 0301-Entity-getEntitySpawnReason.patch} |   0
 ...tch => 0302-Fire-event-on-GS4-query.patch} |   0
 ...03-Implement-PlayerPostRespawnEvent.patch} |   0
 ...for-pickupDelay-breaks-picking-up-i.patch} |   0
 ...ts.patch => 0305-Server-Tick-Events.patch} |   0
 ...306-PlayerDeathEvent-getItemsToKeep.patch} |   2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   4 +-
 ...API.patch => 0308-Add-Heightmap-API.patch} |   0
 ...> 0309-Mob-Spawner-API-Enhancements.patch} |   2 +-
 ...-to-changed-postToMainThread-method.patch} |   2 +-
 ...-item-frames-are-modified-MC-123450.patch} |   0
 ...0312-Implement-CraftBlockSoundGroup.patch} |   0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |   0
 ...14-Allow-Saving-of-Oversized-Chunks.patch} |   0
 ...15-Expose-the-internal-current-tick.patch} |   0
 ...16-Fix-World-isChunkGenerated-calls.patch} |   0
 ...te-location-if-we-failed-to-read-it.patch} |   0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   2 +-
 ...urable-projectile-relative-velocity.patch} |   0
 ...h => 0320-offset-item-frame-ticking.patch} |   0
 ...-158900.patch => 0321-Fix-MC-158900.patch} |   0
 ...event-consuming-the-wrong-itemstack.patch} |   2 +-
 ...3-Dont-send-unnecessary-sign-update.patch} |   2 +-
 ...-option-to-disable-pillager-patrols.patch} |   0
 ...325-Flat-bedrock-generator-settings.patch} |   0
 ...k-loads-when-villagers-try-to-find-.patch} |   0
 ...656-Fix-Follow-Range-Initial-Target.patch} |   0
 ... 0328-Duplicate-UUID-Resolve-Option.patch} |   0
 ...ayerDeathEvent-shouldDropExperience.patch} |   2 +-
 ...ading-chunks-checking-hive-position.patch} |   0
 ...hunks-from-Hoppers-and-other-things.patch} |   0
 ...timise-EntityGetter-getPlayerByUUID.patch} |   0
 ...333-Fix-items-not-falling-correctly.patch} |   0
 ...ize-call-to-getFluid-for-explosions.patch} |   0
 ...-in-stack-not-having-effects-when-d.patch} |   0
 ...ializing-mismatching-chunk-coordina.patch} |   0
 ...=> 0337-Entity-Activation-Range-2.0.patch} |   4 +-
 ...ement-alternative-item-despawn-rate.patch} |   0
 ...patch => 0339-Lag-compensate-eating.patch} |   2 +-
 ...=> 0340-Tracking-Range-Improvements.patch} |   0
 ...-items-vanishing-through-end-portal.patch} |   2 +-
 ...ment-optional-per-player-mob-spawns.patch} |   2 +-
 ...2-Anti-Xray.patch => 0343-Anti-Xray.patch} |   4 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   0
 ...45-Improve-Block-breakNaturally-API.patch} |   0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   0
 ...0347-Add-debug-for-sync-chunk-loads.patch} |   0
 ...8-Remove-garbage-Java-version-check.patch} |   2 +-
 ...tch => 0349-Add-ThrownEggHatchEvent.patch} |   0
 ...p-API.patch => 0350-Entity-Jump-API.patch} |   2 +-
 ...-to-nerf-pigmen-from-nether-portals.patch} |   2 +-
 ... => 0352-Make-the-GUI-graph-fancier.patch} |   0
 ...53-add-hand-to-BlockMultiPlaceEvent.patch} |   0
 ...ipwire-hook-placement-before-update.patch} |   0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   0
 ...chance-of-villager-zombie-infection.patch} |   0
 ...tch => 0357-Optimise-Chunk-getFluid.patch} |   0
 ...rbose-world-setting-to-false-by-def.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   0
 ...60-Expose-MinecraftServer-isRunning.patch} |   0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...pawn-settings-and-per-player-option.patch} |   2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |   2 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |   0
 ...PlayerChunkMap-adds-crashing-server.patch} |   0
 ...tch => 0366-Don-t-tick-dead-players.patch} |   2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   0
 ...timize-Collision-to-not-load-chunks.patch} |   2 +-
 ...ove-existing-players-to-world-spawn.patch} |   2 +-
 ...alSelector-Goal.Flag-Set-operations.patch} |   0
 ...h => 0371-Improved-Watchdog-Support.patch} |   6 +-
 ....patch => 0372-Optimize-Pathfinding.patch} |   0
 ...3-Reduce-Either-Optional-allocation.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.patch} |   4 +-
 ...entity-collision-code-if-not-needed.patch} |   2 +-
 ...Implement-Player-Client-Options-API.patch} |   2 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |   0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |   2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |   2 +-
 ...patch => 0385-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   2 +-
 ...n.patch => 0387-Expose-game-version.patch} |   0
 ...> 0388-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   2 +-
 ....patch => 0390-misc-debugging-dumps.patch} |   0
 ...1-Prevent-teleporting-dead-entities.patch} |   2 +-
 ...traces-in-log-messages-crash-report.patch} |   2 +-
 ...atch => 0393-Implement-Mob-Goal-API.patch} |   2 +-
 ...=> 0394-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0396-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   2 +-
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0399-Potential-bed-API.patch} |   2 +-
 ...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} |   6 +-
 ...location-of-Vec3D-by-entity-tracker.patch} |   2 +-
 ...> 0404-Ensure-safe-gateway-teleport.patch} |   2 +-
 ...-for-console-having-all-permissions.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0407-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   4 +-
 ...uping.patch => 0411-Fix-sand-duping.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   2 +-
 ...ance-map-to-optimise-entity-tracker.patch} |   2 +-
 ...older-method-without-block-snapshot.patch} |   0
 ...API.patch => 0416-Improve-Arrow-API.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   2 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...9-Add-permission-for-command-blocks.patch} |   2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |   2 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |   2 +-
 ...atch => 0422-Paper-dumpitem-command.patch} |   0
 ...Legacy-Component-serialization-size.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |   0
 ...incremental-chunk-and-player-saving.patch} |   0
 ...427-Support-old-UUID-format-for-NBT.patch} |   0
 ...vert-legacy-attributes-in-Item-Meta.patch} |   0
 ...Remove-some-streams-from-structures.patch} |   0
 ...rom-classes-related-villager-gossip.patch} |   0
 ...0431-Support-components-in-ItemMeta.patch} |   0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |   0
 ...patch => 0433-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   0
 ...wn-player-in-correct-world-on-login.patch} |   0
 ...atch => 0436-Add-PrepareResultEvent.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   2 +-
 ...e-NetworkManager-Exception-Handling.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   0
 ...Vanilla-Command-permission-checking.patch} |   0
 ...-5989.patch => 0441-Fix-SPIGOT-5989.patch} |   0
 ...-Bukkit-world-container-is-not-used.patch} |   0
 ...5885-Unable-to-disable-advancements.patch} |   0
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...stake-in-CB-NBT-int-deserialization.patch} |   0
 ...rver-load-chunks-from-newer-version.patch} |   0
 ...support.patch => 0448-Brand-support.patch} |   0
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0450-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   0
 ...PI.patch => 0452-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0454-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   0
 ...patch => 0456-Buffer-joins-to-world.patch} |   0
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   0
 ...reateEvent-needs-to-know-its-entity.patch} |   0
 ...I.patch => 0460-Add-more-Evoker-API.patch} |   0
 ...Add-methods-to-get-translation-keys.patch} |   0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0463-Cache-block-data-strings.patch} |   0
 ...rtation-and-cancel-velocity-if-tele.patch} |   0
 ...l-open-container-api-to-HumanEntity.patch} |   0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |   0
 ...-capture-to-capture-all-items-added.patch} |   0
 ...-Counter-to-allow-plugins-to-use-va.patch} |   0
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0470-Entity-isTicking.patch} |   0
 ...non-whitelisted-player-when-white-l.patch} |   0
 ...-Concurrency-issue-in-ShufflingList.patch} |   0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   2 +-
 ...-large-move-vectors-crashing-server.patch} |   0
 ...atch => 0475-Optimise-getType-calls.patch} |   0
 ....patch => 0476-Villager-resetOffers.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   2 +-
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0480-Player-elytra-boost-API.patch} |   0
 ...81-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   0
 ...ch => 0484-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   2 +-
 ...x-client-lag-on-advancement-loading.patch} |   0
 ...> 0487-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...489-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0490-Add-API-for-quit-reason.patch} |   0
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...ch => 0492-Expose-world-spawn-angle.patch} |   0
 ...patch => 0493-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   0
 ...95-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0496-Add-PlayerItemCooldownEvent.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...PI.patch => 0498-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   4 +-
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0501-Add-PlayerShearBlockEvent.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0503-Limit-recipe-packets.patch} |   0
 ...-CraftSound-backwards-compatibility.patch} |   0
 ...505-Player-Chunk-Load-Unload-Events.patch} |   0
 ...6-Optimize-Dynamic-get-Missing-Keys.patch} |   0
 ...-Expose-LivingEntity-hurt-direction.patch} |   0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |   0
 ...-invalid-ingredient-lists-in-Villag.patch} |   0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |   0
 ...ch => 0511-Implement-TargetHitEvent.patch} |   0
 ... 0512-MC-4-Fix-item-position-desync.patch} |   0
 ...513-Additional-Block-Material-API-s.patch} |   2 +-
 ...tch => 0514-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0516-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
 ...ct-event-not-being-called-sometimes.patch} |   0
 ...h => 0521-Zombie-API-breaking-doors.patch} |   0
 ...522-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0523-Add-EntityLoadCrossbowEvent.patch} |   0
 ...0524-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
 ...OIs.patch => 0532-Remove-stale-POIs.patch} |   0
 ...h => 0533-Fix-villager-boat-exploit.patch} |   0
 ...I.patch => 0534-Add-sendOpLevel-API.patch} |   0
 ...0535-TODO-Registry-Modification-API.patch} |   0
 ...h => 0536-Add-StructuresLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   2 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...540-Make-schedule-command-per-world.patch} |   0
 ...541-Configurable-max-leash-distance.patch} |   0
 ...542-Implement-BlockPreDispenseEvent.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   2 +-
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   0
 ...atch => 0548-add-DragonEggFormEvent.patch} |   2 +-
 ...Event.patch => 0549-EntityMoveEvent.patch} |   2 +-
 ...isable-pathfinding-updates-on-block.patch} |   0
 ... 0551-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
 ...atch => 0557-Expose-Tracked-Players.patch} |   0
 ...8-Remove-streams-from-SensorNearest.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0560-Improve-ServerGUI.patch} |   0
 ...561-fix-converting-txt-to-json-file.patch} |   2 +-
 ...atch => 0562-Add-worldborder-events.patch} |   0
 ...=> 0563-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0565-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0566-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   0
 ....patch => 0568-Expand-world-key-API.patch} |   0
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0570-Item-Rarity-API.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   0
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   0
 ...tch => 0574-Expose-protocol-version.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   2 +-
 ...temConsumeEvent-cancelling-properly.patch} |   2 +-
 ...patch => 0577-Add-bypass-host-check.patch} |   0
 ...0578-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   0
 ... => 0584-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0585-More-World-API.patch} |   0
 ... 0586-Added-PlayerBedFailEnterEvent.patch} |   0
 ...87-Entity-load-save-limit-per-chunk.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   2 +-
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   0
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0594-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...close.patch => 0598-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0600-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0601-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   0
 ... => 0604-ItemStack-repair-check-API.patch} |   0
 ....patch => 0605-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   2 +-
 ...PI.patch => 0608-Add-Mob-lookAt-API.patch} |   0
 ...0609-Add-Unix-domain-socket-support.patch} |   2 +-
 ... => 0610-Add-EntityInsideBlockEvent.patch} |   0
 ...11-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   0
 ...patch => 0613-More-Lidded-Block-API.patch} |   0
 ...14-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0615-Add-PlayerKickEvent-causes.patch} |   0
 ...0616-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...n-to-fix-items-merging-through-walls.patch |  25 ---
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...n-to-fix-items-merging-through-walls.patch |  23 +++
 ...h => 0620-Add-BellRevealRaiderEvent.patch} |   0
 ... 0621-Fix-invulnerable-end-crystals.patch} |   0
 ...22-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0623-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0626-Line-Of-Sight-Changes.patch} |  44 +++--
 ... => 0627-add-per-world-spawn-limits.patch} |   0
 ...h => 0628-Fix-potions-splash-events.patch} |   0
 ... => 0629-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   0
 ...PI.patch => 0631-Missing-Entity-API.patch} |   2 +-
 ...ect-for-book-edit-is-called-on-main.patch} |   0
 ...of-Block-applyBoneMeal-always-being.patch} |   2 +-
 ...tChunkIfLoadedImmediately-in-places.patch} |   2 +-
 ...rom-signs-not-firing-command-events.patch} |   0
 ...ch => 0636-Adds-PlayerArmSwingEvent.patch} |   0
 ...-event-leave-message-not-being-sent.patch} |   0
 ...-for-mobs-immune-to-default-effects.patch} |   2 +-
 ...correct-message-for-outdated-client.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   0
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ...-bunch-of-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0643-Stinger-API.patch} |   2 +-
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0645-Add-System.out-err-catcher.patch} |   0
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   2 +-
 ...AFK-kick-while-watching-end-credits.patch} |   0
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0650-Add-PlayerSetSpawnEvent.patch} |   0
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0654-Added-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   0
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...658-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0660-Add-BlockBreakBlockEvent.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0662-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0664-Add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   0
 ... 0666-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0667-Left-handed-API.patch} |   0
 ...ch => 0668-Add-more-advancement-API.patch} |   0
 ...669-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0670-Add-critical-damage-API.patch} |   0
 ...0671-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   2 +-
 ...-ram-API.patch => 0673-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...5-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...76-Vanilla-command-permission-fixes.patch} |   2 +-
 ...logic-for-inventories-on-chunk-unlo.patch} |   0
 ...78-Fix-GameProfileCache-concurrency.patch} |   0
 ...679-Improve-and-expand-AsyncCatcher.patch} |   4 +-
 ...per-mobcaps-and-paper-playermobcaps.patch} |   0
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...rolled-flushing-for-network-manager.patch} |   0
 ...=> 0683-Optimise-general-POI-access.patch} |   0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |   0
 ... 0685-Optimise-chunk-tick-iteration.patch} |   0
 ...> 0686-Execute-chunk-tasks-mid-tick.patch} |   6 +-
 ...ulate-regionfile-header-if-it-is-co.patch} |   0
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...-more-information-in-watchdog-dumps.patch} |   0
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ... 0691-Distance-manager-tick-timings.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   4 +-
 ...h => 0694-Add-packet-limiter-config.patch} |   0
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...sh-calls-for-entity-tracker-packets.patch} |   0
 ...-lookup-fluid-state-when-raytracing.patch} |   4 +-
 ...atch => 0698-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...0-Do-not-run-raytrace-logic-for-AIR.patch} |   4 +-
 ...rimise-map-impl-for-tracked-players.patch} |   0
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0703-Optimise-random-block-ticking.patch} |   4 +-
 ...4-Optimise-non-flush-packet-sending.patch} |   0
 ...0705-Optimise-nearby-player-lookups.patch} |   2 +-
 ...0706-Remove-streams-for-villager-AI.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   0
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   0
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0714-Ensure-valid-vehicle-status.patch} |   0
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0719-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0722-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ...ion-for-logging-player-ip-addresses.patch} |   0
 ... => 0725-Configurable-feature-seeds.patch} |   0
 ... 0726-Add-root-admin-user-detection.patch} |   2 +-
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   0
 ...ive-velocity-through-repeated-crits.patch} |   2 +-
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   2 +-
 ...e-unnecessary-itemmeta-from-clients.patch} |   2 +-
 ...=> 0734-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0736-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...tch => 0737-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |   0
 ...n-checking-in-player-move-packet-ha.patch} |   0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0742-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...44-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   0
 ... => 0746-Improve-scoreboard-entries.patch} |   0
 ...ch => 0747-Entity-powdered-snow-API.patch} |   0
 ...0748-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0754-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0755-Bucketable-API.patch} |   0
 ...es.patch => 0756-Validate-usernames.patch} |   0
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   0
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...load-to-PersistentDataContainer-has.patch} |   0
 ...1-Multiple-Entries-with-Scoreboards.patch} |   0
 ...762-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...0765-Fix-xp-reward-for-baby-zombies.patch} |   0
 ... 0766-Kick-on-main-for-illegal-chat.patch} |   0
 ...lti-Block-Change-API-Implementation.patch} |   0
 ...ent.patch => 0768-Fix-NotePlayEvent.patch} |   0
 ....patch => 0769-Freeze-Tick-Lock-API.patch} |   2 +-
 ...lphin-API.patch => 0770-Dolphin-API.patch} |   0
 ...h => 0771-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   2 +-
 ...-missing-structure-set-seed-configs.patch} |   0
 ...h => 0775-Implement-regenerateChunk.patch} |   0
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   0
 ...gs.patch => 0778-Add-GameEvent-tags.patch} |   0
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0780-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   0
 ... => 0785-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0786-Custom-Potion-Mixes.patch} |   0
 ...87-Force-close-world-loading-screen.patch} |   0
 ...788-Fix-falling-block-spawn-methods.patch} |   2 +-
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0791-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   0
 ...0794-Implement-getComputedBiome-API.patch} |   4 +-
 ...> 0795-Make-some-itemstacks-nonnull.patch} |   0
 ...796-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0797-Fix-saving-in-unloadWorld.patch} |   0
 ...h => 0798-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0799-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   0
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   0
 ...s.patch => 0804-cache-resource-keys.patch} |   2 +-
 ...ange-the-podium-for-the-EnderDragon.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   0
 ...ead-of-display-name-in-PlayerList-g.patch} |   0
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |   2 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0813-WorldCreator-keepSpawnLoaded.patch} |   0
 ...-in-CraftPersistentDataTypeRegistry.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0819-Add-PlayerStopUsingItemEvent.patch} |   2 +-
 ...20-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0821-Don-t-tick-markers.patch} |   0
 ...-not-accept-invalid-client-settings.patch} |   0
 ...0823-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0826-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   0
 ...ate-Current-redstone-implementation.patch} |   4 +-
 ...31-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0832-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0835-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   0
 ...pty-items-from-being-added-to-world.patch} |   4 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...nent-in-resource-pack-rejection-mes.patch} |   0
 ...atch => 0840-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...debug-information-to-chat-packet-er.patch} |   0
 ...PE.patch => 0844-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   0
 ...API.patch => 0846-More-Teleport-API.patch} |   0
 ... => 0847-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   2 +-
 ...k-entities-after-destroy-prediction.patch} |   0
 ...on-plugins-accessing-faraway-chunks.patch} |   4 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |   0
 ...Add-and-fix-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0853-Collision-API.patch} |   6 +-
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...API.patch => 0855-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   2 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |   0
 ...858-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   2 +-
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0862-Missing-eating-regain-reason.patch} |   0
 ....patch => 0863-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   2 +-
 ...6-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0867-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0869-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0871-Add-getDrops-to-BlockState.patch} |   0
 ...=> 0872-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   0
 ... 0874-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0875-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0878-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0880-Add-entity-knockback-API.patch} |   4 +-
 ....patch => 0881-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...3-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0884-Added-EntityToggleSitEvent.patch} |   0
 ... => 0885-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0886-Add-Moving-Piston-API.patch} |   0
 ...> 0887-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0892-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0895-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...897-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   2 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |   2 +-
 ....patch => 0900-ItemStack-damage-API.patch} |   4 +-
 ...tion-API.patch => 0901-Friction-API.patch} |  12 +-
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0903-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0904-Sync-offhand-slot-in-menus.patch} |   0
 ... 0905-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0906-Limit-pet-look-distance.patch} |   0
 ...ch => 0907-Properly-resend-entities.patch} |   0
 ...nd-additions-to-the-SpawnReason-API.patch} |   2 +-
 ...ments.patch => 0909-fix-Instruments.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ...tch => 0912-Add-BlockLockCheckEvent.patch} |   0
 ... 0913-Add-Sneaking-API-for-Entities.patch} |   0
 ... => 0914-Improve-logging-and-errors.patch} |   0
 ....patch => 0915-Improve-PortalEvents.patch} |   0
 ...ion-for-spider-worldborder-climbing.patch} |   0
 ...sing-SpigotConfig-logCommands-check.patch} |   0
 ...Allay-stopDancing-while-not-dancing.patch} |   0
 ...ge.patch => 0919-Flying-Fall-Damage.patch} |   0
 ...k-state-to-BlockExplodeEvent-and-En.patch} |   0
 ...ion-moving-velocity-to-VehicleBlock.patch} |   0
 ...onfig-for-disabling-entity-tag-tags.patch} |   0
 ...e-player-info-update-packet-on-join.patch} |   0
 ...k-items-during-EntityResurrectEvent.patch} |   2 +-
 ...en-API.patch => 0925-Win-Screen-API.patch} |   0
 ...ItemStack-setAmount-null-assignment.patch} |   2 +-
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0928-Add-Entity-Body-Yaw-API.patch} |   4 +-
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...hen-a-captured-block-state-is-outda.patch} |   4 +-
 ...=> 0931-Add-EntityFertilizeEggEvent.patch} |   2 +-
 ...ty-drop-not-updating-the-client-inv.patch} |   0
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...ctly-handle-ArmorStand-invisibility.patch} |   0
 ...ancement-triggers-for-entity-damage.patch} |   2 +-
 ...936-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0938-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ...kshelf-and-jukebox-setItem-with-air.patch} |   0
 ...pers.patch => 0941-Optimize-Hoppers.patch} |   0
 ...ives-generating-from-using-bonemeal.patch} |   0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |   0
 ...ence-violations-like-they-should-be.patch} |   0
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   0
 ...ts-being-fired-from-unloaded-chunks.patch} |   0
 ...0948-Use-array-for-gamerule-storage.patch} |   0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |   0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |   0
 ... 0951-Add-Mob-Experience-reward-API.patch} |   0
 ...redstone-on-top-of-trap-doors-early.patch} |   0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |   0
 ...Lazy-Initialization-for-Enum-Fields.patch} |   0
 ...55-More-accurate-isInOpenWater-impl.patch} |   0
 ...ccess-to-lookups-field-in-RegistryO.patch} |   0
 ...ecalcBlockCounts-for-empty-sections.patch} |   0
 ...ehive-without-any-players-nearby-th.patch} |   0
 ... => 0959-Expand-PlayerItemMendEvent.patch} |   0
 ...sh-ProjectileSource-for-projectiles.patch} |   0
 ... => 0961-Add-transient-modifier-API.patch} |   0
 ...patch => 0962-Fix-block-place-logic.patch} |   4 +-
 ...nd-playing-for-BlockItem-ItemStacks.patch} |   0
 ...efinitions-of-trim-material-pattern.patch} |   0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |   0
 ...nhasbukkit-default-if-alias-block-e.patch} |   0
 ...pLike-spam-for-missing-key-selector.patch} |   0
 ...-Fix-sniffer-removeExploredLocation.patch} |   0
 ...to-remove-all-active-potion-effects.patch} |   2 +-
 ...yerChunkLoaderData-in-order-to-prep.patch} |   0
 ...olia-scheduler-and-owned-region-API.patch} |   0
 ...rafting-result-amount-for-fireworks.patch} |   0
 ...> 0973-Properly-Cancel-Usable-Items.patch} |   2 +-
 ...4-Add-event-for-player-editing-sign.patch} |   0
 ...k-item-frames-if-players-can-see-it.patch} |   0
 ...-command-function-perm-level-checks.patch} |   0
 ...Add-option-to-disable-block-updates.patch} |   0
 ...978-Call-missing-BlockDispenseEvent.patch} |   0
 ...-chunks-for-supporting-block-checks.patch} |   0
 ...Optimize-player-lookups-for-beacons.patch} |   0
 ...981-Add-Sign-getInteractableSideFor.patch} |   0
 ...82-Array-backed-synched-entity-data.patch} |   0
 ...3-fix-item-meta-for-tadpole-buckets.patch} |   0
 ...uppress-Item-Meta-Validation-Checks.patch} |   0
 ...t-API.patch => 0985-Fix-BanList-API.patch} |   0
 ...d-water-fluid-explosion-resistance-.patch} |   0
 ...x-possible-NPE-on-painting-creation.patch} |   2 +-
 ...imer-for-Wandering-Traders-spawned-.patch} |   0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |   0
 ...igns.patch => 0990-Don-t-tick-signs.patch} |   0
 ...figurable-Region-Compression-Format.patch} |   0
 ...t-throw-both-Spread-and-Grow-Events.patch} |   0
 ....patch => 0993-Add-whitelist-events.patch} |   0
 ... 0994-Implement-PlayerFailMoveEvent.patch} |   0
 ...se-allay-memory-on-non-item-targets.patch} |   0
 ...API-for-updating-recipes-on-clients.patch} |   0
 ...tion-when-spawning-display-entities.patch} |   2 +-
 ...998-Only-capture-actual-tree-growth.patch} |   0
 ...rce-for-mushroom-block-spread-event.patch} |   0
 ...Data-on-more-entities-when-spawning.patch} |   2 +-
 ...-Use-correct-seed-on-api-world-load.patch} |   0
 ...ta-neighbour-ticks-outside-of-range.patch} |   0
 ...> 1003-Cache-map-ids-on-item-frames.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   0
 ...atch => 1005-Bandaid-fix-for-Effect.patch} |   0
 ...tch => 1006-SculkCatalyst-bloom-API.patch} |   0
 ...API-for-an-entity-s-scoreboard-name.patch} |   0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |   0
 ...lace-methods-with-old-StructureType.patch} |   0
 ...e-namespaced-commands-if-send-names.patch} |   0
 ...-handle-BlockBreakEvent-isDropItems.patch} |   0
 ...entity-death-event-for-ender-dragon.patch} |   0
 ...tity-tracking-range-by-Y-coordinate.patch} |   0
 ... => 1014-Add-Listing-API-for-Player.patch} |   0
 ...d-BlockFace-during-BlockDamageEvent.patch} |   0
 ...h => 1016-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 1017-Expand-Pose-API.patch} |   0
 ...patch => 1018-More-DragonBattle-API.patch} |   0
 ... 1019-Deep-clone-unhandled-nbt-tags.patch} |   0
 ...tch => 1020-Add-PlayerPickItemEvent.patch} |   0
 ...-Improve-performance-of-mass-crafts.patch} |   0
 ...=> 1022-Allow-trident-custom-damage.patch} |   0
 ...pose-hand-during-BlockCanBuildEvent.patch} |   0
 ...-nearest-structure-border-iteration.patch} |   0
 ...Implement-OfflinePlayer-isConnected.patch} |   0
 ....patch => 1026-Fix-inventory-desync.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   0
 ...28-Configure-sniffer-egg-hatch-time.patch} |   0
 ...-proximity-check-before-entity-look.patch} |   0
 ...Skip-POI-finding-if-stuck-in-vehicle.patch |  32 ++++
 959 files changed, 476 insertions(+), 277 deletions(-)
 create mode 100644 patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
 rename patches/server/{0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (96%)
 rename patches/server/{0074-Use-a-Shared-Random-for-Entities.patch => 0075-Use-a-Shared-Random-for-Entities.patch} (97%)
 rename patches/server/{0075-Configurable-spawn-chances-for-skeleton-horses.patch => 0076-Configurable-spawn-chances-for-skeleton-horses.patch} (100%)
 rename patches/server/{0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (97%)
 rename patches/server/{0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (96%)
 rename patches/server/{0078-Entity-AddTo-RemoveFrom-World-Events.patch => 0079-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename patches/server/{0079-Configurable-Chunk-Inhabited-Time.patch => 0080-Configurable-Chunk-Inhabited-Time.patch} (100%)
 rename patches/server/{0080-EntityPathfindEvent.patch => 0081-EntityPathfindEvent.patch} (100%)
 rename patches/server/{0081-Sanitise-RegionFileCache-and-make-configurable.patch => 0082-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename patches/server/{0082-Do-not-load-chunks-for-Pathfinding.patch => 0083-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0083-Add-PlayerUseUnknownEntityEvent.patch => 0084-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename patches/server/{0084-Configurable-Grass-Spread-Tick-Rate.patch => 0085-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename patches/server/{0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename patches/server/{0086-Optimize-DataBits.patch => 0087-Optimize-DataBits.patch} (100%)
 rename patches/server/{0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0088-Configurable-Player-Collision.patch => 0089-Configurable-Player-Collision.patch} (100%)
 rename patches/server/{0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0090-Configurable-RCON-IP-address.patch => 0091-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0091-EntityRegainHealthEvent-isFastRegen-API.patch => 0092-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename patches/server/{0092-Add-ability-to-configure-frosted_ice-properties.patch => 0093-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0093-remove-null-possibility-for-getServer-singleton.patch => 0094-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename patches/server/{0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename patches/server/{0095-LootTable-API-Replenishable-Lootables-Feature.patch => 0096-LootTable-API-Replenishable-Lootables-Feature.patch} (100%)
 rename patches/server/{0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename patches/server/{0097-System-property-for-disabling-watchdoge.patch => 0098-System-property-for-disabling-watchdoge.patch} (100%)
 rename patches/server/{0098-Async-GameProfileCache-saving.patch => 0099-Async-GameProfileCache-saving.patch} (97%)
 rename patches/server/{0099-Optional-TNT-doesn-t-move-in-water.patch => 0100-Optional-TNT-doesn-t-move-in-water.patch} (97%)
 rename patches/server/{0100-Faster-redstone-torch-rapid-clock-removal.patch => 0101-Faster-redstone-torch-rapid-clock-removal.patch} (97%)
 rename patches/server/{0101-Add-server-name-parameter.patch => 0102-Add-server-name-parameter.patch} (90%)
 rename patches/server/{0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch => 0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch} (97%)
 rename patches/server/{0103-Avoid-blocking-on-Network-Manager-creation.patch => 0104-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename patches/server/{0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename patches/server/{0105-Add-setting-for-proxy-online-mode-status.patch => 0106-Add-setting-for-proxy-online-mode-status.patch} (100%)
 rename patches/server/{0106-Optimise-BlockState-s-hashCode-equals.patch => 0107-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0107-Configurable-packet-in-spam-threshold.patch => 0108-Configurable-packet-in-spam-threshold.patch} (94%)
 rename patches/server/{0108-Configurable-flying-kick-messages.patch => 0109-Configurable-flying-kick-messages.patch} (95%)
 rename patches/server/{0109-Add-EntityZapEvent.patch => 0110-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch => 0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch} (100%)
 rename patches/server/{0111-Cache-user-authenticator-threads.patch => 0112-Cache-user-authenticator-threads.patch} (100%)
 rename patches/server/{0112-Allow-Reloading-of-Command-Aliases.patch => 0113-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename patches/server/{0113-Add-source-to-PlayerExpChangeEvent.patch => 0114-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/server/{0114-Add-ProjectileCollideEvent.patch => 0115-Add-ProjectileCollideEvent.patch} (100%)
 rename patches/server/{0115-Prevent-Pathfinding-out-of-World-Border.patch => 0116-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0116-Optimize-World.isLoaded-BlockPosition-Z.patch => 0117-Optimize-World.isLoaded-BlockPosition-Z.patch} (86%)
 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-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0120-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/server/{0120-String-based-Action-Bar-API.patch => 0121-String-based-Action-Bar-API.patch} (96%)
 rename patches/server/{0121-Properly-fix-item-duplication-bug.patch => 0122-Properly-fix-item-duplication-bug.patch} (94%)
 rename patches/server/{0122-Firework-API-s.patch => 0123-Firework-API-s.patch} (100%)
 rename patches/server/{0123-PlayerTeleportEndGatewayEvent.patch => 0124-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0124-Provide-E-TE-Chunk-count-stat-methods.patch => 0125-Provide-E-TE-Chunk-count-stat-methods.patch} (94%)
 rename patches/server/{0125-Enforce-Sync-Player-Saves.patch => 0126-Enforce-Sync-Player-Saves.patch} (92%)
 rename patches/server/{0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename patches/server/{0127-Cap-Entity-Collisions.patch => 0128-Cap-Entity-Collisions.patch} (91%)
 rename patches/server/{0128-Remove-CraftScheduler-Async-Task-Debugger.patch => 0129-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0129-Do-not-let-armorstands-drown.patch => 0130-Do-not-let-armorstands-drown.patch} (100%)
 rename patches/server/{0130-Properly-handle-async-calls-to-restart-the-server.patch => 0131-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename patches/server/{0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (96%)
 rename patches/server/{0132-Add-configuration-option-to-prevent-player-names-fro.patch => 0133-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename patches/server/{0133-Use-TerminalConsoleAppender-for-console-improvements.patch => 0134-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename patches/server/{0134-provide-a-configurable-option-to-disable-creeper-lin.patch => 0135-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0135-Item-canEntityPickup.patch => 0136-Item-canEntityPickup.patch} (100%)
 rename patches/server/{0136-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0137-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0137-PlayerAttemptPickupItemEvent.patch => 0138-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (100%)
 rename patches/server/{0139-Add-UnknownCommandEvent.patch => 0140-Add-UnknownCommandEvent.patch} (100%)
 rename patches/server/{0140-Basic-PlayerProfile-API.patch => 0141-Basic-PlayerProfile-API.patch} (99%)
 rename patches/server/{0141-Shoulder-Entities-Release-API.patch => 0142-Shoulder-Entities-Release-API.patch} (100%)
 rename patches/server/{0142-Profile-Lookup-Events.patch => 0143-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0143-Block-player-logins-during-server-shutdown.patch => 0144-Block-player-logins-during-server-shutdown.patch} (100%)
 rename patches/server/{0144-Entity-fromMobSpawner.patch => 0145-Entity-fromMobSpawner.patch} (100%)
 rename patches/server/{0145-Improve-the-Saddle-API-for-Horses.patch => 0146-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0146-Implement-ensureServerConversions-API.patch => 0147-Implement-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0147-Implement-getI18NDisplayName.patch => 0148-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0148-ProfileWhitelistVerifyEvent.patch => 0149-ProfileWhitelistVerifyEvent.patch} (100%)
 rename patches/server/{0149-Fix-this-stupid-bullshit.patch => 0150-Fix-this-stupid-bullshit.patch} (100%)
 rename patches/server/{0150-LivingEntity-setKiller.patch => 0151-LivingEntity-setKiller.patch} (93%)
 rename patches/server/{0151-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0152-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename patches/server/{0153-Allow-specifying-a-custom-authentication-servers-dow.patch => 0154-Allow-specifying-a-custom-authentication-servers-dow.patch} (100%)
 rename patches/server/{0154-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0155-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename patches/server/{0155-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0156-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0156-Add-PlayerJumpEvent.patch => 0157-Add-PlayerJumpEvent.patch} (96%)
 rename patches/server/{0157-handle-ServerboundKeepAlivePacket-async.patch => 0158-handle-ServerboundKeepAlivePacket-async.patch} (95%)
 rename patches/server/{0158-Expose-client-protocol-version-and-virtual-host.patch => 0159-Expose-client-protocol-version-and-virtual-host.patch} (97%)
 rename patches/server/{0159-revert-serverside-behavior-of-keepalives.patch => 0160-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename patches/server/{0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename patches/server/{0161-Add-PlayerArmorChangeEvent.patch => 0162-Add-PlayerArmorChangeEvent.patch} (98%)
 rename patches/server/{0162-Prevent-logins-from-being-processed-when-the-player-.patch => 0163-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename patches/server/{0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (88%)
 rename patches/server/{0164-use-CB-BlockState-implementations-for-captured-block.patch => 0165-use-CB-BlockState-implementations-for-captured-block.patch} (92%)
 rename patches/server/{0165-API-to-get-a-BlockState-without-a-snapshot.patch => 0166-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0166-AsyncTabCompleteEvent.patch => 0167-AsyncTabCompleteEvent.patch} (99%)
 rename patches/server/{0167-PlayerPickupExperienceEvent.patch => 0168-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0168-Ability-to-apply-mending-to-XP-API.patch => 0169-Ability-to-apply-mending-to-XP-API.patch} (96%)
 rename patches/server/{0169-PlayerNaturallySpawnCreaturesEvent.patch => 0170-PlayerNaturallySpawnCreaturesEvent.patch} (98%)
 rename patches/server/{0170-Add-setPlayerProfile-API-for-Skulls.patch => 0171-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0171-PreCreatureSpawnEvent.patch => 0172-PreCreatureSpawnEvent.patch} (100%)
 rename patches/server/{0172-Fill-Profile-Property-Events.patch => 0173-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0173-PlayerAdvancementCriterionGrantEvent.patch => 0174-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0174-Add-ArmorStand-Item-Meta.patch => 0175-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0175-Extend-Player-Interact-cancellation.patch => 0176-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0176-Tameable-getOwnerUniqueId-API.patch => 0177-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename patches/server/{0178-Disable-Explicit-Network-Manager-Flushing.patch => 0179-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0179-Implement-extended-PaperServerListPingEvent.patch => 0180-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/server/{0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename patches/server/{0181-Player.setPlayerProfile-API.patch => 0182-Player.setPlayerProfile-API.patch} (98%)
 rename patches/server/{0182-getPlayerUniqueId-API.patch => 0183-getPlayerUniqueId-API.patch} (100%)
 rename patches/server/{0183-Improved-Async-Task-Scheduler.patch => 0184-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0184-Make-legacy-ping-handler-more-reliable.patch => 0185-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0185-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0186-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0186-Flag-to-disable-the-channel-limit.patch => 0187-Flag-to-disable-the-channel-limit.patch} (95%)
 rename patches/server/{0187-Add-openSign-method-to-HumanEntity.patch => 0188-Add-openSign-method-to-HumanEntity.patch} (100%)
 rename patches/server/{0188-Configurable-sprint-interruption-on-attack.patch => 0189-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0189-EndermanEscapeEvent.patch => 0190-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0190-Enderman.teleportRandomly.patch => 0191-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0191-Block-Enderpearl-Travel-Exploit.patch => 0192-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename patches/server/{0192-Expand-World.spawnParticle-API-and-add-Builder.patch => 0193-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename patches/server/{0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename patches/server/{0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0195-EndermanAttackPlayerEvent.patch => 0196-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0196-WitchConsumePotionEvent.patch => 0197-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0197-WitchThrowPotionEvent.patch => 0198-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0199-WitchReadyPotionEvent.patch => 0200-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0200-ItemStack-getMaxItemUseDuration.patch => 0201-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0201-Implement-EntityTeleportEndGatewayEvent.patch => 0202-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0203-Fix-CraftEntity-hashCode.patch => 0204-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0204-Configurable-Alternative-LootPool-Luck-Formula.patch => 0205-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0205-Print-Error-details-when-failing-to-save-player-data.patch => 0206-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0206-Make-shield-blocking-delay-configurable.patch => 0207-Make-shield-blocking-delay-configurable.patch} (96%)
 rename patches/server/{0207-Improve-EntityShootBowEvent.patch => 0208-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0208-PlayerReadyArrowEvent.patch => 0209-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch => 0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch} (98%)
 rename patches/server/{0210-Expand-Explosions-API.patch => 0211-Expand-Explosions-API.patch} (100%)
 rename patches/server/{0211-LivingEntity-Hand-Raised-Item-Use-API.patch => 0212-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0212-RangedEntity-API.patch => 0213-RangedEntity-API.patch} (100%)
 rename patches/server/{0213-Add-config-to-disable-ender-dragon-legacy-check.patch => 0214-Add-config-to-disable-ender-dragon-legacy-check.patch} (92%)
 rename patches/server/{0214-Implement-World.getEntity-UUID-API.patch => 0215-Implement-World.getEntity-UUID-API.patch} (100%)
 rename patches/server/{0215-InventoryCloseEvent-Reason-API.patch => 0216-InventoryCloseEvent-Reason-API.patch} (99%)
 rename patches/server/{0216-Vex-get-setSummoner-API.patch => 0217-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (94%)
 rename patches/server/{0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (94%)
 rename patches/server/{0219-add-more-information-to-Entity.toString.patch => 0220-add-more-information-to-Entity.toString.patch} (95%)
 rename patches/server/{0220-EnderDragon-Events.patch => 0221-EnderDragon-Events.patch} (100%)
 rename patches/server/{0221-PlayerElytraBoostEvent.patch => 0222-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0222-PlayerLaunchProjectileEvent.patch => 0223-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0223-Improve-BlockPosition-inlining.patch => 0224-Improve-BlockPosition-inlining.patch} (100%)
 rename patches/server/{0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (91%)
 rename patches/server/{0225-Vanished-players-don-t-have-rights.patch => 0226-Vanished-players-don-t-have-rights.patch} (98%)
 rename patches/server/{0226-Allow-disabling-armour-stand-ticking.patch => 0227-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/server/{0227-SkeletonHorse-Additions.patch => 0228-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0228-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0229-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0229-Implement-Expanded-ArmorStand-API.patch => 0230-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0230-AnvilDamageEvent.patch => 0231-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0231-Add-TNTPrimeEvent.patch => 0232-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0232-Break-up-and-make-tab-spam-limits-configurable.patch => 0233-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename patches/server/{0233-Fix-NBT-type-issues.patch => 0234-Fix-NBT-type-issues.patch} (100%)
 rename patches/server/{0234-Remove-unnecessary-itemmeta-handling.patch => 0235-Remove-unnecessary-itemmeta-handling.patch} (100%)
 rename patches/server/{0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (97%)
 rename patches/server/{0236-Add-Early-Warning-Feature-to-WatchDog.patch => 0237-Add-Early-Warning-Feature-to-WatchDog.patch} (99%)
 rename patches/server/{0237-Use-ConcurrentHashMap-in-JsonList.patch => 0238-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0238-Use-a-Queue-for-Queueing-Commands.patch => 0239-Use-a-Queue-for-Queueing-Commands.patch} (95%)
 rename patches/server/{0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0240-Optimize-BlockPosition-helper-methods.patch => 0241-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch => 0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch} (100%)
 rename patches/server/{0242-Slime-Pathfinder-Events.patch => 0243-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0243-Configurable-speed-for-water-flowing-over-lava.patch => 0244-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0244-Optimize-CraftBlockData-Creation.patch => 0245-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0245-Optimize-MappedRegistry.patch => 0246-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0246-Add-PhantomPreSpawnEvent.patch => 0247-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0247-Add-More-Creeper-API.patch => 0248-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0248-Inventory-removeItemAnySlot.patch => 0249-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0250-Add-ray-tracing-methods-to-LivingEntity.patch => 0251-Add-ray-tracing-methods-to-LivingEntity.patch} (94%)
 rename patches/server/{0251-Expose-attack-cooldown-methods-for-Player.patch => 0252-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0252-Improve-death-events.patch => 0253-Improve-death-events.patch} (99%)
 rename patches/server/{0253-Allow-chests-to-be-placed-with-NBT-data.patch => 0254-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0254-Mob-Pathfinding-API.patch => 0255-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0257-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0258-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename patches/server/{0258-Implement-furnace-cook-speed-multiplier-API.patch => 0259-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0259-Honor-EntityAgeable.ageLock.patch => 0260-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0260-Configurable-connection-throttle-kick-message.patch => 0261-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0261-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0262-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0262-Hook-into-CB-plugin-rewrites.patch => 0263-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0263-PreSpawnerSpawnEvent.patch => 0264-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0264-Add-LivingEntity-getTargetEntity.patch => 0265-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename patches/server/{0265-Add-sun-related-API.patch => 0266-Add-sun-related-API.patch} (100%)
 rename patches/server/{0266-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0267-Catch-JsonParseException-in-Entity-and-TE-names.patch} (98%)
 rename patches/server/{0267-Turtle-API.patch => 0268-Turtle-API.patch} (100%)
 rename patches/server/{0268-Call-player-spectator-target-events-and-improve-impl.patch => 0269-Call-player-spectator-target-events-and-improve-impl.patch} (96%)
 rename patches/server/{0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0270-Add-more-Witch-API.patch => 0271-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0271-Check-Drowned-for-Villager-Aggression-Config.patch => 0272-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0272-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0273-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%)
 rename patches/server/{0273-Reset-players-airTicks-on-respawn.patch => 0274-Reset-players-airTicks-on-respawn.patch} (89%)
 rename patches/server/{0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0276-Optimize-World-Time-Updates.patch => 0277-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0277-Restore-custom-InventoryHolder-support.patch => 0278-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0278-Use-Vanilla-Minecart-Speeds.patch => 0279-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0279-Fix-SpongeAbsortEvent-handling.patch => 0280-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0280-Don-t-allow-digging-into-unloaded-chunks.patch => 0281-Don-t-allow-digging-into-unloaded-chunks.patch} (98%)
 rename patches/server/{0281-Make-the-default-permission-message-configurable.patch => 0282-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/server/{0282-Prevent-rayTrace-from-loading-chunks.patch => 0283-Prevent-rayTrace-from-loading-chunks.patch} (90%)
 rename patches/server/{0283-Handle-Large-Packets-disconnecting-client.patch => 0284-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0284-force-entity-dismount-during-teleportation.patch => 0285-force-entity-dismount-during-teleportation.patch} (96%)
 rename patches/server/{0285-Add-more-Zombie-API.patch => 0286-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0286-Book-Size-Limits.patch => 0287-Book-Size-Limits.patch} (96%)
 rename patches/server/{0287-Add-PlayerConnectionCloseEvent.patch => 0288-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0288-Prevent-Enderman-from-loading-chunks.patch => 0289-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (98%)
 rename patches/server/{0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename patches/server/{0291-Block-Entity-remove-from-being-called-on-Players.patch => 0292-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0292-BlockDestroyEvent.patch => 0293-BlockDestroyEvent.patch} (93%)
 rename patches/server/{0293-Async-command-map-building.patch => 0294-Async-command-map-building.patch} (100%)
 rename patches/server/{0294-Implement-Brigadier-Mojang-API.patch => 0295-Implement-Brigadier-Mojang-API.patch} (99%)
 rename patches/server/{0295-Improve-exact-choice-recipe-ingredients.patch => 0296-Improve-exact-choice-recipe-ingredients.patch} (100%)
 rename patches/server/{0296-Limit-Client-Sign-length-more.patch => 0297-Limit-Client-Sign-length-more.patch} (97%)
 rename patches/server/{0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0298-Handle-Oversized-Tile-Entities-in-chunks.patch => 0299-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0300-Entity-getEntitySpawnReason.patch => 0301-Entity-getEntitySpawnReason.patch} (100%)
 rename patches/server/{0301-Fire-event-on-GS4-query.patch => 0302-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0302-Implement-PlayerPostRespawnEvent.patch => 0303-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0304-Server-Tick-Events.patch => 0305-Server-Tick-Events.patch} (100%)
 rename patches/server/{0305-PlayerDeathEvent-getItemsToKeep.patch => 0306-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename patches/server/{0306-Optimize-Captured-TileEntity-Lookup.patch => 0307-Optimize-Captured-TileEntity-Lookup.patch} (90%)
 rename patches/server/{0307-Add-Heightmap-API.patch => 0308-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0308-Mob-Spawner-API-Enhancements.patch => 0309-Mob-Spawner-API-Enhancements.patch} (98%)
 rename patches/server/{0309-Fix-CB-call-to-changed-postToMainThread-method.patch => 0310-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0311-Implement-CraftBlockSoundGroup.patch => 0312-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename patches/server/{0313-Allow-Saving-of-Oversized-Chunks.patch => 0314-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0314-Expose-the-internal-current-tick.patch => 0315-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0315-Fix-World-isChunkGenerated-calls.patch => 0316-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0316-Show-blockstate-location-if-we-failed-to-read-it.patch => 0317-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (94%)
 rename patches/server/{0318-Configurable-projectile-relative-velocity.patch => 0319-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0319-offset-item-frame-ticking.patch => 0320-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0320-Fix-MC-158900.patch => 0321-Fix-MC-158900.patch} (100%)
 rename patches/server/{0321-Prevent-consuming-the-wrong-itemstack.patch => 0322-Prevent-consuming-the-wrong-itemstack.patch} (96%)
 rename patches/server/{0322-Dont-send-unnecessary-sign-update.patch => 0323-Dont-send-unnecessary-sign-update.patch} (92%)
 rename patches/server/{0323-Add-option-to-disable-pillager-patrols.patch => 0324-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0324-Flat-bedrock-generator-settings.patch => 0325-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0326-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0327-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0327-Duplicate-UUID-Resolve-Option.patch => 0328-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0328-PlayerDeathEvent-shouldDropExperience.patch => 0329-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename patches/server/{0329-Prevent-bees-loading-chunks-checking-hive-position.patch => 0330-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0331-Optimise-EntityGetter-getPlayerByUUID.patch => 0332-Optimise-EntityGetter-getPlayerByUUID.patch} (100%)
 rename patches/server/{0332-Fix-items-not-falling-correctly.patch => 0333-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0333-Optimize-call-to-getFluid-for-explosions.patch => 0334-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0335-Guard-against-serializing-mismatching-chunk-coordina.patch => 0336-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0336-Entity-Activation-Range-2.0.patch => 0337-Entity-Activation-Range-2.0.patch} (99%)
 rename patches/server/{0337-Implement-alternative-item-despawn-rate.patch => 0338-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0338-Lag-compensate-eating.patch => 0339-Lag-compensate-eating.patch} (97%)
 rename patches/server/{0339-Tracking-Range-Improvements.patch => 0340-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0340-Fix-items-vanishing-through-end-portal.patch => 0341-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename patches/server/{0341-implement-optional-per-player-mob-spawns.patch => 0342-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0342-Anti-Xray.patch => 0343-Anti-Xray.patch} (99%)
 rename patches/server/{0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0344-Improve-Block-breakNaturally-API.patch => 0345-Improve-Block-breakNaturally-API.patch} (100%)
 rename patches/server/{0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0346-Add-debug-for-sync-chunk-loads.patch => 0347-Add-debug-for-sync-chunk-loads.patch} (100%)
 rename patches/server/{0347-Remove-garbage-Java-version-check.patch => 0348-Remove-garbage-Java-version-check.patch} (91%)
 rename patches/server/{0348-Add-ThrownEggHatchEvent.patch => 0349-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0349-Entity-Jump-API.patch => 0350-Entity-Jump-API.patch} (97%)
 rename patches/server/{0350-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0351-Add-option-to-nerf-pigmen-from-nether-portals.patch} (96%)
 rename patches/server/{0351-Make-the-GUI-graph-fancier.patch => 0352-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0352-add-hand-to-BlockMultiPlaceEvent.patch => 0353-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0353-Validate-tripwire-hook-placement-before-update.patch => 0354-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0355-Configurable-chance-of-villager-zombie-infection.patch => 0356-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0356-Optimise-Chunk-getFluid.patch => 0357-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0357-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0358-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0358-Add-tick-times-API-and-mspt-command.patch => 0359-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0359-Expose-MinecraftServer-isRunning.patch => 0360-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0360-Add-Raw-Byte-ItemStack-Serialization.patch => 0361-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0361-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0362-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename patches/server/{0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (95%)
 rename patches/server/{0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename patches/server/{0365-Don-t-tick-dead-players.patch => 0366-Don-t-tick-dead-players.patch} (91%)
 rename patches/server/{0366-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0367-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0367-Optimize-Collision-to-not-load-chunks.patch => 0368-Optimize-Collision-to-not-load-chunks.patch} (98%)
 rename patches/server/{0368-Don-t-move-existing-players-to-world-spawn.patch => 0369-Don-t-move-existing-players-to-world-spawn.patch} (96%)
 rename patches/server/{0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0370-Improved-Watchdog-Support.patch => 0371-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0371-Optimize-Pathfinding.patch => 0372-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0372-Reduce-Either-Optional-allocation.patch => 0373-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0373-Reduce-memory-footprint-of-NBTTagCompound.patch => 0374-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0374-Prevent-opening-inventories-when-frozen.patch => 0375-Prevent-opening-inventories-when-frozen.patch} (95%)
 rename patches/server/{0375-Don-t-run-entity-collision-code-if-not-needed.patch => 0376-Don-t-run-entity-collision-code-if-not-needed.patch} (96%)
 rename patches/server/{0376-Implement-Player-Client-Options-API.patch => 0377-Implement-Player-Client-Options-API.patch} (98%)
 rename patches/server/{0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename patches/server/{0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (93%)
 rename patches/server/{0380-Add-PlayerAttackEntityCooldownResetEvent.patch => 0381-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename patches/server/{0381-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0382-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0382-Add-phantom-creative-and-insomniac-controls.patch => 0383-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (99%)
 rename patches/server/{0384-Villager-Restocks-API.patch => 0385-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0385-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0386-Validate-PickItem-Packet-and-kick-for-invalid.patch} (95%)
 rename patches/server/{0386-Expose-game-version.patch => 0387-Expose-game-version.patch} (100%)
 rename patches/server/{0387-Optimize-Voxel-Shape-Merging.patch => 0388-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename patches/server/{0389-misc-debugging-dumps.patch => 0390-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0390-Prevent-teleporting-dead-entities.patch => 0391-Prevent-teleporting-dead-entities.patch} (92%)
 rename patches/server/{0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0392-Implement-Mob-Goal-API.patch => 0393-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0393-Add-villager-reputation-API.patch => 0394-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0394-Option-for-maximum-exp-value-when-merging-orbs.patch => 0395-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0395-ExperienceOrbMergeEvent.patch => 0396-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0396-Fix-PotionEffect-ignores-icon-flag.patch => 0397-Fix-PotionEffect-ignores-icon-flag.patch} (92%)
 rename patches/server/{0397-Optimize-brigadier-child-sorting-performance.patch => 0398-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0398-Potential-bed-API.patch => 0399-Potential-bed-API.patch} (95%)
 rename patches/server/{0399-Wait-for-Async-Tasks-during-shutdown.patch => 0400-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (97%)
 rename patches/server/{0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename patches/server/{0403-Ensure-safe-gateway-teleport.patch => 0404-Ensure-safe-gateway-teleport.patch} (93%)
 rename patches/server/{0404-Add-option-for-console-having-all-permissions.patch => 0405-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0405-Fix-villager-trading-demand-MC-163962.patch => 0406-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0406-Maps-shouldn-t-load-chunks.patch => 0407-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0409-Fix-piston-physics-inconsistency-MC-188840.patch => 0410-Fix-piston-physics-inconsistency-MC-188840.patch} (96%)
 rename patches/server/{0410-Fix-sand-duping.patch => 0411-Fix-sand-duping.patch} (100%)
 rename patches/server/{0411-Fix-missing-chunks-due-to-integer-overflow.patch => 0412-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0412-Prevent-position-desync-in-playerconnection-causing-.patch => 0413-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename patches/server/{0413-Use-distance-map-to-optimise-entity-tracker.patch => 0414-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0414-Inventory-getHolder-method-without-block-snapshot.patch => 0415-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0415-Improve-Arrow-API.patch => 0416-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0416-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0417-Add-and-implement-PlayerRecipeBookClickEvent.patch} (97%)
 rename patches/server/{0417-Hide-sync-chunk-writes-behind-flag.patch => 0418-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0418-Add-permission-for-command-blocks.patch => 0419-Add-permission-for-command-blocks.patch} (98%)
 rename patches/server/{0419-Ensure-Entity-AABB-s-are-never-invalid.patch => 0420-Ensure-Entity-AABB-s-are-never-invalid.patch} (95%)
 rename patches/server/{0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0421-Paper-dumpitem-command.patch => 0422-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0422-Improve-Legacy-Component-serialization-size.patch => 0423-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0423-Optimize-Bit-Operations-by-inlining.patch => 0424-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0425-incremental-chunk-and-player-saving.patch => 0426-incremental-chunk-and-player-saving.patch} (100%)
 rename patches/server/{0426-Support-old-UUID-format-for-NBT.patch => 0427-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0427-Convert-legacy-attributes-in-Item-Meta.patch => 0428-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0428-Remove-some-streams-from-structures.patch => 0429-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0429-Remove-streams-from-classes-related-villager-gossip.patch => 0430-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0430-Support-components-in-ItemMeta.patch => 0431-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0431-Improve-fix-EntityTargetLivingEntityEvent.patch => 0432-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0432-Add-entity-liquid-API.patch => 0433-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0433-Update-itemstack-legacy-name-and-lore.patch => 0434-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0434-Spawn-player-in-correct-world-on-login.patch => 0435-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0435-Add-PrepareResultEvent.patch => 0436-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (91%)
 rename patches/server/{0437-Optimize-NetworkManager-Exception-Handling.patch => 0438-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0438-Fix-arrows-never-despawning-MC-125757.patch => 0439-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0439-Thread-Safe-Vanilla-Command-permission-checking.patch => 0440-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0440-Fix-SPIGOT-5989.patch => 0441-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0444-Fix-some-rails-connecting-improperly.patch => 0445-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0446-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0447-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0447-Brand-support.patch => 0448-Brand-support.patch} (100%)
 rename patches/server/{0448-Add-playPickupItemAnimation-to-LivingEntity.patch => 0449-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0449-Don-t-require-FACING-data.patch => 0450-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0451-Add-moon-phase-API.patch => 0452-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0452-Prevent-headless-pistons-from-being-created.patch => 0453-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0453-Add-BellRingEvent.patch => 0454-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0454-Add-zombie-targets-turtle-egg-config.patch => 0455-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0455-Buffer-joins-to-world.patch => 0456-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0456-Eigencraft-redstone-implementation.patch => 0457-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0457-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0458-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0458-PortalCreateEvent-needs-to-know-its-entity.patch => 0459-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0459-Add-more-Evoker-API.patch => 0460-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0460-Add-methods-to-get-translation-keys.patch => 0461-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0461-Create-HoverEvent-from-ItemStack-Entity.patch => 0462-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0462-Cache-block-data-strings.patch => 0463-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0464-Add-additional-open-container-api-to-HumanEntity.patch => 0465-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0466-Extend-block-drop-capture-to-capture-all-items-added.patch => 0467-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0468-Lazily-track-plugin-scoreboards-by-default.patch => 0469-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0469-Entity-isTicking.patch => 0470-Entity-isTicking.patch} (100%)
 rename patches/server/{0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0471-Fix-Concurrency-issue-in-ShufflingList.patch => 0472-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (92%)
 rename patches/server/{0473-Fix-for-large-move-vectors-crashing-server.patch => 0474-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0474-Optimise-getType-calls.patch => 0475-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0475-Villager-resetOffers.patch => 0476-Villager-resetOffers.patch} (100%)
 rename patches/server/{0476-Retain-block-place-order-when-capturing-blockstates.patch => 0477-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 rename patches/server/{0477-Reduce-blockpos-allocation-from-pathfinding.patch => 0478-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0478-Fix-item-locations-dropped-from-campfires.patch => 0479-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0479-Player-elytra-boost-API.patch => 0480-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0480-Fixed-TileEntityBell-memory-leak.patch => 0481-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0482-Add-getOfflinePlayerIfCached-String.patch => 0483-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0483-Add-ignore-discounts-API.patch => 0484-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0484-Toggle-for-removing-existing-dragon.patch => 0485-Toggle-for-removing-existing-dragon.patch} (91%)
 rename patches/server/{0485-Fix-client-lag-on-advancement-loading.patch => 0486-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0486-Item-no-age-no-player-pickup.patch => 0487-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0488-Beacon-API-custom-effect-ranges.patch => 0489-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0489-Add-API-for-quit-reason.patch => 0490-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0490-Add-Wandering-Trader-spawn-rate-config-options.patch => 0491-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0491-Expose-world-spawn-angle.patch => 0492-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0492-Add-Destroy-Speed-API.patch => 0493-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0494-Add-LivingEntity-clearActiveItem.patch => 0495-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0495-Add-PlayerItemCooldownEvent.patch => 0496-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0496-Significantly-improve-performance-of-the-end-generat.patch => 0497-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0497-More-lightning-API.patch => 0498-More-lightning-API.patch} (100%)
 rename patches/server/{0498-Climbing-should-not-bypass-cramming-gamerule.patch => 0499-Climbing-should-not-bypass-cramming-gamerule.patch} (97%)
 rename patches/server/{0499-Added-missing-default-perms-for-commands.patch => 0500-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0500-Add-PlayerShearBlockEvent.patch => 0501-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0501-Fix-curing-zombie-villager-discount-exploit.patch => 0502-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0502-Limit-recipe-packets.patch => 0503-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0503-Fix-CraftSound-backwards-compatibility.patch => 0504-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0504-Player-Chunk-Load-Unload-Events.patch => 0505-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0505-Optimize-Dynamic-get-Missing-Keys.patch => 0506-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0506-Expose-LivingEntity-hurt-direction.patch => 0507-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0510-Implement-TargetHitEvent.patch => 0511-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0511-MC-4-Fix-item-position-desync.patch => 0512-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0512-Additional-Block-Material-API-s.patch => 0513-Additional-Block-Material-API-s.patch} (93%)
 rename patches/server/{0513-Fix-harming-potion-dupe.patch => 0514-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0515-Cache-burn-durations.patch => 0516-Cache-burn-durations.patch} (100%)
 rename patches/server/{0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0517-Fix-Not-a-string-Map-Conversion-spam.patch => 0518-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0518-Implement-PlayerFlowerPotManipulateEvent.patch => 0519-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0519-Fix-interact-event-not-being-called-sometimes.patch => 0520-Fix-interact-event-not-being-called-sometimes.patch} (100%)
 rename patches/server/{0520-Zombie-API-breaking-doors.patch => 0521-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0521-Fix-nerfed-slime-when-splitting.patch => 0522-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0522-Add-EntityLoadCrossbowEvent.patch => 0523-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0523-Added-WorldGameRuleChangeEvent.patch => 0524-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0524-Added-ServerResourcesReloadedEvent.patch => 0525-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0525-Added-world-settings-for-mobs-picking-up-loot.patch => 0526-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0526-Implemented-BlockFailedDispenseEvent.patch => 0527-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0527-Added-PlayerLecternPageChangeEvent.patch => 0528-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0528-Added-PlayerLoomPatternSelectEvent.patch => 0529-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0529-Configurable-door-breaking-difficulty.patch => 0530-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0530-Empty-commands-shall-not-be-dispatched.patch => 0531-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0531-Remove-stale-POIs.patch => 0532-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0532-Fix-villager-boat-exploit.patch => 0533-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0533-Add-sendOpLevel-API.patch => 0534-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0534-TODO-Registry-Modification-API.patch => 0535-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0535-Add-StructuresLocateEvent.patch => 0536-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0536-Collision-option-for-requiring-a-player-participant.patch => 0537-Collision-option-for-requiring-a-player-participant.patch} (96%)
 rename patches/server/{0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0538-Return-chat-component-with-empty-text-instead-of-thr.patch => 0539-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0539-Make-schedule-command-per-world.patch => 0540-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0540-Configurable-max-leash-distance.patch => 0541-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0541-Implement-BlockPreDispenseEvent.patch => 0542-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0543-Add-toggle-for-always-placing-the-dragon-egg.patch => 0544-Add-toggle-for-always-placing-the-dragon-egg.patch} (92%)
 rename patches/server/{0544-Added-PlayerStonecutterRecipeSelectEvent.patch => 0545-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0546-Reset-shield-blocking-on-dimension-change.patch => 0547-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0547-add-DragonEggFormEvent.patch => 0548-add-DragonEggFormEvent.patch} (96%)
 rename patches/server/{0548-EntityMoveEvent.patch => 0549-EntityMoveEvent.patch} (97%)
 rename patches/server/{0549-added-option-to-disable-pathfinding-updates-on-block.patch => 0550-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0550-Inline-shift-direction-fields.patch => 0551-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0551-Allow-adding-items-to-BlockDropItemEvent.patch => 0552-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0553-living-entity-allow-attribute-registration.patch => 0554-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0554-fix-dead-slime-setSize-invincibility.patch => 0555-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0555-Merchant-getRecipes-should-return-an-immutable-list.patch => 0556-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0556-Expose-Tracked-Players.patch => 0557-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0557-Remove-streams-from-SensorNearest.patch => 0558-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0558-Throw-proper-exception-on-empty-JsonList-file.patch => 0559-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0559-Improve-ServerGUI.patch => 0560-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0560-fix-converting-txt-to-json-file.patch => 0561-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0561-Add-worldborder-events.patch => 0562-Add-worldborder-events.patch} (100%)
 rename patches/server/{0562-added-PlayerNameEntityEvent.patch => 0563-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0563-Prevent-grindstones-from-overstacking-items.patch => 0564-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0564-Add-recipe-to-cook-events.patch => 0565-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0565-Add-Block-isValidTool.patch => 0566-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0566-Allow-using-signs-inside-spawn-protection.patch => 0567-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0567-Expand-world-key-API.patch => 0568-Expand-world-key-API.patch} (100%)
 rename patches/server/{0568-Add-fast-alternative-constructor-for-Rotations.patch => 0569-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0569-Item-Rarity-API.patch => 0570-Item-Rarity-API.patch} (100%)
 rename patches/server/{0570-Drop-carried-item-when-player-has-disconnected.patch => 0571-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0571-forced-whitelist-use-configurable-kick-message.patch => 0572-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0573-Expose-protocol-version.patch => 0574-Expose-protocol-version.patch} (100%)
 rename patches/server/{0574-Enhance-console-tab-completions-for-brigadier-comman.patch => 0575-Enhance-console-tab-completions-for-brigadier-comman.patch} (99%)
 rename patches/server/{0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (93%)
 rename patches/server/{0576-Add-bypass-host-check.patch => 0577-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0577-Set-area-affect-cloud-rotation.patch => 0578-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0578-add-isDeeplySleeping-to-HumanEntity.patch => 0579-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0579-add-consumeFuel-to-FurnaceBurnEvent.patch => 0580-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0580-add-get-set-drop-chance-to-EntityEquipment.patch => 0581-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0581-fix-PigZombieAngerEvent-cancellation.patch => 0582-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0582-fix-PlayerItemHeldEvent-firing-twice.patch => 0583-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0583-Added-PlayerDeepSleepEvent.patch => 0584-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0584-More-World-API.patch => 0585-More-World-API.patch} (100%)
 rename patches/server/{0585-Added-PlayerBedFailEnterEvent.patch => 0586-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0586-Entity-load-save-limit-per-chunk.patch => 0587-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0587-Implement-methods-to-convert-between-Component-and-B.patch => 0588-Implement-methods-to-convert-between-Component-and-B.patch} (96%)
 rename patches/server/{0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0589-Introduce-beacon-activation-deactivation-events.patch => 0590-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0590-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0591-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0591-Add-Channel-initialization-listeners.patch => 0592-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0592-Send-empty-commands-if-tab-completion-is-disabled.patch => 0593-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0593-Add-more-WanderingTrader-API.patch => 0594-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0594-Add-EntityBlockStorage-clearEntities.patch => 0595-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0597-Inventory-close.patch => 0598-Inventory-close.patch} (100%)
 rename patches/server/{0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0599-Fix-CraftPotionBrewer-cache.patch => 0600-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0600-Add-basic-Datapack-API.patch => 0601-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0601-Add-environment-variable-to-disable-server-gui.patch => 0602-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0602-additions-to-PlayerGameModeChangeEvent.patch => 0603-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0603-ItemStack-repair-check-API.patch => 0604-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0604-More-Enchantment-API.patch => 0605-More-Enchantment-API.patch} (100%)
 rename patches/server/{0605-Move-range-check-for-block-placing-up.patch => 0606-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0606-Fix-and-optimise-world-force-upgrading.patch => 0607-Fix-and-optimise-world-force-upgrading.patch} (99%)
 rename patches/server/{0607-Add-Mob-lookAt-API.patch => 0608-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0608-Add-Unix-domain-socket-support.patch => 0609-Add-Unix-domain-socket-support.patch} (98%)
 rename patches/server/{0609-Add-EntityInsideBlockEvent.patch => 0610-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0610-Attributes-API-for-item-defaults.patch => 0611-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0611-Add-cause-to-Weather-ThunderChangeEvents.patch => 0612-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0612-More-Lidded-Block-API.patch => 0613-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0613-Limit-item-frame-cursors-on-maps.patch => 0614-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0614-Add-PlayerKickEvent-causes.patch => 0615-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0615-Add-PufferFishStateChangeEvent.patch => 0616-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 delete mode 100644 patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch
 rename patches/server/{0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 create mode 100644 patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
 rename patches/server/{0619-Add-BellRevealRaiderEvent.patch => 0620-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0620-Fix-invulnerable-end-crystals.patch => 0621-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0621-Add-ElderGuardianAppearanceEvent.patch => 0622-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0622-Fix-dangerous-end-portal-logic.patch => 0623-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0624-Make-item-validations-configurable.patch => 0625-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0625-Line-Of-Sight-Changes.patch => 0626-Line-Of-Sight-Changes.patch} (58%)
 rename patches/server/{0626-add-per-world-spawn-limits.patch => 0627-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0627-Fix-potions-splash-events.patch => 0628-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0628-Add-more-LimitedRegion-API.patch => 0629-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0629-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0630-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0630-Missing-Entity-API.patch => 0631-Missing-Entity-API.patch} (99%)
 rename patches/server/{0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (90%)
 rename patches/server/{0633-Use-getChunkIfLoadedImmediately-in-places.patch => 0634-Use-getChunkIfLoadedImmediately-in-places.patch} (97%)
 rename patches/server/{0634-Fix-commands-from-signs-not-firing-command-events.patch => 0635-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0635-Adds-PlayerArmSwingEvent.patch => 0636-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0636-Fixes-kick-event-leave-message-not-being-sent.patch => 0637-Fixes-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0637-Add-config-for-mobs-immune-to-default-effects.patch => 0638-Add-config-for-mobs-immune-to-default-effects.patch} (97%)
 rename patches/server/{0638-Fix-incorrect-message-for-outdated-client.patch => 0639-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0639-Don-t-apply-cramming-damage-to-players.patch => 0640-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0640-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0641-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0641-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0642-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0642-Stinger-API.patch => 0643-Stinger-API.patch} (93%)
 rename patches/server/{0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0644-Add-System.out-err-catcher.patch => 0645-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0645-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0646-Improve-boat-collision-performance.patch => 0647-Improve-boat-collision-performance.patch} (97%)
 rename patches/server/{0647-Prevent-AFK-kick-while-watching-end-credits.patch => 0648-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0648-Allow-skipping-writing-of-comments-to-server.propert.patch => 0649-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0649-Add-PlayerSetSpawnEvent.patch => 0650-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0650-Make-hoppers-respect-inventory-max-stack-size.patch => 0651-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0651-Optimize-entity-tracker-passenger-checks.patch => 0652-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0652-Config-option-for-Piglins-guarding-chests.patch => 0653-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0653-Added-EntityDamageItemEvent.patch => 0654-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0654-Optimize-indirect-passenger-iteration.patch => 0655-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0655-Configurable-item-frame-map-cursor-update-interval.patch => 0656-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0656-Make-EntityUnleashEvent-cancellable.patch => 0657-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0657-Clear-bucket-NBT-after-dispense.patch => 0658-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0658-Change-EnderEye-target-without-changing-other-things.patch => 0659-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0659-Add-BlockBreakBlockEvent.patch => 0660-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0661-More-CommandBlock-API.patch => 0662-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0662-Add-missing-team-sidebar-display-slots.patch => 0663-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0663-Add-back-EntityPortalExitEvent.patch => 0664-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0664-Add-methods-to-find-targets-for-lightning-strikes.patch => 0665-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0665-Get-entity-default-attributes.patch => 0666-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0666-Left-handed-API.patch => 0667-Left-handed-API.patch} (100%)
 rename patches/server/{0667-Add-more-advancement-API.patch => 0668-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0668-Add-ItemFactory-getSpawnEgg-API.patch => 0669-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0669-Add-critical-damage-API.patch => 0670-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0670-Fix-issues-with-mob-conversion.patch => 0671-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0671-Add-isCollidable-methods-to-various-places.patch => 0672-Add-isCollidable-methods-to-various-places.patch} (96%)
 rename patches/server/{0672-Goat-ram-API.patch => 0673-Goat-ram-API.patch} (100%)
 rename patches/server/{0673-Add-API-for-resetting-a-single-score.patch => 0674-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0674-Add-Raw-Byte-Entity-Serialization.patch => 0675-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0675-Vanilla-command-permission-fixes.patch => 0676-Vanilla-command-permission-fixes.patch} (97%)
 rename patches/server/{0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0677-Fix-GameProfileCache-concurrency.patch => 0678-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0678-Improve-and-expand-AsyncCatcher.patch => 0679-Improve-and-expand-AsyncCatcher.patch} (98%)
 rename patches/server/{0679-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0680-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0680-Sanitize-ResourceLocation-error-logging.patch => 0681-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0681-Allow-controlled-flushing-for-network-manager.patch => 0682-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0682-Optimise-general-POI-access.patch => 0683-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (100%)
 rename patches/server/{0684-Optimise-chunk-tick-iteration.patch => 0685-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0685-Execute-chunk-tasks-mid-tick.patch => 0686-Execute-chunk-tasks-mid-tick.patch} (97%)
 rename patches/server/{0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0687-Custom-table-implementation-for-blockstate-state-loo.patch => 0688-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0688-Detail-more-information-in-watchdog-dumps.patch => 0689-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0689-Manually-inline-methods-in-BlockPosition.patch => 0690-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0690-Distance-manager-tick-timings.patch => 0691-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0691-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0692-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (90%)
 rename patches/server/{0693-Add-packet-limiter-config.patch => 0694-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0695-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0696-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0696-Don-t-lookup-fluid-state-when-raytracing.patch => 0697-Don-t-lookup-fluid-state-when-raytracing.patch} (87%)
 rename patches/server/{0697-Time-scoreboard-search.patch => 0698-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0698-Send-full-pos-packets-for-hard-colliding-entities.patch => 0699-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0699-Do-not-run-raytrace-logic-for-AIR.patch => 0700-Do-not-run-raytrace-logic-for-AIR.patch} (88%)
 rename patches/server/{0700-Oprimise-map-impl-for-tracked-players.patch => 0701-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0701-Optimise-BlockSoil-nearby-water-lookup.patch => 0702-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0702-Optimise-random-block-ticking.patch => 0703-Optimise-random-block-ticking.patch} (99%)
 rename patches/server/{0703-Optimise-non-flush-packet-sending.patch => 0704-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0704-Optimise-nearby-player-lookups.patch => 0705-Optimise-nearby-player-lookups.patch} (99%)
 rename patches/server/{0705-Remove-streams-for-villager-AI.patch => 0706-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0706-Use-Velocity-compression-and-cipher-natives.patch => 0707-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0708-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0709-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0710-Check-requirement-before-suggesting-root-nodes.patch => 0711-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0713-Ensure-valid-vehicle-status.patch => 0714-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0714-Prevent-softlocked-end-exit-portal-generation.patch => 0715-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0716-Don-t-log-debug-logging-being-disabled.patch => 0717-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0717-fix-various-menus-with-empty-level-accesses.patch => 0718-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0718-Preserve-overstacked-loot.patch => 0719-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0719-Update-head-rotation-in-missing-places.patch => 0720-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0720-prevent-unintended-light-block-manipulation.patch => 0721-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0721-Fix-CraftCriteria-defaults-map.patch => 0722-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0722-Fix-upstreams-block-state-factories.patch => 0723-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0723-Add-config-option-for-logging-player-ip-addresses.patch => 0724-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0724-Configurable-feature-seeds.patch => 0725-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0725-Add-root-admin-user-detection.patch => 0726-Add-root-admin-user-detection.patch} (97%)
 rename patches/server/{0726-Always-allow-item-changing-in-Fireball.patch => 0727-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0727-don-t-attempt-to-teleport-dead-entities.patch => 0728-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0728-Prevent-excessive-velocity-through-repeated-crits.patch => 0729-Prevent-excessive-velocity-through-repeated-crits.patch} (94%)
 rename patches/server/{0729-Remove-client-side-code-using-deprecated-for-removal.patch => 0730-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0730-Fix-removing-recipes-from-RecipeIterator.patch => 0731-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0731-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0732-Prevent-sending-oversized-item-data-in-equipment-and.patch} (97%)
 rename patches/server/{0732-Hide-unnecessary-itemmeta-from-clients.patch => 0733-Hide-unnecessary-itemmeta-from-clients.patch} (98%)
 rename patches/server/{0733-Fix-Spigot-growth-modifiers.patch => 0734-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0735-Add-PlayerItemFrameChangeEvent.patch => 0736-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0736-Optimize-HashMapPalette.patch => 0737-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0737-Allow-delegation-to-vanilla-chunk-gen.patch => 0738-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0739-Optimise-collision-checking-in-player-move-packet-ha.patch => 0740-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0741-Add-more-Campfire-API.patch => 0742-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0743-Fix-tripwire-state-inconsistency.patch => 0744-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0744-Forward-CraftEntity-in-teleport-command.patch => 0745-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0745-Improve-scoreboard-entries.patch => 0746-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0746-Entity-powdered-snow-API.patch => 0747-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0747-Add-API-for-item-entity-health.patch => 0748-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0748-Fix-entity-type-tags-suggestions-in-selectors.patch => 0749-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0749-Configurable-max-block-light-for-monster-spawning.patch => 0750-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0751-Load-effect-amplifiers-greater-than-127-correctly.patch => 0752-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0753-Fix-bees-aging-inside-hives.patch => 0754-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0754-Bucketable-API.patch => 0755-Bucketable-API.patch} (100%)
 rename patches/server/{0755-Validate-usernames.patch => 0756-Validate-usernames.patch} (100%)
 rename patches/server/{0756-Make-water-animal-spawn-height-configurable.patch => 0757-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0758-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0759-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0759-Add-new-overload-to-PersistentDataContainer-has.patch => 0760-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0760-Multiple-Entries-with-Scoreboards.patch => 0761-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0761-Reset-placed-block-on-exception.patch => 0762-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0762-Add-configurable-height-for-slime-spawn.patch => 0763-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0764-Fix-xp-reward-for-baby-zombies.patch => 0765-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0765-Kick-on-main-for-illegal-chat.patch => 0766-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0766-Multi-Block-Change-API-Implementation.patch => 0767-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0767-Fix-NotePlayEvent.patch => 0768-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0768-Freeze-Tick-Lock-API.patch => 0769-Freeze-Tick-Lock-API.patch} (97%)
 rename patches/server/{0769-Dolphin-API.patch => 0770-Dolphin-API.patch} (100%)
 rename patches/server/{0770-More-PotionEffectType-API.patch => 0771-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0772-API-for-creating-command-sender-which-forwards-feedb.patch => 0773-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0773-Add-missing-structure-set-seed-configs.patch => 0774-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0774-Implement-regenerateChunk.patch => 0775-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0775-Fix-cancelled-powdered-snow-bucket-placement.patch => 0776-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0777-Add-GameEvent-tags.patch => 0778-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0779-Furnace-RecipesUsed-API.patch => 0780-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0780-Configurable-sculk-sensor-listener-range.patch => 0781-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0781-Add-missing-block-data-mins-and-maxes.patch => 0782-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0783-Put-world-into-worldlist-before-initing-the-world.patch => 0784-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0784-Fix-Entity-Position-Desync.patch => 0785-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0785-Custom-Potion-Mixes.patch => 0786-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0786-Force-close-world-loading-screen.patch => 0787-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0787-Fix-falling-block-spawn-methods.patch => 0788-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0788-Expose-furnace-minecart-push-values.patch => 0789-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0790-More-Projectile-API.patch => 0791-More-Projectile-API.patch} (100%)
 rename patches/server/{0791-Fix-swamp-hut-cat-generation-deadlock.patch => 0792-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0793-Implement-getComputedBiome-API.patch => 0794-Implement-getComputedBiome-API.patch} (94%)
 rename patches/server/{0794-Make-some-itemstacks-nonnull.patch => 0795-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0795-Implement-enchantWithLevels-API.patch => 0796-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0796-Fix-saving-in-unloadWorld.patch => 0797-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0797-Buffer-OOB-setBlock-calls.patch => 0798-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0798-Add-TameableDeathMessageEvent.patch => 0799-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0800-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0801-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0801-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0802-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0802-Guard-against-invalid-entity-positions.patch => 0803-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0803-cache-resource-keys.patch => 0804-cache-resource-keys.patch} (96%)
 rename patches/server/{0804-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0805-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0807-Prevent-tile-entity-copies-loading-chunks.patch => 0808-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0808-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0809-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0810-Pass-ServerLevel-for-gamerule-callbacks.patch => 0811-Pass-ServerLevel-for-gamerule-callbacks.patch} (99%)
 rename patches/server/{0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0812-WorldCreator-keepSpawnLoaded.patch => 0813-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0813-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0814-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0816-Fire-CauldronLevelChange-on-initial-fill.patch => 0817-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0817-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0818-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0818-Add-PlayerStopUsingItemEvent.patch => 0819-Add-PlayerStopUsingItemEvent.patch} (91%)
 rename patches/server/{0819-FallingBlock-auto-expire-setting.patch => 0820-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0820-Don-t-tick-markers.patch => 0821-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0821-Do-not-accept-invalid-client-settings.patch => 0822-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0822-Add-support-for-Proxy-Protocol.patch => 0823-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0823-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0824-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0825-Sanitize-Sent-BlockEntity-NBT.patch => 0826-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0826-Disable-component-selector-resolving-in-books-by-def.patch => 0827-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0827-Prevent-entity-loading-causing-async-lookups.patch => 0828-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0828-Throw-exception-on-world-create-while-being-ticked.patch => 0829-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0829-Add-Alternate-Current-redstone-implementation.patch => 0830-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0830-Dont-resent-entity-on-art-update.patch => 0831-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0831-Add-WardenAngerChangeEvent.patch => 0832-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0832-Add-option-for-strict-advancement-dimension-checks.patch => 0833-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0833-Add-missing-important-BlockStateListPopulator-method.patch => 0834-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0834-Nameable-Banner-API.patch => 0835-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0835-Don-t-broadcast-messages-to-command-blocks.patch => 0836-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0836-Prevent-empty-items-from-being-added-to-world.patch => 0837-Prevent-empty-items-from-being-added-to-world.patch} (94%)
 rename patches/server/{0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0838-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0839-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0839-Add-Player-getFishHook.patch => 0840-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0841-Add-various-missing-EntityDropItemEvent-calls.patch => 0842-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0842-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0843-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0843-Fix-Bee-flower-NPE.patch => 0844-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0845-More-Teleport-API.patch => 0846-More-Teleport-API.patch} (100%)
 rename patches/server/{0846-Add-EntityPortalReadyEvent.patch => 0847-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0847-Don-t-use-level-random-in-entity-constructors.patch => 0848-Don-t-use-level-random-in-entity-constructors.patch} (97%)
 rename patches/server/{0848-Send-block-entities-after-destroy-prediction.patch => 0849-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0849-Warn-on-plugins-accessing-faraway-chunks.patch => 0850-Warn-on-plugins-accessing-faraway-chunks.patch} (97%)
 rename patches/server/{0850-Custom-Chat-Completion-Suggestions-API.patch => 0851-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0851-Add-and-fix-missing-BlockFadeEvents.patch => 0852-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0852-Collision-API.patch => 0853-Collision-API.patch} (87%)
 rename patches/server/{0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0854-Block-Ticking-API.patch => 0855-Block-Ticking-API.patch} (100%)
 rename patches/server/{0855-Add-Velocity-IP-Forwarding-Support.patch => 0856-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0857-Add-NamespacedKey-biome-methods.patch => 0858-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0858-Fix-plugin-loggers-on-server-shutdown.patch => 0859-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0859-Stop-large-look-changes-from-crashing-the-server.patch => 0860-Stop-large-look-changes-from-crashing-the-server.patch} (96%)
 rename patches/server/{0860-Fire-EntityChangeBlockEvent-in-more-places.patch => 0861-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0861-Missing-eating-regain-reason.patch => 0862-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0862-Missing-effect-cause.patch => 0863-Missing-effect-cause.patch} (100%)
 rename patches/server/{0863-Added-byte-array-serialization-deserialization-for-P.patch => 0864-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (97%)
 rename patches/server/{0865-Call-BlockPhysicsEvent-more-often.patch => 0866-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0866-Configurable-chat-thread-limit.patch => 0867-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0868-fix-Jigsaw-block-kicking-user.patch => 0869-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0869-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0870-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0870-Add-getDrops-to-BlockState.patch => 0871-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0871-Fix-a-bunch-of-vanilla-bugs.patch => 0872-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0872-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0873-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0873-Fix-custom-piglin-loved-items.patch => 0874-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0874-EntityPickupItemEvent-fixes.patch => 0875-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0875-Correctly-handle-interactions-with-items-on-cooldown.patch => 0876-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0876-Add-PlayerInventorySlotChangeEvent.patch => 0877-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0877-Elder-Guardian-appearance-API.patch => 0878-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0878-Allow-changing-bed-s-occupied-property.patch => 0879-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0879-Add-entity-knockback-API.patch => 0880-Add-entity-knockback-API.patch} (85%)
 rename patches/server/{0880-Detect-headless-JREs.patch => 0881-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0881-fixed-entity-vehicle-collision-event-not-called.patch => 0882-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0882-optimized-dirt-and-snow-spreading.patch => 0883-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0883-Added-EntityToggleSitEvent.patch => 0884-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0884-Add-fire-tick-delay-option.patch => 0885-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0885-Add-Moving-Piston-API.patch => 0886-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0886-Ignore-impossible-spawn-tick.patch => 0887-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0887-Track-projectile-source-for-fireworks-from-dispenser.patch => 0888-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0890-Prevent-compass-from-loading-chunks.patch => 0891-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0891-Add-PrePlayerAttackEntityEvent.patch => 0892-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0892-ensure-reset-EnderDragon-boss-event-name.patch => 0893-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0893-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0894-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0894-Add-Player-Warden-Warning-API.patch => 0895-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0895-More-vanilla-friendly-methods-to-update-trades.patch => 0896-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0896-Add-paper-dumplisteners-command.patch => 0897-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0897-check-global-player-list-where-appropriate.patch => 0898-check-global-player-list-where-appropriate.patch} (97%)
 rename patches/server/{0898-Fix-async-entity-add-due-to-fungus-trees.patch => 0899-Fix-async-entity-add-due-to-fungus-trees.patch} (95%)
 rename patches/server/{0899-ItemStack-damage-API.patch => 0900-ItemStack-damage-API.patch} (95%)
 rename patches/server/{0900-Friction-API.patch => 0901-Friction-API.patch} (93%)
 rename patches/server/{0901-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0902-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0902-Fix-player-kick-on-shutdown.patch => 0903-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0903-Sync-offhand-slot-in-menus.patch => 0904-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0904-Player-Entity-Tracking-Events.patch => 0905-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0905-Limit-pet-look-distance.patch => 0906-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0906-Properly-resend-entities.patch => 0907-Properly-resend-entities.patch} (100%)
 rename patches/server/{0907-Fixes-and-additions-to-the-SpawnReason-API.patch => 0908-Fixes-and-additions-to-the-SpawnReason-API.patch} (98%)
 rename patches/server/{0908-fix-Instruments.patch => 0909-fix-Instruments.patch} (100%)
 rename patches/server/{0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0911-Add-BlockLockCheckEvent.patch => 0912-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0912-Add-Sneaking-API-for-Entities.patch => 0913-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0913-Improve-logging-and-errors.patch => 0914-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0914-Improve-PortalEvents.patch => 0915-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0915-Add-config-option-for-spider-worldborder-climbing.patch => 0916-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0916-Add-missing-SpigotConfig-logCommands-check.patch => 0917-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0918-Flying-Fall-Damage.patch => 0919-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0921-config-for-disabling-entity-tag-tags.patch => 0922-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0922-Use-single-player-info-update-packet-on-join.patch => 0923-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0923-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0924-Correctly-shrink-items-during-EntityResurrectEvent.patch} (95%)
 rename patches/server/{0924-Win-Screen-API.patch => 0925-Win-Screen-API.patch} (100%)
 rename patches/server/{0925-Remove-CraftItemStack-setAmount-null-assignment.patch => 0926-Remove-CraftItemStack-setAmount-null-assignment.patch} (93%)
 rename patches/server/{0926-Fix-force-opening-enchantment-tables.patch => 0927-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0927-Add-Entity-Body-Yaw-API.patch => 0928-Add-Entity-Body-Yaw-API.patch} (93%)
 rename patches/server/{0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0929-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0930-Update-the-flag-when-a-captured-block-state-is-outda.patch} (83%)
 rename patches/server/{0930-Add-EntityFertilizeEggEvent.patch => 0931-Add-EntityFertilizeEggEvent.patch} (98%)
 rename patches/server/{0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0933-Correctly-handle-ArmorStand-invisibility.patch => 0934-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0934-Fix-advancement-triggers-for-entity-damage.patch => 0935-Fix-advancement-triggers-for-entity-damage.patch} (97%)
 rename patches/server/{0935-Fix-text-display-error-on-spawn.patch => 0936-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0936-Fix-certain-inventories-returning-null-Locations.patch => 0937-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0937-Add-Shearable-API.patch => 0938-Add-Shearable-API.patch} (100%)
 rename patches/server/{0938-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0939-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch => 0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch} (100%)
 rename patches/server/{0940-Optimize-Hoppers.patch => 0941-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0941-Fix-beehives-generating-from-using-bonemeal.patch => 0942-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0943-Treat-sequence-violations-like-they-should-be.patch => 0944-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0944-remove-duplicate-animate-packet-for-records.patch => 0945-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0945-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0946-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0947-Use-array-for-gamerule-storage.patch => 0948-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0948-Fix-a-couple-of-upstream-bed-issues.patch => 0949-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0949-Fix-demo-flag-not-enabling-demo-mode.patch => 0950-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0950-Add-Mob-Experience-reward-API.patch => 0951-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0951-Break-redstone-on-top-of-trap-doors-early.patch => 0952-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0952-Fix-DamageCause-for-Falling-Blocks.patch => 0953-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0954-More-accurate-isInOpenWater-impl.patch => 0955-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0956-Optimise-recalcBlockCounts-for-empty-sections.patch => 0957-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0957-Fix-destroying-beehive-without-any-players-nearby-th.patch => 0958-Fix-destroying-beehive-without-any-players-nearby-th.patch} (100%)
 rename patches/server/{0958-Expand-PlayerItemMendEvent.patch => 0959-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0959-Refresh-ProjectileSource-for-projectiles.patch => 0960-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0960-Add-transient-modifier-API.patch => 0961-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0961-Fix-block-place-logic.patch => 0962-Fix-block-place-logic.patch} (96%)
 rename patches/server/{0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0963-Ignore-inline-definitions-of-trim-material-pattern.patch => 0964-Ignore-inline-definitions-of-trim-material-pattern.patch} (100%)
 rename patches/server/{0964-Call-BlockGrowEvent-for-missing-blocks.patch => 0965-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0966-fix-MapLike-spam-for-missing-key-selector.patch => 0967-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0967-Fix-sniffer-removeExploredLocation.patch => 0968-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0968-Add-method-to-remove-all-active-potion-effects.patch => 0969-Add-method-to-remove-all-active-potion-effects.patch} (91%)
 rename patches/server/{0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0970-Folia-scheduler-and-owned-region-API.patch => 0971-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0972-Properly-Cancel-Usable-Items.patch => 0973-Properly-Cancel-Usable-Items.patch} (97%)
 rename patches/server/{0973-Add-event-for-player-editing-sign.patch => 0974-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0974-Only-tick-item-frames-if-players-can-see-it.patch => 0975-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0975-Improve-command-function-perm-level-checks.patch => 0976-Improve-command-function-perm-level-checks.patch} (100%)
 rename patches/server/{0976-Add-option-to-disable-block-updates.patch => 0977-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0977-Call-missing-BlockDispenseEvent.patch => 0978-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0978-Don-t-load-chunks-for-supporting-block-checks.patch => 0979-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0979-Optimize-player-lookups-for-beacons.patch => 0980-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0980-Add-Sign-getInteractableSideFor.patch => 0981-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0981-Array-backed-synched-entity-data.patch => 0982-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0982-fix-item-meta-for-tadpole-buckets.patch => 0983-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0983-Suppress-Item-Meta-Validation-Checks.patch => 0984-Suppress-Item-Meta-Validation-Checks.patch} (100%)
 rename patches/server/{0984-Fix-BanList-API.patch => 0985-Fix-BanList-API.patch} (100%)
 rename patches/server/{0985-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0986-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0986-Fix-possible-NPE-on-painting-creation.patch => 0987-Fix-possible-NPE-on-painting-creation.patch} (95%)
 rename patches/server/{0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0988-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0989-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0989-Don-t-tick-signs.patch => 0990-Don-t-tick-signs.patch} (100%)
 rename patches/server/{0990-Configurable-Region-Compression-Format.patch => 0991-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0992-Add-whitelist-events.patch => 0993-Add-whitelist-events.patch} (100%)
 rename patches/server/{0993-Implement-PlayerFailMoveEvent.patch => 0994-Implement-PlayerFailMoveEvent.patch} (100%)
 rename patches/server/{0994-Only-erase-allay-memory-on-non-item-targets.patch => 0995-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0995-API-for-updating-recipes-on-clients.patch => 0996-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/server/{0996-Fix-rotation-when-spawning-display-entities.patch => 0997-Fix-rotation-when-spawning-display-entities.patch} (88%)
 rename patches/server/{0997-Only-capture-actual-tree-growth.patch => 0998-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0998-Use-correct-source-for-mushroom-block-spread-event.patch => 0999-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0999-Respect-randomizeData-on-more-entities-when-spawning.patch => 1000-Respect-randomizeData-on-more-entities-when-spawning.patch} (97%)
 rename patches/server/{1000-Use-correct-seed-on-api-world-load.patch => 1001-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 1002-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{1002-Cache-map-ids-on-item-frames.patch => 1003-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{1003-Fix-custom-statistic-criteria-creation.patch => 1004-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{1004-Bandaid-fix-for-Effect.patch => 1005-Bandaid-fix-for-Effect.patch} (100%)
 rename patches/server/{1005-SculkCatalyst-bloom-API.patch => 1006-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{1006-API-for-an-entity-s-scoreboard-name.patch => 1007-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{1007-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{1008-Deprecate-and-replace-methods-with-old-StructureType.patch => 1009-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{1009-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%)
 rename patches/server/{1010-Properly-handle-BlockBreakEvent-isDropItems.patch => 1011-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{1011-Fire-entity-death-event-for-ender-dragon.patch => 1012-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{1012-Configurable-entity-tracking-range-by-Y-coordinate.patch => 1013-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{1013-Add-Listing-API-for-Player.patch => 1014-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{1014-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 1015-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/server/{1015-Fix-NPE-on-Boat-getStatus.patch => 1016-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{1016-Expand-Pose-API.patch => 1017-Expand-Pose-API.patch} (100%)
 rename patches/server/{1017-More-DragonBattle-API.patch => 1018-More-DragonBattle-API.patch} (100%)
 rename patches/server/{1018-Deep-clone-unhandled-nbt-tags.patch => 1019-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{1019-Add-PlayerPickItemEvent.patch => 1020-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/server/{1020-Improve-performance-of-mass-crafts.patch => 1021-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{1021-Allow-trident-custom-damage.patch => 1022-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{1022-Expose-hand-during-BlockCanBuildEvent.patch => 1023-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{1023-Optimize-nearest-structure-border-iteration.patch => 1024-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{1024-Implement-OfflinePlayer-isConnected.patch => 1025-Implement-OfflinePlayer-isConnected.patch} (100%)
 rename patches/server/{1025-Fix-inventory-desync.patch => 1026-Fix-inventory-desync.patch} (100%)
 rename patches/server/{1026-Add-titleOverride-to-InventoryOpenEvent.patch => 1027-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/server/{1027-Configure-sniffer-egg-hatch-time.patch => 1028-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{1028-Do-crystal-portal-proximity-check-before-entity-look.patch => 1029-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 create mode 100644 patches/server/1030-Skip-POI-finding-if-stuck-in-vehicle.patch

diff --git a/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
new file mode 100644
index 0000000000..82cbd0f958
--- /dev/null
+++ b/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -0,0 +1,159 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paul Sauve <paul@technove.co>
+Date: Sat, 31 Oct 2020 18:43:02 -0500
+Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
+
+The BlockGetter#clip method is very wasteful in both allocations,
+and in logic. While EntityLiving#hasLineOfSight provides static
+parameters for collisions with blocks and fluids, the method still does
+a lot of dynamic checks for both of these, which result in extra work.
+As well, since the fluid collision option is set to NONE, the entire
+fluid collision system is completely unneeded, yet used anyways.
+
+Copyright (C) 2020 Technove LLC
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index d8ecc90465dfc54319d7f2478979e9aaee42f5a2..53e666df97e74bbb8e96207ebc50e3e9acc455de 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3407,7 +3407,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+             Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
+             Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
+ 
+-            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
++            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
+         }
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
+index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc12120d66af3d 100644
+--- a/src/main/java/net/minecraft/world/level/BlockGetter.java
++++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
+@@ -68,6 +68,19 @@ public interface BlockGetter extends LevelHeightAccessor {
+         });
+     }
+ 
++    // Paper start - Broken down variant of the method below, used by Level#clipDirect
++    @Nullable
++    default BlockHitResult.Type clipDirect(Vec3 start, Vec3 end, BlockPos pos, BlockState state, net.minecraft.world.phys.shapes.CollisionContext collisionContext) {
++        if (state.isAir()) {
++            return null;
++        }
++
++        final VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(state, this, pos, collisionContext);
++        final BlockHitResult hitResult = this.clipWithInteractionOverride(start, end, pos, voxelshape, state);
++        return hitResult == null ? null : hitResult.getType();
++    }
++    // Paper end
++
+     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
+     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
+             BlockState iblockdata = this.getBlockState(blockposition);
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 809f7db469583ea90fbb165cf180dc87055c6105..37d5abf5a18b90695d1cea9e365c764e93b918bf 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -283,6 +283,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         return null;
+     }
+ 
++    // Paper start - Broken down method of raytracing for EntityLiving#hasLineOfSight, replaces BlockGetter#clip(CollisionContext)
++    public net.minecraft.world.phys.BlockHitResult.Type clipDirect(Vec3 start, Vec3 end, net.minecraft.world.phys.shapes.CollisionContext collisionContext) {
++        // most of this code comes from BlockGetter#clip(CollisionContext, BiFunction, Function), but removes the needless functions
++        if (start.equals(end)) {
++            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
++        }
++
++        final double endX = Mth.lerp(-1.0E-7D, end.x, start.x);
++        final double endY = Mth.lerp(-1.0E-7D, end.y, start.y);
++        final double endZ = Mth.lerp(-1.0E-7D, end.z, start.z);
++
++        final double startX = Mth.lerp(-1.0E-7D, start.x, end.x);
++        final double startY = Mth.lerp(-1.0E-7D, start.y, end.y);
++        final double startZ = Mth.lerp(-1.0E-7D, start.z, end.z);
++
++        int currentX = Mth.floor(startX);
++        int currentY = Mth.floor(startY);
++        int currentZ = Mth.floor(startZ);
++
++        final BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ);
++
++        LevelChunk chunk = this.getChunkIfLoaded(currentBlock);
++        if (chunk == null) {
++            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
++        }
++
++        final net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.clipDirect(start, end, currentBlock, chunk.getBlockState(currentBlock), collisionContext);
++        if (initialCheck != null) {
++            return initialCheck;
++        }
++
++        final double diffX = endX - startX;
++        final double diffY = endY - startY;
++        final double diffZ = endZ - startZ;
++
++        final int xDirection = Mth.sign(diffX);
++        final int yDirection = Mth.sign(diffY);
++        final int zDirection = Mth.sign(diffZ);
++
++        final double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX;
++        final double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY;
++        final double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ;
++
++        double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX));
++        double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY));
++        double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ));
++
++        net.minecraft.world.phys.BlockHitResult.Type result;
++
++        do {
++            if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) {
++                return net.minecraft.world.phys.BlockHitResult.Type.MISS;
++            }
++
++            if (normalizedXDirection < normalizedYDirection) {
++                if (normalizedXDirection < normalizedZDirection) {
++                    currentX += xDirection;
++                    normalizedXDirection += normalizedX;
++                } else {
++                    currentZ += zDirection;
++                    normalizedZDirection += normalizedZ;
++                }
++            } else if (normalizedYDirection < normalizedZDirection) {
++                currentY += yDirection;
++                normalizedYDirection += normalizedY;
++            } else {
++                currentZ += zDirection;
++                normalizedZDirection += normalizedZ;
++            }
++
++            currentBlock.set(currentX, currentY, currentZ);
++            if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) {
++                chunk = this.getChunkIfLoaded(currentBlock);
++                if (chunk == null) {
++                    return net.minecraft.world.phys.BlockHitResult.Type.MISS;
++                }
++            }
++            result = this.clipDirect(start, end, currentBlock, chunk.getBlockState(currentBlock), collisionContext);
++        } while (result == null);
++
++        return result;
++    }
++    // Paper end
++
+     public boolean isInWorldBounds(BlockPos pos) {
+         return !this.isOutsideBuildHeight(pos) && Level.isInWorldBoundsHorizontal(pos);
+     }
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 96%
rename from patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index d2add6dbf5..b91f931e34 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d8ecc90465dfc54319d7f2478979e9aaee42f5a2..45a93601ff9ec79db0ceefb92eecfc974a775aef 100644
+index 53e666df97e74bbb8e96207ebc50e3e9acc455de..8435d0c62c716d4cce5d8b512d8a42658f774876 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -794,7 +794,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/server/0075-Use-a-Shared-Random-for-Entities.patch
similarity index 97%
rename from patches/server/0074-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0075-Use-a-Shared-Random-for-Entities.patch
index dd7a17617a..853ede754b 100644
--- a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0075-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 52cb6a57f73749ebebba12a05be56ae923249e5a..c47f727695112010163d6635550f0c5dd5b853f6 100644
+index 2d37f4da83282e3430353e01c756a0d952150360..2f15c9df59ebfbe7619e190b8d6ef1fe122809f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 100%
rename from patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 97%
rename from patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index a403500673..c4ac943504 100644
--- a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -29,11 +29,11 @@ index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c8624935
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 809f7db469583ea90fbb165cf180dc87055c6105..e5194f0650af2bce8aac24e34752b21015b92d4e 100644
+index 37d5abf5a18b90695d1cea9e365c764e93b918bf..5502d037279ba876f5e4c6728cc678f128bce9d4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -284,7 +284,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     }
+@@ -368,7 +368,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     // Paper end
  
      public boolean isInWorldBounds(BlockPos pos) {
 -        return !this.isOutsideBuildHeight(pos) && Level.isInWorldBoundsHorizontal(pos);
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 96%
rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 8ee08884de..2610a8d585 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -30,10 +30,10 @@ index 5cde98b0225799bccdb84ce6b6cf06b904d5986c..699fc5f11efa8240723854cd2e91877b
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e5194f0650af2bce8aac24e34752b21015b92d4e..127f4e98e11a57eb3dddbc8efdb0aa33fda37924 100644
+index 5502d037279ba876f5e4c6728cc678f128bce9d4..ba7760b0b478c6f24dcbaa64919a4766e107a720 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -496,7 +496,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -580,7 +580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/server/0081-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0080-EntityPathfindEvent.patch
rename to patches/server/0081-EntityPathfindEvent.patch
diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0085-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/server/0085-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/server/0087-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0086-Optimize-DataBits.patch
rename to patches/server/0087-Optimize-DataBits.patch
diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0089-Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/0088-Configurable-Player-Collision.patch
rename to patches/server/0089-Configurable-Player-Collision.patch
diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/server/0091-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0090-Configurable-RCON-IP-address.patch
rename to patches/server/0091-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
index 76c6502425..b9027c44fd 100644
--- a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 45a93601ff9ec79db0ceefb92eecfc974a775aef..c6a30c7558f444318eb4c913a0efdad48878653a 100644
+index 8435d0c62c716d4cce5d8b512d8a42658f774876..d7c437dc575a06e1cdf7b393acaeee6007424687 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1291,10 +1291,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 100%
rename from patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/server/0098-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0097-System-property-for-disabling-watchdoge.patch
rename to patches/server/0098-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/server/0099-Async-GameProfileCache-saving.patch
similarity index 97%
rename from patches/server/0098-Async-GameProfileCache-saving.patch
rename to patches/server/0099-Async-GameProfileCache-saving.patch
index 672588a1c4..da597e2959 100644
--- a/patches/server/0098-Async-GameProfileCache-saving.patch
+++ b/patches/server/0099-Async-GameProfileCache-saving.patch
@@ -18,7 +18,7 @@ index 0ee486f807d7c44e2252c4c744e29b506d916d9c..b5ededfb23980abca01ef25207cca95a
          // Spigot end
          io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2c2d492fdfafb1d2e4e962e6818bd9d7466347d5..131de2ca246cfbe4cb253e74cb05a73efbbcca73 100644
+index 6f543665b5ed42eaec6a410fa11f5a38da707110..52c2333afdb3748ffdbcc58ae7629aa2c4b49b74 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
similarity index 97%
rename from patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
index 1dc79976a1..d394724541 100644
--- a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 7bcf878cbb10f4d99e9693532d02b87350da3b06..71219297a175ff9549a258985043df3ce7545ae6 100644
+index c6660cc77dfa3c3750b6b4dde5617f00c9de1e0a..ae3d1077b42fb288938a8a65471f00b3f52cb18f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -70,7 +70,7 @@ public class ServerEntity {
diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 97%
rename from patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
index fa633042b6..fe713d2a98 100644
--- a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 127f4e98e11a57eb3dddbc8efdb0aa33fda37924..df194067094dd89423251207e62f477db6546264 100644
+index ba7760b0b478c6f24dcbaa64919a4766e107a720..0c6384c6332babf8e517503c2e9b21a9d6e2ed88 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/server/0102-Add-server-name-parameter.patch
similarity index 90%
rename from patches/server/0101-Add-server-name-parameter.patch
rename to patches/server/0102-Add-server-name-parameter.patch
index 1f3f4ef7b9..1a54487255 100644
--- a/patches/server/0101-Add-server-name-parameter.patch
+++ b/patches/server/0102-Add-server-name-parameter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a20eaa9b1d030ccd7e1fc49df47acee46f4e7e20..b96652b7bcad07c39a81858c1a2c285efbf67905 100644
+index 268192b06592eaa56a454e0f02b2d848f766d9ac..4646911b65129d49b2398c7d86f2d6aa9213fe97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -166,6 +166,14 @@ public class Main {
diff --git a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
similarity index 97%
rename from patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
rename to patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index 87410a6096..62bd25a960 100644
--- a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
+++ b/patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
@@ -20,7 +20,7 @@ index 29798faa9cc9aead40e3329307dc63cb7bf838b6..27f99f9ce39aac0bae5e9a7b34fd6383
                      double deltaZ = this.getZ() - player.getZ();
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index e23347faf763f22301136a013034367ac847c35b..4576c96f85fe5a614a78e53926dfbc2705618423 100644
+index 8d3f3987f2a6816752bdb2e477338d6dbdd6b7b7..c23f05f0d951e0036fe2cf524989747fe236730b 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -271,7 +271,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from patches/server/0107-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0108-Configurable-packet-in-spam-threshold.patch
index 3691d66528..7c36138c34 100644
--- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae66a8a222bc27986bab0f7896e0eacfd6044b31..a73395c9c599f4f83738672a925e2852ca784cf7 100644
+index 39f2db938edad3db6fa83d9f8431a28176d4011a..ed558935e53c3cc5c58e14786cbbd809401ddb81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1600,13 +1600,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/server/0109-Configurable-flying-kick-messages.patch
similarity index 95%
rename from patches/server/0108-Configurable-flying-kick-messages.patch
rename to patches/server/0109-Configurable-flying-kick-messages.patch
index 3f30166732..e0cf8d0941 100644
--- a/patches/server/0108-Configurable-flying-kick-messages.patch
+++ b/patches/server/0109-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a73395c9c599f4f83738672a925e2852ca784cf7..631eaf856daa09151e62e192296ba143213d6f29 100644
+index ed558935e53c3cc5c58e14786cbbd809401ddb81..683c7fea13705ef78a4fd86f148428bb33956421 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -357,7 +357,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0109-Add-EntityZapEvent.patch
rename to patches/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
rename to patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/server/0112-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0111-Cache-user-authenticator-threads.patch
rename to patches/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0114-Add-ProjectileCollideEvent.patch
rename to patches/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 86%
rename from patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index f906bf9e98..94ecd47c94 100644
--- a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index df194067094dd89423251207e62f477db6546264..0a419c98db5f6bb6935e88b640f74c6ec0c5503c 100644
+index 0c6384c6332babf8e517503c2e9b21a9d6e2ed88..7b681914b7f9e7fb6d2ea607e0d63ca7024a7ec3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -343,6 +343,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -427,6 +427,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return chunk == null ? null : chunk.getFluidState(blockposition);
      }
  
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-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0121-String-based-Action-Bar-API.patch
similarity index 96%
rename from patches/server/0120-String-based-Action-Bar-API.patch
rename to patches/server/0121-String-based-Action-Bar-API.patch
index 2d13d5e023..a20532c90e 100644
--- a/patches/server/0120-String-based-Action-Bar-API.patch
+++ b/patches/server/0121-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 875784e3d1d89c8fd5e4e3f9cec2e37c93e17570..bef8c20e784244acf17128a68adfe5612812a612 100644
+index a6d9dcf8487c63a0469f5fec27bef131b444942a..4cc5ddcf8cf141f023ac45812c0ce26aa2937716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -340,6 +340,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0122-Properly-fix-item-duplication-bug.patch
similarity index 94%
rename from patches/server/0121-Properly-fix-item-duplication-bug.patch
rename to patches/server/0122-Properly-fix-item-duplication-bug.patch
index e10c4ce75c..aeadcbabfd 100644
--- a/patches/server/0121-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0122-Properly-fix-item-duplication-bug.patch
@@ -19,7 +19,7 @@ index 9e182c4cdf54c9ca7701660df72052d5c8936a55..5c855a15f7847ca37c263755f643eeb1
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 512129382123d0c06eb308a98a9ee1b268e3b486..c7870a1a81f9c2d84066a39d2606c96f4e4df0bf 100644
+index 683c7fea13705ef78a4fd86f148428bb33956421..27ba015a10abea7e120f32565120c34a99b8d55b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3161,7 +3161,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0123-Firework-API-s.patch
similarity index 100%
rename from patches/server/0122-Firework-API-s.patch
rename to patches/server/0123-Firework-API-s.patch
diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0123-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 94%
rename from patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
index b44c7c10aa..c778d9c272 100644
--- a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0a419c98db5f6bb6935e88b640f74c6ec0c5503c..92aa1428e723b377c12bfd20cd1e6b4242ad1261 100644
+index 7b681914b7f9e7fb6d2ea607e0d63ca7024a7ec3..7cfcbc1e38f5e9145c827dfe26299277a3f14cee 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -116,7 +116,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -20,7 +20,7 @@ index 0a419c98db5f6bb6935e88b640f74c6ec0c5503c..92aa1428e723b377c12bfd20cd1e6b42
      private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
      private boolean tickingBlockEntities;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4a3593f24fc844a6a8b1b6c28ad2dc9c609c29ad..04a12be27ea3f7b8c0dd2bb2c8f4f0a4b90de1b2 100644
+index b3dfa35bc41191883814c78693a0d958ff3bf19b..d348ca56ae452dc80d5dabe874d9f8d72970fc4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -154,6 +154,56 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0126-Enforce-Sync-Player-Saves.patch
similarity index 92%
rename from patches/server/0125-Enforce-Sync-Player-Saves.patch
rename to patches/server/0126-Enforce-Sync-Player-Saves.patch
index ec18713f40..d19cbd3de8 100644
--- a/patches/server/0125-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0126-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 66b1a4593f9c96dbf7e098411f89dbacd6baf4ba..0eceacb8b58339820a515c59d978239bc5be0731 100644
+index 7901a8e3659be05d901fd5140e025392ffa0c27c..cf110171ba47051eab94c0195eb155b685a25dca 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1069,11 +1069,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 93b1b52f6e..6aada0b49d 100644
--- a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -133,7 +133,7 @@ index 9dffdfe5bbd0517e9a2c6a6770eea07b43ef9b33..6de7fcccb6da757185a38b79b3a22821
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c6a30c7558f444318eb4c913a0efdad48878653a..eac1baba1714a9cbfd27170b491788f254a73223 100644
+index d7c437dc575a06e1cdf7b393acaeee6007424687..01b9635e71a55f29e565fc095cc53f102945423d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1759,7 +1759,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0127-Cap-Entity-Collisions.patch b/patches/server/0128-Cap-Entity-Collisions.patch
similarity index 91%
rename from patches/server/0127-Cap-Entity-Collisions.patch
rename to patches/server/0128-Cap-Entity-Collisions.patch
index 6a1bdac3d0..87bea46a76 100644
--- a/patches/server/0127-Cap-Entity-Collisions.patch
+++ b/patches/server/0128-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5436ec263b56d0601432b46708025b725898b894..019f02d4c0f44155ae248fa04403a174fde65e51 100644
+index 069fe5df02806103c9bbef396c2e39ca3be90101..ca46bea3799e1bc962debe742ea75f4d7f4ab771 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -387,6 +387,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index 5436ec263b56d0601432b46708025b725898b894..019f02d4c0f44155ae248fa04403a174
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index eac1baba1714a9cbfd27170b491788f254a73223..39c69fa6d164b1bcad97a9410953c8998e415d3c 100644
+index 01b9635e71a55f29e565fc095cc53f102945423d..0470329b43afd4e8c5e033666d1c5f8f0a03fe6a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3317,8 +3317,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0129-Do-not-let-armorstands-drown.patch b/patches/server/0130-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0129-Do-not-let-armorstands-drown.patch
rename to patches/server/0130-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 96%
rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 08e8aee95b..b5bded6025 100644
--- a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 12ce6ef8163fa46c1f5bc1f88011cd862b8bad89..42994574854cae3ca288c8ab7698a95a44693314 100644
+index 27ba015a10abea7e120f32565120c34a99b8d55b..79ec73cbd1c44ec0ec5c6fff3c70501051a9ba42 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2331,6 +2331,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index 5cea2d8fd8..b0bb45c2e6 100644
--- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -311,7 +311,7 @@ index 5abde8722e22e074d4ef44956f7bb5344441e174..bb1280569181e8e3acb78ef622b4d2f9
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 131de2ca246cfbe4cb253e74cb05a73efbbcca73..72639f33b6503faede1ec0df48d7c6a88b7eb82f 100644
+index 52c2333afdb3748ffdbcc58ae7629aa2c4b49b74..97df17a1636ac1ba765a8e486cfbb46bfac9ee6c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0135-Item-canEntityPickup.patch
rename to patches/server/0136-Item-canEntityPickup.patch
diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0138-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/server/0140-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/0139-Add-UnknownCommandEvent.patch
rename to patches/server/0140-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch
similarity index 99%
rename from patches/server/0140-Basic-PlayerProfile-API.patch
rename to patches/server/0141-Basic-PlayerProfile-API.patch
index af141e73ea..d8ae0a7a9b 100644
--- a/patches/server/0140-Basic-PlayerProfile-API.patch
+++ b/patches/server/0141-Basic-PlayerProfile-API.patch
@@ -565,7 +565,7 @@ index 0000000000000000000000000000000000000000..7ac27392a8647ef7d0dc78efe78703e9
 +    @NotNull GameProfile buildGameProfile();
 +}
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 5e17a83df2f3606aff375fe054266d03f9a0b3b6..5448dce87bb5934d4192ce2eb0b99a7b8e1f1ecc 100644
+index dc2ab968ed010289125ac08f0a9ea85af6f6e8bb..82a1a87822e3fc323b92e1aa30ddb0cdb351d89c 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -1,5 +1,7 @@
diff --git a/patches/server/0141-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0141-Shoulder-Entities-Release-API.patch
rename to patches/server/0142-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0142-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0142-Profile-Lookup-Events.patch
rename to patches/server/0143-Profile-Lookup-Events.patch
diff --git a/patches/server/0143-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0143-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0144-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/server/0144-Entity-fromMobSpawner.patch
rename to patches/server/0145-Entity-fromMobSpawner.patch
diff --git a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0146-Implement-ensureServerConversions-API.patch b/patches/server/0147-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0146-Implement-ensureServerConversions-API.patch
rename to patches/server/0147-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0147-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0147-Implement-getI18NDisplayName.patch
rename to patches/server/0148-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0148-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/0148-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0149-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0149-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0149-Fix-this-stupid-bullshit.patch
rename to patches/server/0150-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0150-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch
similarity index 93%
rename from patches/server/0150-LivingEntity-setKiller.patch
rename to patches/server/0151-LivingEntity-setKiller.patch
index 51eb216ef5..1fba960977 100644
--- a/patches/server/0150-LivingEntity-setKiller.patch
+++ b/patches/server/0151-LivingEntity-setKiller.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] LivingEntity#setKiller
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 96095cc107d161cad7401725eb70f08203deac9a..303b066aa9dcdb82e7f67160e8ac901374138465 100644
+index bba6bce470a11c792bb2edc2171021437e2c9704..24d13be4a5a6cd9d8d9f46c089fd23baa6da954d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -365,6 +365,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 7043be25ac..c3ba0ffb39 100644
--- a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4e682e084a7f653ccb90756bab884499861f9060..9013a7218ddf3919e5cddd745d03c73d1b6480ae 100644
+index df0c787a6e3cff522dc540aab3986692b4fc4cc3..6e7f341c6ad07152eeeb51b4cb9c237a94fac89b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
diff --git a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0157-Add-PlayerJumpEvent.patch
similarity index 96%
rename from patches/server/0156-Add-PlayerJumpEvent.patch
rename to patches/server/0157-Add-PlayerJumpEvent.patch
index cfc42eb3af..2c03360f02 100644
--- a/patches/server/0156-Add-PlayerJumpEvent.patch
+++ b/patches/server/0157-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 42994574854cae3ca288c8ab7698a95a44693314..79769e770e04f0852fabed7dc7367e87bd5be310 100644
+index 79ec73cbd1c44ec0ec5c6fff3c70501051a9ba42..cf1d8913d74e2e1c1b8d6be53cdea4873cd2ee10 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1294,7 +1294,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
similarity index 95%
rename from patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
index 36a00a4423..d079322b2c 100644
--- a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/server/0158-handle-ServerboundKeepAlivePacket-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 1f52d3cdb63319b0fe7aa29c34f502f4368646c2..9fdde607ee51da69371cce114c15074beb2d611a 100644
+index cf1d8913d74e2e1c1b8d6be53cdea4873cd2ee10..8a331d8a440455b0d49ba0b8bb65184fba13c43a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3120,14 +3120,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
index e0c54ccb61..399395b776 100644
--- a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 77d7f070cce1a47e41b5d4f5a1cc8c778352a126..a3b610cb1ed97a635677bc46ccdf0463
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bef8c20e784244acf17128a68adfe5612812a612..1adad65a3a9a547a4383cc0caa21a6445d072200 100644
+index 4cc5ddcf8cf141f023ac45812c0ce26aa2937716..07049ca56e610755bfc41c6094be87f5f88bd671 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -286,6 +286,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from patches/server/0159-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0160-revert-serverside-behavior-of-keepalives.patch
index ac989d98a2..f861148081 100644
--- a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0160-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 924f520702723b3f44ac990f6222102119d16e9c..31bbd7f9db45f73e34b3cddcf4e66ccd034a1d10 100644
+index 8a331d8a440455b0d49ba0b8bb65184fba13c43a..bc5c661394d5c64f9d50a615583ff7eb646534db 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -261,7 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0162-Add-PlayerArmorChangeEvent.patch
similarity index 98%
rename from patches/server/0161-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0162-Add-PlayerArmorChangeEvent.patch
index 0cb8c79fe1..f40e40b0a5 100644
--- a/patches/server/0161-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0162-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 39c69fa6d164b1bcad97a9410953c8998e415d3c..b2dc7a83d475c0fcdaec8d1e11bf5bdaac39acdf 100644
+index 0470329b43afd4e8c5e033666d1c5f8f0a03fe6a..021f3f81746a6e986c8899aa4b28ef87a67bed44 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/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 88%
rename from patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index b68fa8a909..169d912a4b 100644
--- a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 92aa1428e723b377c12bfd20cd1e6b4242ad1261..79e23503b7082633de654f04575b8323ea887e44 100644
+index 7cfcbc1e38f5e9145c827dfe26299277a3f14cee..22dab285bbcea77d04a8625b025f054c625cadd4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -721,6 +721,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -805,6 +805,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.blockEntityTickers.iterator();
          int tilesThisCycle = 0;
@@ -17,7 +17,7 @@ index 92aa1428e723b377c12bfd20cd1e6b4242ad1261..79e23503b7082633de654f04575b8323
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
-@@ -728,7 +730,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -812,7 +814,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity == null) {
                  this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
                  tilesThisCycle--;
@@ -25,7 +25,7 @@ index 92aa1428e723b377c12bfd20cd1e6b4242ad1261..79e23503b7082633de654f04575b8323
                  continue;
              }
              // Spigot end
-@@ -736,12 +737,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -820,12 +821,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity.isRemoved()) {
                  // Spigot start
                  tilesThisCycle--;
diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 92%
rename from patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
index 2b736ff336..c5f6827d65 100644
--- a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 79e23503b7082633de654f04575b8323ea887e44..b282f32c95b23b69156970d76171772218b87bc7 100644
+index 22dab285bbcea77d04a8625b025f054c625cadd4..ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -30,7 +30,7 @@ index 79e23503b7082633de654f04575b8323ea887e44..b282f32c95b23b69156970d761717722
      public Map<BlockPos, BlockEntity> capturedTileEntities = new HashMap<>();
      public List<ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
-@@ -385,7 +385,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -469,7 +469,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -39,7 +39,7 @@ index 79e23503b7082633de654f04575b8323ea887e44..b282f32c95b23b69156970d761717722
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
-@@ -405,7 +405,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -489,7 +489,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit start - capture blockstates
              boolean captured = false;
              if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
@@ -49,7 +49,7 @@ index 79e23503b7082633de654f04575b8323ea887e44..b282f32c95b23b69156970d761717722
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
                  captured = true;
              }
-@@ -611,7 +612,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -695,7 +696,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public BlockState getBlockState(BlockPos pos) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0167-AsyncTabCompleteEvent.patch
similarity index 99%
rename from patches/server/0166-AsyncTabCompleteEvent.patch
rename to patches/server/0167-AsyncTabCompleteEvent.patch
index bc02f2631c..82d1169940 100644
--- a/patches/server/0166-AsyncTabCompleteEvent.patch
+++ b/patches/server/0167-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 31bbd7f9db45f73e34b3cddcf4e66ccd034a1d10..e97e0ea9c44a959c17849eac3fcecf4eff04d275 100644
+index bc5c661394d5c64f9d50a615583ff7eb646534db..74adfbde6e4635390a29f8e9155fa61a30631055 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -790,12 +790,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0168-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0167-PlayerPickupExperienceEvent.patch
rename to patches/server/0168-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
similarity index 96%
rename from patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
index 353ed12fb2..aa023fd0ef 100644
--- a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1adad65a3a9a547a4383cc0caa21a6445d072200..063150563e35a3eeb6999f1b5b34de3f60318f66 100644
+index 07049ca56e610755bfc41c6094be87f5f88bd671..d65866df71add5da89de3bfb3bd3d12ac59a0c87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1538,7 +1538,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 98%
rename from patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
index 5a63f111ca..f74c580eae 100644
--- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index b0687dcf8af84af627b67e7fbb68170a2fd28da0..5cb151a7d89c7281b03f24c5f79afb7e
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6051ad00973c80ad3478e2ff9063c268489f358b..dda3b911fcaa294ec7b8e9d696880fcb8325f69c 100644
+index 5c855a15f7847ca37c263755f643eeb1fd79668b..3842caf61e388aa65b3a18c587480a7dabb8341b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0172-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0171-PreCreatureSpawnEvent.patch
rename to patches/server/0172-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0173-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0172-Fill-Profile-Property-Events.patch
rename to patches/server/0173-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0174-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0175-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0176-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0175-Extend-Player-Interact-cancellation.patch
rename to patches/server/0176-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0177-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0176-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0177-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0182-Player.setPlayerProfile-API.patch
similarity index 98%
rename from patches/server/0181-Player.setPlayerProfile-API.patch
rename to patches/server/0182-Player.setPlayerProfile-API.patch
index 64fb8011a9..b5e949057a 100644
--- a/patches/server/0181-Player.setPlayerProfile-API.patch
+++ b/patches/server/0182-Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e97e0ea9c44a959c17849eac3fcecf4eff04d275..3580ce27843ab4e379360e2f63c8783e66384956 100644
+index 74adfbde6e4635390a29f8e9155fa61a30631055..a1b26e5a2b100bbfa4dcca6573720f3b891759dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1540,7 +1540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -55,7 +55,7 @@ index b17fe83bcd7bde44ee8c1f872fffa8bf40707c50..aac78c13361b19efa7b43a0c95458390
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 063150563e35a3eeb6999f1b5b34de3f60318f66..699413ec5f26f3ff175f8032357e334b97bb8f94 100644
+index d65866df71add5da89de3bfb3bd3d12ac59a0c87..d24d1b02851c81755ee56e14d0defecb6b2632e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -269,11 +269,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0183-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0182-getPlayerUniqueId-API.patch
rename to patches/server/0183-getPlayerUniqueId-API.patch
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0183-Improved-Async-Task-Scheduler.patch
rename to patches/server/0184-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0187-Flag-to-disable-the-channel-limit.patch
similarity index 95%
rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0187-Flag-to-disable-the-channel-limit.patch
index c3a26d5f35..6cf06e726e 100644
--- a/patches/server/0186-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0187-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 699413ec5f26f3ff175f8032357e334b97bb8f94..d8ec0ee64f0d322caa2fc9bf0c3680e6e6481a18 100644
+index d24d1b02851c81755ee56e14d0defecb6b2632e5..91eb7f4fb65fcaa4c953f9567971df243387816a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -192,6 +192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0188-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0189-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0189-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0189-EndermanEscapeEvent.patch
rename to patches/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0190-Enderman.teleportRandomly.patch
rename to patches/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 066ac570cb..4a917ed814 100644
--- a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 8b26e90c0e7affb23fe8f92d757fe3a690b858ec..ccd426d1b8511bf8edab0e7f2b04f127c8767f4d 100644
+index 5bd28e1f475aeadaa626a4e9e9e2a1b3a28675f4..148ea4089c4f67894b28e21e961a661a2d291925 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -203,9 +203,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/server/0196-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0195-EndermanAttackPlayerEvent.patch
rename to patches/server/0196-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/server/0197-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0196-WitchConsumePotionEvent.patch
rename to patches/server/0197-WitchConsumePotionEvent.patch
diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/server/0198-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0197-WitchThrowPotionEvent.patch
rename to patches/server/0198-WitchThrowPotionEvent.patch
diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/server/0200-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0199-WitchReadyPotionEvent.patch
rename to patches/server/0200-WitchReadyPotionEvent.patch
diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/server/0201-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0201-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0204-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0203-Fix-CraftEntity-hashCode.patch
rename to patches/server/0204-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0207-Make-shield-blocking-delay-configurable.patch
similarity index 96%
rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0207-Make-shield-blocking-delay-configurable.patch
index 3fa09e2eb9..9a4251afba 100644
--- a/patches/server/0206-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0207-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b2dc7a83d475c0fcdaec8d1e11bf5bdaac39acdf..de63f8883ae2786030cb9e5a5fb72fadffe133ee 100644
+index 021f3f81746a6e986c8899aa4b28ef87a67bed44..9e4b430c8d3ed6538e8b2549ee3f61b9e0d98c42 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3750,12 +3750,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/server/0208-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0207-Improve-EntityShootBowEvent.patch
rename to patches/server/0208-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/server/0209-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0208-PlayerReadyArrowEvent.patch
rename to patches/server/0209-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
similarity index 98%
rename from patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
rename to patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index 1b0928f576..b679b5fe16 100644
--- a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 841bcf08ae46911537f9567a450b130d2f6fbc59..a12509461dd5b35ebae5eecde4a870b6f263c4d5 100644
+index 4c8ad4e6ed90d5ba25100abfd2f334a3d1e46288..427c5ff03bc5ae9469f979f106e3eed513d01536 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1894,8 +1894,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -33,7 +33,7 @@ index 841bcf08ae46911537f9567a450b130d2f6fbc59..a12509461dd5b35ebae5eecde4a870b6
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index de63f8883ae2786030cb9e5a5fb72fadffe133ee..fee4567b670ceda5e1004957567ad8f99adad3f3 100644
+index 9e4b430c8d3ed6538e8b2549ee3f61b9e0d98c42..fe14ebe86ce2bc5835e51c7bbe56a5d69fa02bea 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1484,7 +1484,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/server/0211-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0210-Expand-Explosions-API.patch
rename to patches/server/0211-Expand-Explosions-API.patch
diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0213-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0212-RangedEntity-API.patch
rename to patches/server/0213-RangedEntity-API.patch
diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 92%
rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
index 31b5023020..b5936e7476 100644
--- a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 077a3085045333551e67145e010c5074a35d1f9c..bf405efcd44b9d6fdc838d722d67ff7f78ceedce 100644
+index c1c89d93f437850f6126ca69664dc9a3c5feac96..43a82ed953dd5d19f1c1c55b011b0cedef5ad7a2 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -106,6 +106,10 @@ public class EndDragonFight {
diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/server/0215-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0215-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
similarity index 99%
rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0216-InventoryCloseEvent-Reason-API.patch
index 8af7db6aa2..d8909dadb3 100644
--- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
@@ -75,7 +75,7 @@ index 3842caf61e388aa65b3a18c587480a7dabb8341b..bd7b8ede44a5971b034ffb75fbddbadd
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba1d752653b3a8111a96012a51f2e4d8048c3516..d9f392623ec3527e1e481d890748c5eeb3e3fadb 100644
+index a1b26e5a2b100bbfa4dcca6573720f3b891759dd..d3834e0bb41d26a0e5f36084409d795f94a53cff 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -222,6 +222,7 @@ import org.bukkit.event.inventory.ClickType;
diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0217-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0216-Vex-get-setSummoner-API.patch
rename to patches/server/0217-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 3155759687..92de025acc 100644
--- a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b87df5c04ad2c9abe112cccfde27c04f7e3a78e7..189f6f41a09b09ba9fa2131857918898086256ba 100644
+index d3834e0bb41d26a0e5f36084409d795f94a53cff..4649d9bd175f88f1caade1618d08ae64a8aaa649 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2563,6 +2563,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 94%
rename from patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 995d381829..4f68f2dd3e 100644
--- a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9013a7218ddf3919e5cddd745d03c73d1b6480ae..cfaa988f64c4b994b918e2f947c58dd8743a9dfb 100644
+index 6e7f341c6ad07152eeeb51b4cb9c237a94fac89b..e6d66db4b5fe4385c34329897c8277e4bc814129 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -38,6 +38,7 @@ dependencies {
diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from patches/server/0219-add-more-information-to-Entity.toString.patch
rename to patches/server/0220-add-more-information-to-Entity.toString.patch
index 57fb7c2c24..e25c8946af 100644
--- a/patches/server/0219-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0220-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 a12509461dd5b35ebae5eecde4a870b6f263c4d5..0f4d3a883fe54b102d1b2dc696a02310493b7f00 100644
+index 427c5ff03bc5ae9469f979f106e3eed513d01536..c1ece46bea30faf550040b7a3f36c8966029aa9d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3137,7 +3137,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0220-EnderDragon-Events.patch
rename to patches/server/0221-EnderDragon-Events.patch
diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0221-PlayerElytraBoostEvent.patch
rename to patches/server/0222-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0222-PlayerLaunchProjectileEvent.patch
rename to patches/server/0223-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0223-Improve-BlockPosition-inlining.patch
rename to patches/server/0224-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 91%
rename from patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 65a69a3a11..0484963de5 100644
--- a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,10 +17,10 @@ index 68ac3ffae5d800bde3c5b5163a52768a43bb5963..a59381646031a1a99c98c8c6ad9de7ef
  
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b282f32c95b23b69156970d76171772218b87bc7..1beff41c02fb4c22b5474da7c514be2f50f16055 100644
+index ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6..0b02ba70956ea1352ea8e67957b3789408b67f6b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -765,6 +765,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -849,6 +849,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
diff --git a/patches/server/0225-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from patches/server/0225-Vanished-players-don-t-have-rights.patch
rename to patches/server/0226-Vanished-players-don-t-have-rights.patch
index cfe16400a9..0d7fdc9929 100644
--- a/patches/server/0225-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0226-Vanished-players-don-t-have-rights.patch
@@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..e68b7a1b03783e4f9de24c5ae8773fc3
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1beff41c02fb4c22b5474da7c514be2f50f16055..8a53284a5846b25864352e18a5e6b2deb8d3e3ed 100644
+index 0b02ba70956ea1352ea8e67957b3789408b67f6b..8320bece16dfa339e33801e43ff2f297bc876001 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -273,6 +273,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0226-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0227-SkeletonHorse-Additions.patch
rename to patches/server/0228-SkeletonHorse-Additions.patch
diff --git a/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0229-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0230-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0230-AnvilDamageEvent.patch
rename to patches/server/0231-AnvilDamageEvent.patch
diff --git a/patches/server/0231-Add-TNTPrimeEvent.patch b/patches/server/0232-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0231-Add-TNTPrimeEvent.patch
rename to patches/server/0232-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
index fe3c7bc317..d4f532099c 100644
--- a/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 189f6f41a09b09ba9fa2131857918898086256ba..739239c9ee8c3642a6d96238c11dddf7a848e4fd 100644
+index 4649d9bd175f88f1caade1618d08ae64a8aaa649..196d19fe999372f4cda56e2ad55ec263be685f79 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -267,6 +267,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0233-Fix-NBT-type-issues.patch b/patches/server/0234-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0233-Fix-NBT-type-issues.patch
rename to patches/server/0234-Fix-NBT-type-issues.patch
diff --git a/patches/server/0234-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0234-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 97%
rename from patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index d101f1770b..c123c8c1a9 100644
--- a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -72,7 +72,7 @@ index 33ce550ea68d4862e0966ed827200cf426909d85..6b157b362cffedae26133fc0f0af1094
              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 0f4d3a883fe54b102d1b2dc696a02310493b7f00..0cddb74633ebcf85f019c6015767719a07f1c9a7 100644
+index c1ece46bea30faf550040b7a3f36c8966029aa9d..7ca89b1a5bbeefd8622cb0f93e0235abcefbc033 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -238,6 +238,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -85,7 +85,7 @@ index 0f4d3a883fe54b102d1b2dc696a02310493b7f00..0cddb74633ebcf85f019c6015767719a
          if (this.bukkitEntity == null) {
              this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8a53284a5846b25864352e18a5e6b2deb8d3e3ed..75df40ab76f9813cf08682f06fd3ae499c70b4ba 100644
+index 8320bece16dfa339e33801e43ff2f297bc876001..18234d71eba7d2a2874f3e5c9628d82970acc033 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -150,6 +150,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
index 8fc8763dbc..91a75ae620 100644
--- a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -21,7 +21,7 @@ index 9f59ef54ef6f6af8b0fef8567d8cfbefb64bc29f..d05f776204a720084a583c6d6dfe4793
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
              lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 72639f33b6503faede1ec0df48d7c6a88b7eb82f..7533dc44c782b4e31b3823458998bc72739e94b2 100644
+index 97df17a1636ac1ba765a8e486cfbb46bfac9ee6c..980088f5af3d44d47b94ecde52cdc5f9277f6329 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -197,6 +197,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
similarity index 95%
rename from patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
index bacb924338..7bcb3c77c8 100644
--- a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7533dc44c782b4e31b3823458998bc72739e94b2..ea0d1faa0e27cd7a1b793ad93ba2ef1e6bf71628 100644
+index 980088f5af3d44d47b94ecde52cdc5f9277f6329..ff908bab7d83e5c049d86a0c8ea235ca3c69936b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0240-Optimize-BlockPosition-helper-methods.patch b/patches/server/0241-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0240-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0241-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0242-Slime-Pathfinder-Events.patch b/patches/server/0243-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0242-Slime-Pathfinder-Events.patch
rename to patches/server/0243-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0244-Optimize-CraftBlockData-Creation.patch b/patches/server/0245-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0244-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0245-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0245-Optimize-MappedRegistry.patch b/patches/server/0246-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0245-Optimize-MappedRegistry.patch
rename to patches/server/0246-Optimize-MappedRegistry.patch
diff --git a/patches/server/0246-Add-PhantomPreSpawnEvent.patch b/patches/server/0247-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0246-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0247-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0247-Add-More-Creeper-API.patch b/patches/server/0248-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0247-Add-More-Creeper-API.patch
rename to patches/server/0248-Add-More-Creeper-API.patch
diff --git a/patches/server/0248-Inventory-removeItemAnySlot.patch b/patches/server/0249-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0248-Inventory-removeItemAnySlot.patch
rename to patches/server/0249-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 94%
rename from patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
index d6743543f7..c1cf0d9a91 100644
--- a/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fee4567b670ceda5e1004957567ad8f99adad3f3..48f8a506326b8978f6d933e008c3c7464e61d9d9 100644
+index fe14ebe86ce2bc5835e51c7bbe56a5d69fa02bea..c995c8ac6785e5f8951013f3a37127573351c2c7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3771,6 +3771,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -30,7 +30,7 @@ index fee4567b670ceda5e1004957567ad8f99adad3f3..48f8a506326b8978f6d933e008c3c746
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2139f10af54f0a2e2101145fa7b21a3b1af4b9a2..adb1aced3e1a0bd3a4f286b5708fc020b1c35c4c 100644
+index f79118891ca87515cbcea8b798e434cb57bbe494..0707329670292551d966afe30818f17d079fcb3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -201,6 +201,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0252-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch
similarity index 99%
rename from patches/server/0252-Improve-death-events.patch
rename to patches/server/0253-Improve-death-events.patch
index 5dac0b7d16..4eb97720e1 100644
--- a/patches/server/0252-Improve-death-events.patch
+++ b/patches/server/0253-Improve-death-events.patch
@@ -70,7 +70,7 @@ index bd7b8ede44a5971b034ffb75fbddbadda8f42702..41e0b2826bae59e48fef7e35caeb3ce6
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 48f8a506326b8978f6d933e008c3c7464e61d9d9..ddc21b706136459cbcb9a29750a6806a6fa5329e 100644
+index c995c8ac6785e5f8951013f3a37127573351c2c7..d84375984c67a8ad2790efc1c584f7e2f995633e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0254-Mob-Pathfinding-API.patch b/patches/server/0255-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0254-Mob-Pathfinding-API.patch
rename to patches/server/0255-Mob-Pathfinding-API.patch
diff --git a/patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 82476d43bf..e96efae246 100644
--- a/patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 5338e0e1a67925da0c386735a545bb31096afbb1..029835914c3c88811684e90b29bfed83191b3b3f 100644
+index 6ac513d3044fab1cb1ca0b0c7e85ff871d49d572..2503d4691e47083a9d99a38c4ed3f50a2374821a 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -170,9 +170,9 @@ public final class NaturalSpawner {
diff --git a/patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0259-Honor-EntityAgeable.ageLock.patch b/patches/server/0260-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0259-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0260-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0260-Configurable-connection-throttle-kick-message.patch b/patches/server/0261-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0260-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0261-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0262-Hook-into-CB-plugin-rewrites.patch b/patches/server/0263-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0262-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0263-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0263-PreSpawnerSpawnEvent.patch b/patches/server/0264-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0263-PreSpawnerSpawnEvent.patch
rename to patches/server/0264-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0264-Add-LivingEntity-getTargetEntity.patch b/patches/server/0265-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from patches/server/0264-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0265-Add-LivingEntity-getTargetEntity.patch
index 008ec7fdd5..20032d4569 100644
--- a/patches/server/0264-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0265-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ddc21b706136459cbcb9a29750a6806a6fa5329e..6aa312638e3b934fc9b107daea66664ddc776700 100644
+index d84375984c67a8ad2790efc1c584f7e2f995633e..f800b3e4debcd141a75de9e6025a87e81cee083c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
@@ -56,7 +56,7 @@ index ddc21b706136459cbcb9a29750a6806a6fa5329e..6aa312638e3b934fc9b107daea66664d
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index adb1aced3e1a0bd3a4f286b5708fc020b1c35c4c..5a721647807f455e73e862a1244520787ebee76d 100644
+index 0707329670292551d966afe30818f17d079fcb3b..2913ad431b09a75106115257729960f8ba1637f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0265-Add-sun-related-API.patch b/patches/server/0266-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0265-Add-sun-related-API.patch
rename to patches/server/0266-Add-sun-related-API.patch
diff --git a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 98%
rename from patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
index fdd8e89ff1..4deee947dd 100644
--- a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 5448dce87bb5934d4192ce2eb0b99a7b8e1f1ecc..b842ff5c28c202a079cf6f626c6f7aca3ef1acf3 100644
+index 82a1a87822e3fc323b92e1aa30ddb0cdb351d89c..c69088a2ec374b2d236fec61e267f42afa2967b1 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -18,6 +18,8 @@ import net.minecraft.core.BlockPos;
diff --git a/patches/server/0267-Turtle-API.patch b/patches/server/0268-Turtle-API.patch
similarity index 100%
rename from patches/server/0267-Turtle-API.patch
rename to patches/server/0268-Turtle-API.patch
diff --git a/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 96%
rename from patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
index f172bc5382..64867b6055 100644
--- a/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0282a467268564c55d9d6e10b0602f952b2ca7ae..c151777af839ef237c004a1dd1cd0e849e402f5b 100644
+index 41e0b2826bae59e48fef7e35caeb3ce6e46031ea..040f93638d3c71fb8f23301b8903e7cfda980e5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1978,6 +1978,19 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0270-Add-more-Witch-API.patch b/patches/server/0271-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0270-Add-more-Witch-API.patch
rename to patches/server/0271-Add-more-Witch-API.patch
diff --git a/patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
index d9f09b7bcb..01899e41b8 100644
--- a/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 739239c9ee8c3642a6d96238c11dddf7a848e4fd..67e423040969a175983dba5bacd675f6b57e88ff 100644
+index 196d19fe999372f4cda56e2ad55ec263be685f79..e94389567ccca1565d1430220022548d52283e38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -569,9 +569,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0273-Reset-players-airTicks-on-respawn.patch b/patches/server/0274-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from patches/server/0273-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0274-Reset-players-airTicks-on-respawn.patch
index 7c1b5965f6..4733f523e6 100644
--- a/patches/server/0273-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0274-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c151777af839ef237c004a1dd1cd0e849e402f5b..56a9cfdb9dc24bd5bda2818b9f59d1a31dfe9265 100644
+index 040f93638d3c71fb8f23301b8903e7cfda980e5d..715314de7a92a8e06f82c6bff5fe74e3b23044f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2454,6 +2454,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0276-Optimize-World-Time-Updates.patch b/patches/server/0277-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0276-Optimize-World-Time-Updates.patch
rename to patches/server/0277-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0277-Restore-custom-InventoryHolder-support.patch b/patches/server/0278-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0277-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0278-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0278-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0278-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0279-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0279-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 98%
rename from patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
index 90e9493175..0210a1f908 100644
--- a/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 7adf7d1248680e591638298f13f5ae88788f5e4c..bdf11a98614c9c12d3112f437651be81
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 67e423040969a175983dba5bacd675f6b57e88ff..f3a786825b76dc70170ec57db1b3baa9c5033c34 100644
+index e94389567ccca1565d1430220022548d52283e38..a81d98c6220de281a7e6b495c6f0122770a32990 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1664,6 +1664,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0281-Make-the-default-permission-message-configurable.patch b/patches/server/0282-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0281-Make-the-default-permission-message-configurable.patch
rename to patches/server/0282-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
similarity index 90%
rename from patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
index 695829c82b..72d6ebc434 100644
--- a/patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
@@ -7,10 +7,10 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..89aadd30c1973cf45c5c05fd12462e04b0b05c97 100644
+index 3b31a1927aaed7fffc1b4f4bcefc12120d66af3d..24073d4d7c45d501c2baec2d8c8b49f60fb76e65 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -70,7 +70,15 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -83,7 +83,15 @@ public interface BlockGetter extends LevelHeightAccessor {
  
      // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
diff --git a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0283-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0284-force-entity-dismount-during-teleportation.patch b/patches/server/0285-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from patches/server/0284-force-entity-dismount-during-teleportation.patch
rename to patches/server/0285-force-entity-dismount-during-teleportation.patch
index 82749f4f35..bc38c348cf 100644
--- a/patches/server/0284-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0285-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0cddb74633ebcf85f019c6015767719a07f1c9a7..7507ab77d379533196e27aaf1ad28632292bffb2 100644
+index 7ca89b1a5bbeefd8622cb0f93e0235abcefbc033..dee47ff97e4f08154866d7628c3588a42f9892b9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2564,11 +2564,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -72,7 +72,7 @@ index 0cddb74633ebcf85f019c6015767719a07f1c9a7..7507ab77d379533196e27aaf1ad28632
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6aa312638e3b934fc9b107daea66664ddc776700..0275c797aafa4778573b8e283319a5eb2c697105 100644
+index f800b3e4debcd141a75de9e6025a87e81cee083c..965c5724eb4927f017123c791c4a721c59b6db15 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3438,9 +3438,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0285-Add-more-Zombie-API.patch b/patches/server/0286-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0285-Add-more-Zombie-API.patch
rename to patches/server/0286-Add-more-Zombie-API.patch
diff --git a/patches/server/0286-Book-Size-Limits.patch b/patches/server/0287-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0286-Book-Size-Limits.patch
rename to patches/server/0287-Book-Size-Limits.patch
index d00222c92d..a796772a1f 100644
--- a/patches/server/0286-Book-Size-Limits.patch
+++ b/patches/server/0287-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f3a786825b76dc70170ec57db1b3baa9c5033c34..d85f9e09820594edcf984cede8711069566ec5fe 100644
+index a81d98c6220de281a7e6b495c6f0122770a32990..1c2985463fbfe9c4c8357519019bab4fa82d5194 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1126,6 +1126,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0287-Add-PlayerConnectionCloseEvent.patch b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0287-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0288-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0288-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0288-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 98%
rename from patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index b329087acb..d97961b72f 100644
--- a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index aac78c13361b19efa7b43a0c95458390f1ba8340..f572a74b85df36a6da76b78ec29d8072
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b07c040649ff249d1c49d94e466121a32df94dd0..ccf0902ef1770fc2d2cdd5f6c4316fd3fe7746e5 100644
+index cd1937e8b66f6229ab1dc39576641a67aa127bc9..24f9f3e5de710dd294d9d9ab054f9c84d1798be7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -193,6 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index b3fddc1ffa..562f71d37c 100644
--- a/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7cb4f05a8d23a60a89dd4934ccb99bb89bb44141..a2b26c5dc446b896736cf478b282e0ee8845dda7 100644
+index b59ad5f0cc12082db0c885b29d88c526a4029e22..d29e13aa7bbfbab54f8a3d73279891d65e957d7e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1644,6 +1644,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0292-BlockDestroyEvent.patch b/patches/server/0293-BlockDestroyEvent.patch
similarity index 93%
rename from patches/server/0292-BlockDestroyEvent.patch
rename to patches/server/0293-BlockDestroyEvent.patch
index 7700987e74..8aeb73edf5 100644
--- a/patches/server/0292-BlockDestroyEvent.patch
+++ b/patches/server/0293-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 75df40ab76f9813cf08682f06fd3ae499c70b4ba..216f7a69284827085d7635c69c550ce09d9d756c 100644
+index 18234d71eba7d2a2874f3e5c9628d82970acc033..b3a0f4dd651dda29d2064b629da67378c00a6a78 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index 75df40ab76f9813cf08682f06fd3ae499c70b4ba..216f7a69284827085d7635c69c550ce0
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
-@@ -582,8 +583,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -666,8 +667,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0293-Async-command-map-building.patch b/patches/server/0294-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0293-Async-command-map-building.patch
rename to patches/server/0294-Async-command-map-building.patch
diff --git a/patches/server/0294-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
similarity index 99%
rename from patches/server/0294-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0295-Implement-Brigadier-Mojang-API.patch
index 988c33f366..b704b089cf 100644
--- a/patches/server/0294-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
@@ -131,7 +131,7 @@ index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d85f9e09820594edcf984cede8711069566ec5fe..9a134d65ebb4d004cc1a92fd832975e307667a03 100644
+index 1c2985463fbfe9c4c8357519019bab4fa82d5194..f286a4f65aba9706a1c7a6100b4045e6b47dc059 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -842,8 +842,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0295-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0296-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0295-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0296-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0296-Limit-Client-Sign-length-more.patch b/patches/server/0297-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from patches/server/0296-Limit-Client-Sign-length-more.patch
rename to patches/server/0297-Limit-Client-Sign-length-more.patch
index 42d082e619..00e07463ba 100644
--- a/patches/server/0296-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0297-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b59c97776a3843a94afff58261238246ac364c5..a979050827dc28c19b650c873a768580d1c14252 100644
+index f286a4f65aba9706a1c7a6100b4045e6b47dc059..40955343416bc8db479d13cb7b86246b6ea4f276 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -302,6 +302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0300-Entity-getEntitySpawnReason.patch b/patches/server/0301-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/server/0300-Entity-getEntitySpawnReason.patch
rename to patches/server/0301-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0301-Fire-event-on-GS4-query.patch b/patches/server/0302-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0301-Fire-event-on-GS4-query.patch
rename to patches/server/0302-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0302-Implement-PlayerPostRespawnEvent.patch b/patches/server/0303-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0302-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0303-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0304-Server-Tick-Events.patch b/patches/server/0305-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0304-Server-Tick-Events.patch
rename to patches/server/0305-Server-Tick-Events.patch
diff --git a/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
index 7960fa6a1c..b016f03eaf 100644
--- a/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a2b26c5dc446b896736cf478b282e0ee8845dda7..488b32a6c09102ccc041dde9ed7294a90753c1bb 100644
+index d29e13aa7bbfbab54f8a3d73279891d65e957d7e..3ebb5cd3a0068cf6716ebe6fa6f4f4f4a1d58d08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -847,6 +847,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch
similarity index 90%
rename from patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch
index 36522080ad..b58f0b7c64 100644
--- a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 216f7a69284827085d7635c69c550ce09d9d756c..0fcc864953b35389e01868ed6b80be2132e24f94 100644
+index b3a0f4dd651dda29d2064b629da67378c00a6a78..b1111e644f860f40a944fd43ac900db4615a1c5e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -898,9 +898,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -982,9 +982,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0307-Add-Heightmap-API.patch b/patches/server/0308-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0307-Add-Heightmap-API.patch
rename to patches/server/0308-Add-Heightmap-API.patch
diff --git a/patches/server/0308-Mob-Spawner-API-Enhancements.patch b/patches/server/0309-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from patches/server/0308-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0309-Mob-Spawner-API-Enhancements.patch
index 3ad0d3508d..7d927ec0a8 100644
--- a/patches/server/0308-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0309-Mob-Spawner-API-Enhancements.patch
@@ -69,7 +69,7 @@ index a08c2dee792da1a54005f0a65a9eefabc7bc7c60..369298dfd437c1c83801f3d4ba63484e
          nbt.putShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
          nbt.putShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index ecafc548c96f01763f4f189c11de04636fb3968e..cc4c9c2db57d0727a898a90951d6d7e39fc5b190 100644
+index f733df6d082561bf80a3fcfaaab1731985213324..e2d0937f8609c1f65eff94a1cdae8c80b6347cc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -134,4 +134,28 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<SpawnerBlockEnti
diff --git a/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
index 3e9ba415e3..3f28cb9b92 100644
--- a/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9358e4edc7265326c0ec32e60f596b0f61ee690f..7f63eef706021e05ddb01ddc38ce672e5b0a5531 100644
+index 40955343416bc8db479d13cb7b86246b6ea4f276..92a0ab42abdb0d6bd77bb2141a900a0f3d4630c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -517,7 +517,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0311-Implement-CraftBlockSoundGroup.patch b/patches/server/0312-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0311-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0312-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0314-Expose-the-internal-current-tick.patch b/patches/server/0315-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0314-Expose-the-internal-current-tick.patch
rename to patches/server/0315-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch b/patches/server/0316-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0315-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0316-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 94%
rename from patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 06ff32b94e..47ca599bec 100644
--- a/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 029835914c3c88811684e90b29bfed83191b3b3f..f22e1d76586980edb2dc962b4d55ad7a542b61a7 100644
+index 2503d4691e47083a9d99a38c4ed3f50a2374821a..23d53f3fd524cc4d827dc95ab95367702a110a05 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -88,6 +88,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0318-Configurable-projectile-relative-velocity.patch b/patches/server/0319-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0318-Configurable-projectile-relative-velocity.patch
rename to patches/server/0319-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0319-offset-item-frame-ticking.patch b/patches/server/0320-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0319-offset-item-frame-ticking.patch
rename to patches/server/0320-offset-item-frame-ticking.patch
diff --git a/patches/server/0320-Fix-MC-158900.patch b/patches/server/0321-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0320-Fix-MC-158900.patch
rename to patches/server/0321-Fix-MC-158900.patch
diff --git a/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
index 744743c59a..f9a465a007 100644
--- a/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0275c797aafa4778573b8e283319a5eb2c697105..e673b4777a0b2bbc56b3183a44fc7e470a81e388 100644
+index 965c5724eb4927f017123c791c4a721c59b6db15..53abf88143206eee03f372cf6471fbfbe519496d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3651,9 +3651,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0322-Dont-send-unnecessary-sign-update.patch b/patches/server/0323-Dont-send-unnecessary-sign-update.patch
similarity index 92%
rename from patches/server/0322-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0323-Dont-send-unnecessary-sign-update.patch
index 99b917ef46..f05192e925 100644
--- a/patches/server/0322-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0323-Dont-send-unnecessary-sign-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index ccd426d1b8511bf8edab0e7f2b04f127c8767f4d..4b9d326458fb3029f19e58b77ef0156b26b9c88b 100644
+index 148ea4089c4f67894b28e21e961a661a2d291925..7e4fbf3cd57c74b61cec75c02eb35756a243de17 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -186,6 +186,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0323-Add-option-to-disable-pillager-patrols.patch b/patches/server/0324-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0323-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0324-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0324-Flat-bedrock-generator-settings.patch b/patches/server/0325-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0324-Flat-bedrock-generator-settings.patch
rename to patches/server/0325-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0327-Duplicate-UUID-Resolve-Option.patch b/patches/server/0328-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0327-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0328-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
index a542430630..a3a59d2c10 100644
--- a/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 488b32a6c09102ccc041dde9ed7294a90753c1bb..5ea537b98fc038798ada3d60570aaf908571d6b9 100644
+index 3ebb5cd3a0068cf6716ebe6fa6f4f4f4a1d58d08..4aea5b2e36f5cd6f9b076f9a225a391211ec0c25 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -967,7 +967,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0332-Fix-items-not-falling-correctly.patch b/patches/server/0333-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0332-Fix-items-not-falling-correctly.patch
rename to patches/server/0333-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0336-Entity-Activation-Range-2.0.patch b/patches/server/0337-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0336-Entity-Activation-Range-2.0.patch
rename to patches/server/0337-Entity-Activation-Range-2.0.patch
index 6684bee7cc..3307f83ebb 100644
--- a/patches/server/0336-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0337-Entity-Activation-Range-2.0.patch
@@ -112,7 +112,7 @@ index 0efc377743e93a0120843cab192753d037e88a73..b12e9da3eebda396769b30f4b7e37a78
          } 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 e8c4d27cd8403776873d8a492a61023d60ad158c..2224b0bd593717656875f391e0717fcb11579d5a 100644
+index 0f40361ebfe64fae828f577529200e40e94b0e05..049df55b07e14b6ea75bfb9aa4de2adb0548305d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -348,7 +348,7 @@ index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0fcc864953b35389e01868ed6b80be2132e24f94..9d1c3859e54af9b42665e7ca2fc50e83e7784148 100644
+index b1111e644f860f40a944fd43ac900db4615a1c5e..9a6ed3aa55f988ed30669fab2a2513741eda399b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -160,6 +160,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0337-Implement-alternative-item-despawn-rate.patch b/patches/server/0338-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0337-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0338-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0338-Lag-compensate-eating.patch b/patches/server/0339-Lag-compensate-eating.patch
similarity index 97%
rename from patches/server/0338-Lag-compensate-eating.patch
rename to patches/server/0339-Lag-compensate-eating.patch
index 72f8f2015a..b5d9357d59 100644
--- a/patches/server/0338-Lag-compensate-eating.patch
+++ b/patches/server/0339-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e673b4777a0b2bbc56b3183a44fc7e470a81e388..2a81303109bb3fd34c9cf5ff9cc9d2cb5c331eb8 100644
+index 53abf88143206eee03f372cf6471fbfbe519496d..1d0d8971675d882a54e5c3eb1315ed53be9338be 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3594,6 +3594,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0339-Tracking-Range-Improvements.patch b/patches/server/0340-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0339-Tracking-Range-Improvements.patch
rename to patches/server/0340-Tracking-Range-Improvements.patch
diff --git a/patches/server/0340-Fix-items-vanishing-through-end-portal.patch b/patches/server/0341-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0340-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0341-Fix-items-vanishing-through-end-portal.patch
index 4c7186ddd0..7dc474e2ad 100644
--- a/patches/server/0340-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0341-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 2224b0bd593717656875f391e0717fcb11579d5a..92d052bd70514fbcce511a6d674cc14901d6d230 100644
+index 049df55b07e14b6ea75bfb9aa4de2adb0548305d..92f96ea37ea73353c17b73721af31c65467dcc0d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3342,6 +3342,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0341-implement-optional-per-player-mob-spawns.patch b/patches/server/0342-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0341-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0342-implement-optional-per-player-mob-spawns.patch
index 629ec01111..40aa6f3911 100644
--- a/patches/server/0341-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0342-implement-optional-per-player-mob-spawns.patch
@@ -362,7 +362,7 @@ index 5cb151a7d89c7281b03f24c5f79afb7edf7cbfea..d9743139d1cb932c6aac56da85f073e4
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5ea537b98fc038798ada3d60570aaf908571d6b9..9e4e2a23891031589a03a5e8dc3e67091acd360b 100644
+index 4aea5b2e36f5cd6f9b076f9a225a391211ec0c25..a1f75dfbe975ff0150cb529266c3c0884c8e2d45 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0342-Anti-Xray.patch b/patches/server/0343-Anti-Xray.patch
similarity index 99%
rename from patches/server/0342-Anti-Xray.patch
rename to patches/server/0343-Anti-Xray.patch
index a77dd1cfb2..cc9e19df42 100644
--- a/patches/server/0342-Anti-Xray.patch
+++ b/patches/server/0343-Anti-Xray.patch
@@ -1170,7 +1170,7 @@ index bdf11a98614c9c12d3112f437651be81d0d9872a..58a1a54b676922ef0862dcab98e7aada
  
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9d1c3859e54af9b42665e7ca2fc50e83e7784148..09a572a054bd4cf1014e11a51caa68c6fa4bb384 100644
+index 9a6ed3aa55f988ed30669fab2a2513741eda399b..7a1886585bd00dc8213ce22130b8b6fea52c5cf6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -175,6 +175,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1198,7 +1198,7 @@ index 9d1c3859e54af9b42665e7ca2fc50e83e7784148..09a572a054bd4cf1014e11a51caa68c6
      }
  
      // Paper start
-@@ -460,6 +462,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -544,6 +546,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit end
  
              BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0, (flags & 1024) == 0); // CraftBukkit custom NO_PLACE flag
diff --git a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0344-Improve-Block-breakNaturally-API.patch b/patches/server/0345-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0344-Improve-Block-breakNaturally-API.patch
rename to patches/server/0345-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0346-Add-debug-for-sync-chunk-loads.patch b/patches/server/0347-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0346-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0347-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0347-Remove-garbage-Java-version-check.patch b/patches/server/0348-Remove-garbage-Java-version-check.patch
similarity index 91%
rename from patches/server/0347-Remove-garbage-Java-version-check.patch
rename to patches/server/0348-Remove-garbage-Java-version-check.patch
index 5dd6961d0f..af5fd56e6c 100644
--- a/patches/server/0347-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0348-Remove-garbage-Java-version-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 65c7b9bd1f8dcbe87f75967f35ac91b6a2016844..1dc2c4552df65c355d8711b2a492c307d29180e3 100644
+index c79afabed432ca9094967ae0e48b04133dc4c51b..77911e26af9ec468c8a0c1fe8161b79c67b2303c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -205,10 +205,6 @@ public class Main {
diff --git a/patches/server/0348-Add-ThrownEggHatchEvent.patch b/patches/server/0349-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0348-Add-ThrownEggHatchEvent.patch
rename to patches/server/0349-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0349-Entity-Jump-API.patch b/patches/server/0350-Entity-Jump-API.patch
similarity index 97%
rename from patches/server/0349-Entity-Jump-API.patch
rename to patches/server/0350-Entity-Jump-API.patch
index 1d0f28d381..cde7320d17 100644
--- a/patches/server/0349-Entity-Jump-API.patch
+++ b/patches/server/0350-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2a81303109bb3fd34c9cf5ff9cc9d2cb5c331eb8..e5bc7ad4f9c3b02dd8a572750ed833b200fbecd4 100644
+index 1d0d8971675d882a54e5c3eb1315ed53be9338be..11e84ea16177f11b834bcf13e9b36985ac4cfd4e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3255,8 +3255,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 96%
rename from patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
index a2072c3144..4d3091a6f7 100644
--- a/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92d052bd70514fbcce511a6d674cc14901d6d230..2249c2a7c9cfad758c8d235347c6c8aff29fae60 100644
+index 92f96ea37ea73353c17b73721af31c65467dcc0d..7d00dc9bd1fe9167e0122395f901a4700c132f61 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -392,6 +392,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0351-Make-the-GUI-graph-fancier.patch b/patches/server/0352-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0351-Make-the-GUI-graph-fancier.patch
rename to patches/server/0352-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0354-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0353-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0354-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0356-Optimise-Chunk-getFluid.patch b/patches/server/0357-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0356-Optimise-Chunk-getFluid.patch
rename to patches/server/0357-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch b/patches/server/0359-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0358-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0359-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0359-Expose-MinecraftServer-isRunning.patch b/patches/server/0360-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0359-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0360-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 27efec7f20..199addcfce 100644
--- a/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9e4e2a23891031589a03a5e8dc3e67091acd360b..0642fbe2e2fa5ab3e0919f71903e6545bd7121fe 100644
+index a1f75dfbe975ff0150cb529266c3c0884c8e2d45..60564b0624eb253443831e1ba1c3f3dcade6b8ef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -244,6 +244,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 95%
rename from patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index eb91c14989..14bcf936a9 100644
--- a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ea0d1faa0e27cd7a1b793ad93ba2ef1e6bf71628..4d7b0646bed201a47a3fee9a540c9a11e2844e09 100644
+index ff908bab7d83e5c049d86a0c8ea235ca3c69936b..56b17a1ce545ec43bf588d4ab438440fb829bc97 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0365-Don-t-tick-dead-players.patch b/patches/server/0366-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0365-Don-t-tick-dead-players.patch
rename to patches/server/0366-Don-t-tick-dead-players.patch
index b84a5ebc65..32deb385d9 100644
--- a/patches/server/0365-Don-t-tick-dead-players.patch
+++ b/patches/server/0366-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0642fbe2e2fa5ab3e0919f71903e6545bd7121fe..2d51abce5d5de66bbf6daaf699931bb9d3afc397 100644
+index 60564b0624eb253443831e1ba1c3f3dcade6b8ef..8be5973f90c7c6959e572072951d61f65f0cd2f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -724,7 +724,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
similarity index 98%
rename from patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
index 5549bc717d..2821f17e10 100644
--- a/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 2848e657209a699b12fc0e1fd2bde54d661f07f0..9c3ab91555f60a1a3cd8a89e883cfbde
              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 2249c2a7c9cfad758c8d235347c6c8aff29fae60..eb17af78a39feb6fca38a0622cbbb86c227c05f1 100644
+index 7d00dc9bd1fe9167e0122395f901a4700c132f61..70d1d664efa323cbb0c07fd5aa746122261b6bfa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -237,6 +237,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
similarity index 96%
rename from patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
index c7c861c0ec..7ef44984be 100644
--- a/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2d51abce5d5de66bbf6daaf699931bb9d3afc397..6ad3b7e7c7808cb40697e2eb6185f431fc431a20 100644
+index 8be5973f90c7c6959e572072951d61f65f0cd2f3..c7d4341642df2fc847e139cf03992b13645afa3e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -377,7 +377,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0370-Improved-Watchdog-Support.patch b/patches/server/0371-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0370-Improved-Watchdog-Support.patch
rename to patches/server/0371-Improved-Watchdog-Support.patch
index e20f0553aa..c0fb8a1b5a 100644
--- a/patches/server/0370-Improved-Watchdog-Support.patch
+++ b/patches/server/0371-Improved-Watchdog-Support.patch
@@ -238,7 +238,7 @@ index 498f06aa1d8b2c20f5bf31d6751f08cf1eb4240f..047562e1df93347f629b529ca0647697
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4d7b0646bed201a47a3fee9a540c9a11e2844e09..a0b85718f5c2334673290090f343ce218639bcbb 100644
+index 56b17a1ce545ec43bf588d4ab438440fb829bc97..ba75c854faed13c60ae5464c4685373b99ef42c2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -295,10 +295,10 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 09a572a054bd4cf1014e11a51caa68c6fa4bb384..fd4de9ace0cce48b7c73bbe1d351db4053915a9a 100644
+index 7a1886585bd00dc8213ce22130b8b6fea52c5cf6..52a44510d0499df56d2ebef0963fe8164eda7301 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -820,6 +820,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -904,6 +904,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0371-Optimize-Pathfinding.patch b/patches/server/0372-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0371-Optimize-Pathfinding.patch
rename to patches/server/0372-Optimize-Pathfinding.patch
diff --git a/patches/server/0372-Reduce-Either-Optional-allocation.patch b/patches/server/0373-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0372-Reduce-Either-Optional-allocation.patch
rename to patches/server/0373-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0374-Prevent-opening-inventories-when-frozen.patch b/patches/server/0375-Prevent-opening-inventories-when-frozen.patch
similarity index 95%
rename from patches/server/0374-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0375-Prevent-opening-inventories-when-frozen.patch
index 93a9721f23..ee7df0a768 100644
--- a/patches/server/0374-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0375-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ad3b7e7c7808cb40697e2eb6185f431fc431a20..65d17836785774d0f196321ba741ffd05a9db36e 100644
+index c7d4341642df2fc847e139cf03992b13645afa3e..0e7f5d780d8c17a68a6d3cf98febad94f63e3f81 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -693,7 +693,7 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 6ad3b7e7c7808cb40697e2eb6185f431fc431a20..65d17836785774d0f196321ba741ffd0
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index ba6105a970381d642cd7955754cc47135207027a..82314358220b064a0f8a29cc1d663cc266c13916 100644
+index 552fb0be2f31bd52a5ae43526d55aa29828f786e..ec7ea1ef632bea761ca8b9603059a12fb72dfa47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -325,7 +325,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 96%
rename from patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
index 4e64237a13..33afba0af3 100644
--- a/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e5bc7ad4f9c3b02dd8a572750ed833b200fbecd4..494fd7da86979b9a584c8c38b495bb4cbdded078 100644
+index 11e84ea16177f11b834bcf13e9b36985ac4cfd4e..fe5995a79929fb46ae5d9d9056993a6e37b670e7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3370,10 +3370,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0376-Implement-Player-Client-Options-API.patch b/patches/server/0377-Implement-Player-Client-Options-API.patch
similarity index 98%
rename from patches/server/0376-Implement-Player-Client-Options-API.patch
rename to patches/server/0377-Implement-Player-Client-Options-API.patch
index b49acbc7ac..62d5e4dfa3 100644
--- a/patches/server/0376-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0377-Implement-Player-Client-Options-API.patch
@@ -116,7 +116,7 @@ index 0e7f5d780d8c17a68a6d3cf98febad94f63e3f81..f4a8491d6b6333030cecee3920da060d
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ad042121278294665ae6659538a12dc84126e2ad..e0096be4b6df931912704c48bf5b99f1d45bb12c 100644
+index 53444591285041a3ca93d5c96a7278bcab952742..2e09a49d52cbd23d3181d41a0540d11a3bd80fca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -602,6 +602,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 6442bd23eb..a1a7e8b6ca 100644
--- a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -43,7 +43,7 @@ index a8c4c7298e127e5b60a3b43ad168976d29901bc5..48586780da5d260894fe59efaa97cb1f
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fd34a2ace2efc819b06674ceab44ff78ec11f805..6dcac005b57234983d0ed05fe825a16c98eb4557 100644
+index f4a8491d6b6333030cecee3920da060d6b96a309..15a70bad66eb2508f58ff184061c2d19e45297e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -267,6 +267,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 93%
rename from patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 28f7bdb42b..a84c2ff4bb 100644
--- a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0380-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 eb17af78a39feb6fca38a0622cbbb86c227c05f1..e1e9bc47e2e666ac5355d3b6a91a1a2dbd46e691 100644
+index 70d1d664efa323cbb0c07fd5aa746122261b6bfa..d7cf9ca3a1002463b09ed709f3003d0528a3ff0b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2319,9 +2319,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
index 472f968350..93cc5b8fc2 100644
--- a/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 494fd7da86979b9a584c8c38b495bb4cbdded078..b0f6fbd6bb18d49d1a637fb08767c7ba13d1cd3b 100644
+index fe5995a79929fb46ae5d9d9056993a6e37b670e7..1cae4bcd7d5d310ead65342af063a4617d24c694 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2162,7 +2162,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 99%
rename from patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index c89c279fdd..f3afba5644 100644
--- a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -80,7 +80,7 @@ index d7cf9ca3a1002463b09ed709f3003d0528a3ff0b..ce4b2ec2ad6138b754ced976521d1c73
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b0f6fbd6bb18d49d1a637fb08767c7ba13d1cd3b..59c82af8f2a9471830c3d5f7a44c817fbabf1acf 100644
+index 1cae4bcd7d5d310ead65342af063a4617d24c694..3ec6243f831330a8096e209a00e0164dea2ef9d0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1678,9 +1678,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0384-Villager-Restocks-API.patch b/patches/server/0385-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0384-Villager-Restocks-API.patch
rename to patches/server/0385-Villager-Restocks-API.patch
diff --git a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 796c20196d..0552ea6414 100644
--- a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f63eef706021e05ddb01ddc38ce672e5b0a5531..2f220a0b42aae276f9fb7a3f4ec5d2890b61af16 100644
+index 92a0ab42abdb0d6bd77bb2141a900a0f3d4630c5..54fbf24915aa614747282c71d3cd07e1dfbd2718 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -969,7 +969,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0386-Expose-game-version.patch b/patches/server/0387-Expose-game-version.patch
similarity index 100%
rename from patches/server/0386-Expose-game-version.patch
rename to patches/server/0387-Expose-game-version.patch
diff --git a/patches/server/0387-Optimize-Voxel-Shape-Merging.patch b/patches/server/0388-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0387-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0388-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 386a76af00..6a3117ce24 100644
--- a/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 645cbf447fd1b77cbd1ae3e35ed47aebbd52e27e..800c70f022aee593ff35f05a86ddeba864567f2d 100644
+index be1fbe64a5145b25c111ba3b6bb35109e77deb9d..2dca21932c5c97a13c77a559400f0d01eba42c34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -26,6 +26,7 @@ public class Main {
diff --git a/patches/server/0389-misc-debugging-dumps.patch b/patches/server/0390-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0389-misc-debugging-dumps.patch
rename to patches/server/0390-misc-debugging-dumps.patch
diff --git a/patches/server/0390-Prevent-teleporting-dead-entities.patch b/patches/server/0391-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from patches/server/0390-Prevent-teleporting-dead-entities.patch
rename to patches/server/0391-Prevent-teleporting-dead-entities.patch
index b71bb4acbf..1ee8d4b487 100644
--- a/patches/server/0390-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0391-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2f220a0b42aae276f9fb7a3f4ec5d2890b61af16..b7c1bc87b91c1056419681a09624efefc924815f 100644
+index 54fbf24915aa614747282c71d3cd07e1dfbd2718..1a4c0347e2977f33efe489b3bbb7047be3132162 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1617,6 +1617,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 0391739528..043a0880af 100644
--- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -524,7 +524,7 @@ index 99d5fd192a4cf1ac2739520a111b8dd854ff2f57..dc3dea801a673462e767ad37268ec77a
  
      protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a0b85718f5c2334673290090f343ce218639bcbb..fff1f35b783bea3c2ea43c5d403ff57d96c2bf86 100644
+index ba75c854faed13c60ae5464c4685373b99ef42c2..a3e839c8166a7fee282a764127d76cf0232e6c38 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -195,6 +195,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0392-Implement-Mob-Goal-API.patch
rename to patches/server/0393-Implement-Mob-Goal-API.patch
index bde7867729..f3e67cfaa9 100644
--- a/patches/server/0392-Implement-Mob-Goal-API.patch
+++ b/patches/server/0393-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e2e7fe74095b83f2ac12f8054dd91b38ffcc32e7..dcfa0d630286e854474854add012138830aa389f 100644
+index 453691f34c400b074699f0f444ac28482837a9f7..a24d682d77682c8421ed1e37be3905b2a5c8aff9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -46,6 +46,7 @@ dependencies {
diff --git a/patches/server/0393-Add-villager-reputation-API.patch b/patches/server/0394-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0393-Add-villager-reputation-API.patch
rename to patches/server/0394-Add-villager-reputation-API.patch
diff --git a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0395-ExperienceOrbMergeEvent.patch b/patches/server/0396-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0395-ExperienceOrbMergeEvent.patch
rename to patches/server/0396-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 92%
rename from patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
index 468af977e3..93d44ac055 100644
--- a/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 65fbc8b10c536f3258a455950263bd97dd6e30e3..6819e9ba64e5083ec37c50c274990311336d7b7f 100644
+index f0457dd3d179dab3e164279f30690058549e530a..5e874253a150bda008d8da29691ddeaad0fee1de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -443,7 +443,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0398-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0397-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0398-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0398-Potential-bed-API.patch b/patches/server/0399-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0398-Potential-bed-API.patch
rename to patches/server/0399-Potential-bed-API.patch
index 7f753c1b92..9cc9c55444 100644
--- a/patches/server/0398-Potential-bed-API.patch
+++ b/patches/server/0399-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 82314358220b064a0f8a29cc1d663cc266c13916..55a3035516552f4d429ae5f36bacb1b4c4d5666c 100644
+index ec7ea1ef632bea761ca8b9603059a12fb72dfa47..63208cf28a7ea005f9f328281676ed113ae23a00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 97%
rename from patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index e511be120e..7162242ade 100644
--- a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,10 +34,10 @@ index 75d827f1eecb24f7ab985bdea2bbf65b8478fc8c..d646660f988994d4fdb05901349c5946
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fd4de9ace0cce48b7c73bbe1d351db4053915a9a..7dc9b87c50590422e9912e4385c9983bcac343b8 100644
+index 52a44510d0499df56d2ebef0963fe8164eda7301..221a1e66814dda35feff9fa9ca0fe54feec335f9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -434,6 +434,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -518,6 +518,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -150,7 +150,7 @@ index 2451bb61e304fbe5cdfd6bbb248575e9e1135075..74f84bfcb1da6186c7a6783512c2fc7b
  
          public boolean isSolidRender(BlockGetter world, BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index 389b63605d416678d35666bbd46e0fa05a02f898..33a6fda1e8f2df61b44f0e3ddda356ffa386f2df 100644
+index ed5210c63d964be7c28f59df315766794ec3ea1f..08325c055b04355089d75031522c7b74d83c6cca 100644
 --- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
 @@ -221,6 +221,13 @@ public class PortalForcer {
diff --git a/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 580c91b235..1d5553e5a4 100644
--- a/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -38,7 +38,7 @@ index 48586780da5d260894fe59efaa97cb1facfe73fe..dadf403ac91887f0fae87889170deb6d
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 71219297a175ff9549a258985043df3ce7545ae6..f578bfa3a2ae7f29999f9e551f687ae820bbbb80 100644
+index ae3d1077b42fb288938a8a65471f00b3f52cb18f..d1bcc1f9816826391b7ba7c79e3b1c2c013933de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -161,7 +161,13 @@ public class ServerEntity {
diff --git a/patches/server/0403-Ensure-safe-gateway-teleport.patch b/patches/server/0404-Ensure-safe-gateway-teleport.patch
similarity index 93%
rename from patches/server/0403-Ensure-safe-gateway-teleport.patch
rename to patches/server/0404-Ensure-safe-gateway-teleport.patch
index 835c71affd..2782768b84 100644
--- a/patches/server/0403-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0404-Ensure-safe-gateway-teleport.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
 
 
 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 d3e2a78f4e562fac7f42687629a4807aec85037f..115553877c222c101bdea0978e1fa6ec8322702e 100644
+index 85914124014b4e6f0a561cf560918af68682b6f5..1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7 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
 @@ -105,7 +105,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0404-Add-option-for-console-having-all-permissions.patch b/patches/server/0405-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0404-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0405-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0406-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0405-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0406-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0406-Maps-shouldn-t-load-chunks.patch b/patches/server/0407-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0406-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0407-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 96%
rename from patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
index 9fe47e47ab..f548e9ad0b 100644
--- a/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 4f6b7ed4809086811f0460544ba2ec0606f0f5da..9abae63e06c1dde9b8434d32bac8798808428d10 100644
+index 4f6b7ed4809086811f0460544ba2ec0606f0f5da..e14967a745c21ff48a88fa0f22cc296a73b43d92 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -412,14 +412,26 @@ public class PistonBaseBlock extends DirectionalBlock {
@@ -66,7 +66,7 @@ index 4f6b7ed4809086811f0460544ba2ec0606f0f5da..9abae63e06c1dde9b8434d32bac87988
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 17a6327ab7b26dfab38881bbc0689b0b25f8f025..30fafbb26a347b73c72b9f5c30da3b01e42b851c 100644
+index 17a6327ab7b26dfab38881bbc0689b0b25f8f025..1ef87580574919796dbba707f44a413ee5c5781b 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 @@ -288,7 +288,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
diff --git a/patches/server/0410-Fix-sand-duping.patch b/patches/server/0411-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0410-Fix-sand-duping.patch
rename to patches/server/0411-Fix-sand-duping.patch
diff --git a/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
index 36409ceb07..d10f83dcba 100644
--- a/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7c1bc87b91c1056419681a09624efefc924815f..7e2f2c503f0af6b63ae496beb7cd9b34e61b16c9 100644
+index 1a4c0347e2977f33efe489b3bbb7047be3132162..2939403b788c3e656cb7b600242db6e3269d90eb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1443,6 +1443,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
index 31e31f918e..4620c65fd0 100644
--- a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
@@ -279,7 +279,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..93dea79180ebaef3ffb6abffd47f0026
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5c1de9671bf823a7f2fa78acfa8f9065d6eb517..c683b5b35ff2bf850283f002c97a28bb6cf223bd 100644
+index ce4b2ec2ad6138b754ced976521d1c73eb4193a8..c99d24008792b07d5e2984261215de944482006b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0415-Improve-Arrow-API.patch b/patches/server/0416-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0415-Improve-Arrow-API.patch
rename to patches/server/0416-Improve-Arrow-API.patch
diff --git a/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 97%
rename from patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 8e1158cd40..1c46676a7e 100644
--- a/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b197d5cc1b6abbeea22d3c941d54421d2e83cccd..45b6fd88d12d1f42164c6149fb8779edda478041 100644
+index 2939403b788c3e656cb7b600242db6e3269d90eb..2203795cdb63398095f9c467cbaf605aa7c7b856 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3117,16 +3117,40 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0418-Add-permission-for-command-blocks.patch b/patches/server/0419-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0418-Add-permission-for-command-blocks.patch
rename to patches/server/0419-Add-permission-for-command-blocks.patch
index 83a241e57c..abaf29b36a 100644
--- a/patches/server/0418-Add-permission-for-command-blocks.patch
+++ b/patches/server/0419-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index 58a1a54b676922ef0862dcab98e7aada5de80311..cf47536a2e37d53406fc9cb3f09095e0
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dbae4102766837af9b173773c3d1a09439a1d606..f7c21abf2a783dc69c7fbe5719b4ca563a9deb65 100644
+index 2203795cdb63398095f9c467cbaf605aa7c7b856..61053ccdcf5e588164f243faa9ef6beda5bf45fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -880,7 +880,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 95%
rename from patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
index a9c848f405..3bbee5196f 100644
--- a/patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0420-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 c683b5b35ff2bf850283f002c97a28bb6cf223bd..a40aa3e70b5d38fb2be4c916fcb6f7fded5e5ccc 100644
+index c99d24008792b07d5e2984261215de944482006b..ffd7e11b16604050e87a6b8aac08948fd3311bd1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 5f1b9a7528..1a35a8573e 100644
--- a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -63,7 +63,7 @@ index 89be3991ef4fb2deb7276c5409cb571a7fb1f821..9c272f7cf8cbd2bbe147e57f7fabe135
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index fff1f35b783bea3c2ea43c5d403ff57d96c2bf86..8f7916aa522fa2a49197d59e63d6e5c3a2d4bf42 100644
+index a3e839c8166a7fee282a764127d76cf0232e6c38..31bdf41a3e914c79e42f85b7f0aef439f35288f1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0421-Paper-dumpitem-command.patch b/patches/server/0422-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0421-Paper-dumpitem-command.patch
rename to patches/server/0422-Paper-dumpitem-command.patch
diff --git a/patches/server/0422-Improve-Legacy-Component-serialization-size.patch b/patches/server/0423-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0422-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0423-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0423-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0424-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0424-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0425-incremental-chunk-and-player-saving.patch b/patches/server/0426-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0425-incremental-chunk-and-player-saving.patch
rename to patches/server/0426-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0426-Support-old-UUID-format-for-NBT.patch b/patches/server/0427-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0426-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0427-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0428-Remove-some-streams-from-structures.patch b/patches/server/0429-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0428-Remove-some-streams-from-structures.patch
rename to patches/server/0429-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0430-Support-components-in-ItemMeta.patch b/patches/server/0431-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0430-Support-components-in-ItemMeta.patch
rename to patches/server/0431-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0432-Add-entity-liquid-API.patch b/patches/server/0433-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0432-Add-entity-liquid-API.patch
rename to patches/server/0433-Add-entity-liquid-API.patch
diff --git a/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0433-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0434-Spawn-player-in-correct-world-on-login.patch b/patches/server/0435-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0434-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0435-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0435-Add-PrepareResultEvent.patch b/patches/server/0436-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0435-Add-PrepareResultEvent.patch
rename to patches/server/0436-Add-PrepareResultEvent.patch
diff --git a/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 91%
rename from patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index cadcfeb56f..be68c732d1 100644
--- a/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 59c82af8f2a9471830c3d5f7a44c817fbabf1acf..5ea6ffe3a2c250ea3f6f7bdd1d17645500d1795f 100644
+index 3ec6243f831330a8096e209a00e0164dea2ef9d0..7b0e6f975ee00be6fc36c22ef586d4f0d4ce06ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3477,7 +3477,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0440-Fix-SPIGOT-5989.patch b/patches/server/0441-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0440-Fix-SPIGOT-5989.patch
rename to patches/server/0441-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0444-Fix-some-rails-connecting-improperly.patch b/patches/server/0445-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0444-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0445-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0447-Brand-support.patch b/patches/server/0448-Brand-support.patch
similarity index 100%
rename from patches/server/0447-Brand-support.patch
rename to patches/server/0448-Brand-support.patch
diff --git a/patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0449-Don-t-require-FACING-data.patch b/patches/server/0450-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0449-Don-t-require-FACING-data.patch
rename to patches/server/0450-Don-t-require-FACING-data.patch
diff --git a/patches/server/0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0451-Add-moon-phase-API.patch b/patches/server/0452-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0451-Add-moon-phase-API.patch
rename to patches/server/0452-Add-moon-phase-API.patch
diff --git a/patches/server/0452-Prevent-headless-pistons-from-being-created.patch b/patches/server/0453-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0452-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0453-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0453-Add-BellRingEvent.patch b/patches/server/0454-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0453-Add-BellRingEvent.patch
rename to patches/server/0454-Add-BellRingEvent.patch
diff --git a/patches/server/0454-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0454-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0455-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0455-Buffer-joins-to-world.patch b/patches/server/0456-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0455-Buffer-joins-to-world.patch
rename to patches/server/0456-Buffer-joins-to-world.patch
diff --git a/patches/server/0456-Eigencraft-redstone-implementation.patch b/patches/server/0457-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0456-Eigencraft-redstone-implementation.patch
rename to patches/server/0457-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0457-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0457-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0458-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0458-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0459-Add-more-Evoker-API.patch b/patches/server/0460-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0459-Add-more-Evoker-API.patch
rename to patches/server/0460-Add-more-Evoker-API.patch
diff --git a/patches/server/0460-Add-methods-to-get-translation-keys.patch b/patches/server/0461-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0460-Add-methods-to-get-translation-keys.patch
rename to patches/server/0461-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0462-Cache-block-data-strings.patch b/patches/server/0463-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0462-Cache-block-data-strings.patch
rename to patches/server/0463-Cache-block-data-strings.patch
diff --git a/patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0469-Entity-isTicking.patch b/patches/server/0470-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0469-Entity-isTicking.patch
rename to patches/server/0470-Entity-isTicking.patch
diff --git a/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 92%
rename from patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 7835fd9104..931bc62c44 100644
--- a/patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -11,7 +11,7 @@ This ensures the crystals/pillars are in expected state when the dragon spawns.
 See #3522
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index bf405efcd44b9d6fdc838d722d67ff7f78ceedce..f39344cb45f3134ef368d7569b24ba68308268db 100644
+index 43a82ed953dd5d19f1c1c55b011b0cedef5ad7a2..3c24c2c7dda04ba05f10c64c785f503dac9585f5 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -467,6 +467,7 @@ public class EndDragonFight {
diff --git a/patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0474-Optimise-getType-calls.patch b/patches/server/0475-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0474-Optimise-getType-calls.patch
rename to patches/server/0475-Optimise-getType-calls.patch
diff --git a/patches/server/0475-Villager-resetOffers.patch b/patches/server/0476-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0475-Villager-resetOffers.patch
rename to patches/server/0476-Villager-resetOffers.patch
diff --git a/patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
index 006d8e60ad..d825fe5c79 100644
--- a/patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7dc9b87c50590422e9912e4385c9983bcac343b8..3548afeef265c21156c1dab90d1758fc47a56b51 100644
+index 221a1e66814dda35feff9fa9ca0fe54feec335f9..1577b7317b85708d39d4171321df785a8107bdb2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0478-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0479-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0478-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0479-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0479-Player-elytra-boost-API.patch b/patches/server/0480-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0479-Player-elytra-boost-API.patch
rename to patches/server/0480-Player-elytra-boost-API.patch
diff --git a/patches/server/0480-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0481-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0480-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0481-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0482-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0482-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0483-Add-ignore-discounts-API.patch b/patches/server/0484-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0483-Add-ignore-discounts-API.patch
rename to patches/server/0484-Add-ignore-discounts-API.patch
diff --git a/patches/server/0484-Toggle-for-removing-existing-dragon.patch b/patches/server/0485-Toggle-for-removing-existing-dragon.patch
similarity index 91%
rename from patches/server/0484-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0485-Toggle-for-removing-existing-dragon.patch
index 5d91962290..1feab0504f 100644
--- a/patches/server/0484-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0485-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index f39344cb45f3134ef368d7569b24ba68308268db..1fad121f0559cf5c40ccbf7290bfb600b17dc219 100644
+index 3c24c2c7dda04ba05f10c64c785f503dac9585f5..774f408b1520646dd32eb7d66e33946a7e1e72df 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -209,7 +209,7 @@ public class EndDragonFight {
diff --git a/patches/server/0485-Fix-client-lag-on-advancement-loading.patch b/patches/server/0486-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0485-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0486-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0486-Item-no-age-no-player-pickup.patch b/patches/server/0487-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0486-Item-no-age-no-player-pickup.patch
rename to patches/server/0487-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0488-Beacon-API-custom-effect-ranges.patch b/patches/server/0489-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0488-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0489-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0489-Add-API-for-quit-reason.patch b/patches/server/0490-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0489-Add-API-for-quit-reason.patch
rename to patches/server/0490-Add-API-for-quit-reason.patch
diff --git a/patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0491-Expose-world-spawn-angle.patch b/patches/server/0492-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0491-Expose-world-spawn-angle.patch
rename to patches/server/0492-Expose-world-spawn-angle.patch
diff --git a/patches/server/0492-Add-Destroy-Speed-API.patch b/patches/server/0493-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0492-Add-Destroy-Speed-API.patch
rename to patches/server/0493-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0494-Add-LivingEntity-clearActiveItem.patch b/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0494-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0495-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0495-Add-PlayerItemCooldownEvent.patch b/patches/server/0496-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0495-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0496-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0497-More-lightning-API.patch b/patches/server/0498-More-lightning-API.patch
similarity index 100%
rename from patches/server/0497-More-lightning-API.patch
rename to patches/server/0498-More-lightning-API.patch
diff --git a/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
index cf434759e9..4e311cc370 100644
--- a/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,7 +45,7 @@ index d15e62da0307728a7c2be191a27f87da1bb29f49..de06ae3e8757c923a6f3f475a34885d2
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5ea6ffe3a2c250ea3f6f7bdd1d17645500d1795f..b9162e3d7ad429b0c18dde43e449e4716da2c4bd 100644
+index 7b0e6f975ee00be6fc36c22ef586d4f0d4ce06ee..e4fd0bc35064e7962c7e43f9d0ee502463a6085f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3398,7 +3398,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -143,7 +143,7 @@ index c2a18a8e52f897bc96227854646e53e4dc189362..1f909082eb123bfe37e1078962ee7d71
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index d204de1793b4e37b18dd7ac705858cdf8bbc6aa0..b978d5fb28ef1472bd890df0229cf7535ead6b00 100644
+index a42f47ba5fd6c075d915c6d9d076aa4d154aeac6..415c6fd01dd871729c054f916702f9f3062c346c 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -160,7 +160,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
diff --git a/patches/server/0499-Added-missing-default-perms-for-commands.patch b/patches/server/0500-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0499-Added-missing-default-perms-for-commands.patch
rename to patches/server/0500-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0500-Add-PlayerShearBlockEvent.patch b/patches/server/0501-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0500-Add-PlayerShearBlockEvent.patch
rename to patches/server/0501-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0502-Limit-recipe-packets.patch b/patches/server/0503-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0502-Limit-recipe-packets.patch
rename to patches/server/0503-Limit-recipe-packets.patch
diff --git a/patches/server/0503-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0504-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0503-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0504-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0504-Player-Chunk-Load-Unload-Events.patch b/patches/server/0505-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0504-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0505-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0506-Expose-LivingEntity-hurt-direction.patch b/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0506-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0507-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0510-Implement-TargetHitEvent.patch b/patches/server/0511-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0510-Implement-TargetHitEvent.patch
rename to patches/server/0511-Implement-TargetHitEvent.patch
diff --git a/patches/server/0511-MC-4-Fix-item-position-desync.patch b/patches/server/0512-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0511-MC-4-Fix-item-position-desync.patch
rename to patches/server/0512-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0512-Additional-Block-Material-API-s.patch b/patches/server/0513-Additional-Block-Material-API-s.patch
similarity index 93%
rename from patches/server/0512-Additional-Block-Material-API-s.patch
rename to patches/server/0513-Additional-Block-Material-API-s.patch
index 5704d47e95..558eead684 100644
--- a/patches/server/0512-Additional-Block-Material-API-s.patch
+++ b/patches/server/0513-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index d035ff8390f2181fb81baec1b0287ead6da0a912..8958a54d1a9d6e9ad6ab09f3a587ba89ae2d817d 100644
+index 2749f81fd74e466fa6b7c1c5f08d8defc5203b3e..5e0f16acbd892f815cc504e03cd186070598b530 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -465,6 +465,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0513-Fix-harming-potion-dupe.patch b/patches/server/0514-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0513-Fix-harming-potion-dupe.patch
rename to patches/server/0514-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0515-Cache-burn-durations.patch b/patches/server/0516-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0515-Cache-burn-durations.patch
rename to patches/server/0516-Cache-burn-durations.patch
diff --git a/patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0520-Zombie-API-breaking-doors.patch b/patches/server/0521-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0520-Zombie-API-breaking-doors.patch
rename to patches/server/0521-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0521-Fix-nerfed-slime-when-splitting.patch b/patches/server/0522-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0521-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0522-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0522-Add-EntityLoadCrossbowEvent.patch b/patches/server/0523-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0522-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0523-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0523-Added-WorldGameRuleChangeEvent.patch b/patches/server/0524-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0523-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0524-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0524-Added-ServerResourcesReloadedEvent.patch b/patches/server/0525-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0524-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0525-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0526-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0526-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0527-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0528-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0527-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0528-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0529-Configurable-door-breaking-difficulty.patch b/patches/server/0530-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0529-Configurable-door-breaking-difficulty.patch
rename to patches/server/0530-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0530-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0531-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0530-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0531-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0531-Remove-stale-POIs.patch b/patches/server/0532-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0531-Remove-stale-POIs.patch
rename to patches/server/0532-Remove-stale-POIs.patch
diff --git a/patches/server/0532-Fix-villager-boat-exploit.patch b/patches/server/0533-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0532-Fix-villager-boat-exploit.patch
rename to patches/server/0533-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0533-Add-sendOpLevel-API.patch b/patches/server/0534-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0533-Add-sendOpLevel-API.patch
rename to patches/server/0534-Add-sendOpLevel-API.patch
diff --git a/patches/server/0534-TODO-Registry-Modification-API.patch b/patches/server/0535-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0534-TODO-Registry-Modification-API.patch
rename to patches/server/0535-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0535-Add-StructuresLocateEvent.patch b/patches/server/0536-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0535-Add-StructuresLocateEvent.patch
rename to patches/server/0536-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0536-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
index 61d03c322a..b7ef2ebcfd 100644
--- a/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
@@ -29,7 +29,7 @@ index 1f909082eb123bfe37e1078962ee7d71c78a8194..d948850a44464618117c441cca94775b
                      // CraftBukkit start
                      VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index b978d5fb28ef1472bd890df0229cf7535ead6b00..c7634407ccaf76513f19688c0f5e102bb2b5a997 100644
+index 415c6fd01dd871729c054f916702f9f3062c346c..a459a7889c7462b9c8e6474d987151f15720a98e 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -246,6 +246,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
diff --git a/patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0539-Make-schedule-command-per-world.patch b/patches/server/0540-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0539-Make-schedule-command-per-world.patch
rename to patches/server/0540-Make-schedule-command-per-world.patch
diff --git a/patches/server/0540-Configurable-max-leash-distance.patch b/patches/server/0541-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0540-Configurable-max-leash-distance.patch
rename to patches/server/0541-Configurable-max-leash-distance.patch
diff --git a/patches/server/0541-Implement-BlockPreDispenseEvent.patch b/patches/server/0542-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0541-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0542-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 92%
rename from patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
index 19801f064b..2dab2241d2 100644
--- a/patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 1fad121f0559cf5c40ccbf7290bfb600b17dc219..f88e0480972abe41e71227d36505e11d6b9aa992 100644
+index 774f408b1520646dd32eb7d66e33946a7e1e72df..bdd394d5fc5b08d0f40c75924e5ad22ec6637af8 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,7 +407,7 @@ public class EndDragonFight {
diff --git a/patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0546-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0546-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0547-add-DragonEggFormEvent.patch b/patches/server/0548-add-DragonEggFormEvent.patch
similarity index 96%
rename from patches/server/0547-add-DragonEggFormEvent.patch
rename to patches/server/0548-add-DragonEggFormEvent.patch
index 7a813b289f..82859c7f59 100644
--- a/patches/server/0547-add-DragonEggFormEvent.patch
+++ b/patches/server/0548-add-DragonEggFormEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add DragonEggFormEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index f88e0480972abe41e71227d36505e11d6b9aa992..b5d69bde512f832374acd5e6b94268ea327b01b2 100644
+index bdd394d5fc5b08d0f40c75924e5ad22ec6637af8..5c0767a0bc37b5f0aa3f8892826e58f93f11cf97 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,9 +407,23 @@ public class EndDragonFight {
diff --git a/patches/server/0548-EntityMoveEvent.patch b/patches/server/0549-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0548-EntityMoveEvent.patch
rename to patches/server/0549-EntityMoveEvent.patch
index 50d8310197..e451b0d0b8 100644
--- a/patches/server/0548-EntityMoveEvent.patch
+++ b/patches/server/0549-EntityMoveEvent.patch
@@ -29,7 +29,7 @@ index fb256e7c60f4e82b028f6768f591098882e27dd1..cfd0e75ac4e7edbd219cc0f5fb802e37
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b9162e3d7ad429b0c18dde43e449e4716da2c4bd..430df61e8b9e871312edd9cabcb57527d534e2c1 100644
+index e4fd0bc35064e7962c7e43f9d0ee502463a6085f..816f9b66c5d096ac31585ed29b80e11f5fadec87 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3333,6 +3333,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0550-Inline-shift-direction-fields.patch b/patches/server/0551-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0550-Inline-shift-direction-fields.patch
rename to patches/server/0551-Inline-shift-direction-fields.patch
diff --git a/patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0553-living-entity-allow-attribute-registration.patch b/patches/server/0554-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0553-living-entity-allow-attribute-registration.patch
rename to patches/server/0554-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0554-fix-dead-slime-setSize-invincibility.patch b/patches/server/0555-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0554-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0555-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0556-Expose-Tracked-Players.patch b/patches/server/0557-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0556-Expose-Tracked-Players.patch
rename to patches/server/0557-Expose-Tracked-Players.patch
diff --git a/patches/server/0557-Remove-streams-from-SensorNearest.patch b/patches/server/0558-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0557-Remove-streams-from-SensorNearest.patch
rename to patches/server/0558-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0558-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0558-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0559-Improve-ServerGUI.patch b/patches/server/0560-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0559-Improve-ServerGUI.patch
rename to patches/server/0560-Improve-ServerGUI.patch
diff --git a/patches/server/0560-fix-converting-txt-to-json-file.patch b/patches/server/0561-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0560-fix-converting-txt-to-json-file.patch
rename to patches/server/0561-fix-converting-txt-to-json-file.patch
index 39028741de..b587035b13 100644
--- a/patches/server/0560-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0561-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8f7916aa522fa2a49197d59e63d6e5c3a2d4bf42..89b6cbc3721cdd8000ae34c33dec1d4458cf55d3 100644
+index 31bdf41a3e914c79e42f85b7f0aef439f35288f1..1545acb625ee97e596ccd54d049d47422b8673b3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0561-Add-worldborder-events.patch b/patches/server/0562-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0561-Add-worldborder-events.patch
rename to patches/server/0562-Add-worldborder-events.patch
diff --git a/patches/server/0562-added-PlayerNameEntityEvent.patch b/patches/server/0563-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0562-added-PlayerNameEntityEvent.patch
rename to patches/server/0563-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0563-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0564-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0563-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0564-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0564-Add-recipe-to-cook-events.patch b/patches/server/0565-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0564-Add-recipe-to-cook-events.patch
rename to patches/server/0565-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0565-Add-Block-isValidTool.patch b/patches/server/0566-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0565-Add-Block-isValidTool.patch
rename to patches/server/0566-Add-Block-isValidTool.patch
diff --git a/patches/server/0566-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0566-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0567-Expand-world-key-API.patch b/patches/server/0568-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0567-Expand-world-key-API.patch
rename to patches/server/0568-Expand-world-key-API.patch
diff --git a/patches/server/0568-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0568-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0569-Item-Rarity-API.patch b/patches/server/0570-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0569-Item-Rarity-API.patch
rename to patches/server/0570-Item-Rarity-API.patch
diff --git a/patches/server/0570-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0570-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0573-Expose-protocol-version.patch b/patches/server/0574-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0573-Expose-protocol-version.patch
rename to patches/server/0574-Expose-protocol-version.patch
diff --git a/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
index b5c885d353..f7854a7058 100644
--- a/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 89b6cbc3721cdd8000ae34c33dec1d4458cf55d3..3acdac903ec7afb034f86d725ca0dc949babd1fc 100644
+index 1545acb625ee97e596ccd54d049d47422b8673b3..00a75a9bee2ffac80d334fe60ddd69ee526341fb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 93%
rename from patches/server/0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index fbb9b9edd3..ea018dcf7b 100644
--- a/patches/server/0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 430df61e8b9e871312edd9cabcb57527d534e2c1..b9a2da15a49b1ddfd550ea26091990d495664484 100644
+index 816f9b66c5d096ac31585ed29b80e11f5fadec87..c0c864bcad6ba6466d7a6453ce920a3603f6066a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3817,6 +3817,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0576-Add-bypass-host-check.patch b/patches/server/0577-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0576-Add-bypass-host-check.patch
rename to patches/server/0577-Add-bypass-host-check.patch
diff --git a/patches/server/0577-Set-area-affect-cloud-rotation.patch b/patches/server/0578-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0577-Set-area-affect-cloud-rotation.patch
rename to patches/server/0578-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0578-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0578-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0579-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0579-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0580-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0580-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0581-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0581-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0582-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0582-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0583-Added-PlayerDeepSleepEvent.patch b/patches/server/0584-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0583-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0584-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0584-More-World-API.patch b/patches/server/0585-More-World-API.patch
similarity index 100%
rename from patches/server/0584-More-World-API.patch
rename to patches/server/0585-More-World-API.patch
diff --git a/patches/server/0585-Added-PlayerBedFailEnterEvent.patch b/patches/server/0586-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0585-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0586-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0586-Entity-load-save-limit-per-chunk.patch b/patches/server/0587-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0586-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0587-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 96%
rename from patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
index 97e6dec387..f90999918d 100644
--- a/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3acdac903ec7afb034f86d725ca0dc949babd1fc..60d5142f17c561fd7268999faaa084642abbb65c 100644
+index 00a75a9bee2ffac80d334fe60ddd69ee526341fb..36838ed14523c30676762bd8ed8d4ee644ae3422 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0589-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0589-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0590-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0591-Add-Channel-initialization-listeners.patch b/patches/server/0592-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0591-Add-Channel-initialization-listeners.patch
rename to patches/server/0592-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0593-Add-more-WanderingTrader-API.patch b/patches/server/0594-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0593-Add-more-WanderingTrader-API.patch
rename to patches/server/0594-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0594-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0594-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0595-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0597-Inventory-close.patch b/patches/server/0598-Inventory-close.patch
similarity index 100%
rename from patches/server/0597-Inventory-close.patch
rename to patches/server/0598-Inventory-close.patch
diff --git a/patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0599-Fix-CraftPotionBrewer-cache.patch b/patches/server/0600-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0599-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0600-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0600-Add-basic-Datapack-API.patch b/patches/server/0601-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0600-Add-basic-Datapack-API.patch
rename to patches/server/0601-Add-basic-Datapack-API.patch
diff --git a/patches/server/0601-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0601-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0602-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0603-ItemStack-repair-check-API.patch b/patches/server/0604-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0603-ItemStack-repair-check-API.patch
rename to patches/server/0604-ItemStack-repair-check-API.patch
diff --git a/patches/server/0604-More-Enchantment-API.patch b/patches/server/0605-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0604-More-Enchantment-API.patch
rename to patches/server/0605-More-Enchantment-API.patch
diff --git a/patches/server/0605-Move-range-check-for-block-placing-up.patch b/patches/server/0606-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0605-Move-range-check-for-block-placing-up.patch
rename to patches/server/0606-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
index bce854768c..0a547f7754 100644
--- a/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
@@ -306,7 +306,7 @@ index 17e963f927c81dfb6bf10f621c76c6631fd2dd97..3054716dda1fcfe6c457d81dd89c82bf
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3548afeef265c21156c1dab90d1758fc47a56b51..640ab1cf00ddc24a704b7f555396d18b29959a87 100644
+index 1577b7317b85708d39d4171321df785a8107bdb2..51dc136b9a5006382de4b12275a9c2f299d5d1f9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -184,6 +184,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0607-Add-Mob-lookAt-API.patch b/patches/server/0608-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0607-Add-Mob-lookAt-API.patch
rename to patches/server/0608-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0608-Add-Unix-domain-socket-support.patch b/patches/server/0609-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0608-Add-Unix-domain-socket-support.patch
rename to patches/server/0609-Add-Unix-domain-socket-support.patch
index 459999250c..272678ab91 100644
--- a/patches/server/0608-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0609-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 60d5142f17c561fd7268999faaa084642abbb65c..e2c55689e881a14e457bc21ac42cf126f7af56f2 100644
+index 36838ed14523c30676762bd8ed8d4ee644ae3422..7d917aa8376fed8004f30e92bf88face17165a92 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0609-Add-EntityInsideBlockEvent.patch b/patches/server/0610-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0609-Add-EntityInsideBlockEvent.patch
rename to patches/server/0610-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0610-Attributes-API-for-item-defaults.patch b/patches/server/0611-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0610-Attributes-API-for-item-defaults.patch
rename to patches/server/0611-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0612-More-Lidded-Block-API.patch b/patches/server/0613-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0612-More-Lidded-Block-API.patch
rename to patches/server/0613-More-Lidded-Block-API.patch
diff --git a/patches/server/0613-Limit-item-frame-cursors-on-maps.patch b/patches/server/0614-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0613-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0614-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0614-Add-PlayerKickEvent-causes.patch b/patches/server/0615-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0614-Add-PlayerKickEvent-causes.patch
rename to patches/server/0615-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0615-Add-PufferFishStateChangeEvent.patch b/patches/server/0616-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0615-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0616-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch
deleted file mode 100644
index 250023ae1d..0000000000
--- a/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: GioSDA <gsdambrosio@gmail.com>
-Date: Wed, 10 Mar 2021 10:06:45 -0800
-Subject: [PATCH] Add option to fix items merging through walls
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 5d742d072d2cc532ce86bff3de15a5f0f381d1c5..d1085e6f2de19b380c09a32b31d53374f2785488 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -258,6 +258,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
-                 ItemEntity entityitem = (ItemEntity) iterator.next();
- 
-                 if (entityitem.isMergable()) {
-+                    // Paper Start - Fix items merging through walls
-+                        if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) {
-+                            net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(),
-+                                net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this);
-+                            net.minecraft.world.phys.BlockHitResult rayTraceResult = this.level().clip(rayTrace);
-+                            if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
-+                        }
-+                    // Paper End
-                     this.tryToMerge(entityitem);
-                     if (this.isRemoved()) {
-                         break;
diff --git a/patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
new file mode 100644
index 0000000000..a0c0b55990
--- /dev/null
+++ b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: GioSDA <gsdambrosio@gmail.com>
+Date: Wed, 10 Mar 2021 10:06:45 -0800
+Subject: [PATCH] Add option to fix items merging through walls
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+index 5d742d072d2cc532ce86bff3de15a5f0f381d1c5..3f479cdca77ad051a8fcf56e99c7811998a92f2a 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -258,6 +258,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+                 ItemEntity entityitem = (ItemEntity) iterator.next();
+ 
+                 if (entityitem.isMergable()) {
++                    // Paper start - Fix items merging through walls
++                    if (this.level().clipDirect(this.position(), entityitem.position(),
++                        net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.HitResult.Type.BLOCK) {
++                        continue;
++                    }
++                    // Paper end - Fix items merging through walls
+                     this.tryToMerge(entityitem);
+                     if (this.isRemoved()) {
+                         break;
diff --git a/patches/server/0619-Add-BellRevealRaiderEvent.patch b/patches/server/0620-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0619-Add-BellRevealRaiderEvent.patch
rename to patches/server/0620-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0620-Fix-invulnerable-end-crystals.patch b/patches/server/0621-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0620-Fix-invulnerable-end-crystals.patch
rename to patches/server/0621-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0621-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0621-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0622-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0622-Fix-dangerous-end-portal-logic.patch b/patches/server/0623-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0622-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0623-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0624-Make-item-validations-configurable.patch b/patches/server/0625-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0624-Make-item-validations-configurable.patch
rename to patches/server/0625-Make-item-validations-configurable.patch
diff --git a/patches/server/0625-Line-Of-Sight-Changes.patch b/patches/server/0626-Line-Of-Sight-Changes.patch
similarity index 58%
rename from patches/server/0625-Line-Of-Sight-Changes.patch
rename to patches/server/0626-Line-Of-Sight-Changes.patch
index 3c056db6c6..9af116d84f 100644
--- a/patches/server/0625-Line-Of-Sight-Changes.patch
+++ b/patches/server/0626-Line-Of-Sight-Changes.patch
@@ -5,24 +5,24 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b9a2da15a49b1ddfd550ea26091990d495664484..80a59b869c898e40083607db5aa92115c7801010 100644
+index c0c864bcad6ba6466d7a6453ce920a3603f6066a..ad613b0d6c430a52ee706064c8638a643c2c5ffa 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3548,7 +3548,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
--            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
+-            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
 +            // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
-+            return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
++            return vec3d1.distanceToSqr(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
          }
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 42b6369015cdfea983b1489f7b99428eaa8c62a5..76195cfe2be5931401fd66454013b829ddf265ff 100644
+index 42b6369015cdfea983b1489f7b99428eaa8c62a5..5a949e1d482e2485742e24b63395204b7fc7d1f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -992,5 +992,16 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -992,5 +992,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
      public org.bukkit.NamespacedKey getKey() {
          return org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.getHandle().getLevel().dimension().location());
      }
@@ -30,32 +30,42 @@ index 42b6369015cdfea983b1489f7b99428eaa8c62a5..76195cfe2be5931401fd66454013b829
 +    public boolean lineOfSightExists(Location from, Location to) {
 +        Preconditions.checkArgument(from != null, "from parameter in lineOfSightExists cannot be null");
 +        Preconditions.checkArgument(to != null, "to parameter in lineOfSightExists cannot be null");
-+        if (from.getWorld() != to.getWorld()) return false;
-+        net.minecraft.world.phys.Vec3 vec3d = new net.minecraft.world.phys.Vec3(from.getX(), from.getY(), from.getZ());
-+        net.minecraft.world.phys.Vec3 vec3d1 = new net.minecraft.world.phys.Vec3(to.getX(), to.getY(), to.getZ());
-+        if (vec3d1.distanceToSqr(vec3d) > 128D * 128D) return false; //Return early if the distance is greater than 128 blocks
++        if (from.getWorld() != to.getWorld()) {
++            return false;
++        }
 +
-+        return this.getHandle().clip(new net.minecraft.world.level.ClipContext(vec3d, vec3d1, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
++        net.minecraft.world.phys.Vec3 start = new net.minecraft.world.phys.Vec3(from.getX(), from.getY(), from.getZ());
++        net.minecraft.world.phys.Vec3 end = new net.minecraft.world.phys.Vec3(to.getX(), to.getY(), to.getZ());
++        if (end.distanceToSqr(start) > 128D * 128D) {
++            return false; // Return early if the distance is greater than 128 blocks
++        }
++
++        return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
 +    }
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index dcc7c8efe0b9d6b57841d8318499d490a3f7aa73..92578adeab74b53e2001262986f883913aa15f05 100644
+index dcc7c8efe0b9d6b57841d8318499d490a3f7aa73..a2865fe8fdc5f77a84e72f516d8f1fd1b4b579e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -583,6 +583,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -583,6 +583,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle());
      }
  
 +    // Paper start
 +    @Override
 +    public boolean hasLineOfSight(Location loc) {
-+        if (this.getHandle().level() != ((CraftWorld) loc.getWorld()).getHandle()) return false;
-+        net.minecraft.world.phys.Vec3 vec3d = new net.minecraft.world.phys.Vec3(this.getHandle().getX(), this.getHandle().getEyeY(), this.getHandle().getZ());
-+        net.minecraft.world.phys.Vec3 vec3d1 = new net.minecraft.world.phys.Vec3(loc.getX(), loc.getY(), loc.getZ());
-+        if (vec3d1.distanceToSqr(vec3d) > 128D * 128D) return false; //Return early if the distance is greater than 128 blocks
++        if (this.getHandle().level() != ((CraftWorld) loc.getWorld()).getHandle()) {
++            return false;
++        }
 +
-+        return this.getHandle().level().clip(new net.minecraft.world.level.ClipContext(vec3d, vec3d1, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this.getHandle())).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
++        net.minecraft.world.phys.Vec3 start = new net.minecraft.world.phys.Vec3(this.getHandle().getX(), this.getHandle().getEyeY(), this.getHandle().getZ());
++        net.minecraft.world.phys.Vec3 end = new net.minecraft.world.phys.Vec3(loc.getX(), loc.getY(), loc.getZ());
++        if (end.distanceToSqr(start) > 128D * 128D) {
++            return false; // Return early if the distance is greater than 128 blocks
++        }
++
++        return this.getHandle().level().clipDirect(start, end, net.minecraft.world.phys.shapes.CollisionContext.of(this.getHandle())) == net.minecraft.world.phys.HitResult.Type.MISS;
 +    }
 +    // Paper end
 +
diff --git a/patches/server/0626-add-per-world-spawn-limits.patch b/patches/server/0627-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0626-add-per-world-spawn-limits.patch
rename to patches/server/0627-add-per-world-spawn-limits.patch
diff --git a/patches/server/0627-Fix-potions-splash-events.patch b/patches/server/0628-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0627-Fix-potions-splash-events.patch
rename to patches/server/0628-Fix-potions-splash-events.patch
diff --git a/patches/server/0628-Add-more-LimitedRegion-API.patch b/patches/server/0629-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0628-Add-more-LimitedRegion-API.patch
rename to patches/server/0629-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0630-Missing-Entity-API.patch b/patches/server/0631-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0630-Missing-Entity-API.patch
rename to patches/server/0631-Missing-Entity-API.patch
index fa9d2f734f..370c72c38e 100644
--- a/patches/server/0630-Missing-Entity-API.patch
+++ b/patches/server/0631-Missing-Entity-API.patch
@@ -359,7 +359,7 @@ index 61d4877b4f74362e38104bfeacb7d66534ad798e..454dd67920826b8b62c2654abfd43fc0
      @Override
      protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 76195cfe2be5931401fd66454013b829ddf265ff..2732b952ab18b49f72efcc22facef4f9b2b4fa4d 100644
+index 5a949e1d482e2485742e24b63395204b7fc7d1f5..977012bfa4c42d619f2e9729c2be032999c403f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -828,14 +828,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 90%
rename from patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 571b88a531..4dd7979d6b 100644
--- a/patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 582f1c07da8edc88dda9463992bb8503fcb9e163..d37440f78a31c676fc6efe9e59253dbe8097b94e 100644
+index 7dcc1fa9c058adf2d55b1ccc6f7abf468752e116..50469bbd710375c6046647203435330c5bc21a4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -583,7 +583,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 97%
rename from patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
index c5f7bc04c3..9f1667dba2 100644
--- a/patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -21,7 +21,7 @@ index e63cb62affc88d1482f9926ae459986e2d213fb0..bc7daf89e30152a3bcb215e91b30c968
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 640ab1cf00ddc24a704b7f555396d18b29959a87..e35e25aea3d5f0f9e033a112545a398b636d638a 100644
+index 51dc136b9a5006382de4b12275a9c2f299d5d1f9..7113fdf06bc526af62d08313f8c47e14a2f4b652 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -201,6 +201,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0635-Adds-PlayerArmSwingEvent.patch b/patches/server/0636-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0635-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0636-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
index 4d99038c65..52d1d0094d 100644
--- a/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 80a59b869c898e40083607db5aa92115c7801010..15bc39170f06bd4ea5da770bd0fe3d8d08366c48 100644
+index ad613b0d6c430a52ee706064c8638a643c2c5ffa..2cb08ccd53a1548c1e65065a4eeb5e4f577e34a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1163,7 +1163,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0638-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0638-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0639-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0639-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0642-Stinger-API.patch b/patches/server/0643-Stinger-API.patch
similarity index 93%
rename from patches/server/0642-Stinger-API.patch
rename to patches/server/0643-Stinger-API.patch
index 06a76158c0..eede4bd989 100644
--- a/patches/server/0642-Stinger-API.patch
+++ b/patches/server/0643-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 92578adeab74b53e2001262986f883913aa15f05..df1ac9a3e3a3551a798432ded2ba90a3c11db72f 100644
+index a2865fe8fdc5f77a84e72f516d8f1fd1b4b579e0..a235247fe0d8ec50d374ec30007fea8427de9cae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0644-Add-System.out-err-catcher.patch b/patches/server/0645-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0644-Add-System.out-err-catcher.patch
rename to patches/server/0645-Add-System.out-err-catcher.patch
diff --git a/patches/server/0645-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0645-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0646-Improve-boat-collision-performance.patch b/patches/server/0647-Improve-boat-collision-performance.patch
similarity index 97%
rename from patches/server/0646-Improve-boat-collision-performance.patch
rename to patches/server/0647-Improve-boat-collision-performance.patch
index 49ada3e1d4..d01186c267 100644
--- a/patches/server/0646-Improve-boat-collision-performance.patch
+++ b/patches/server/0647-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 15bc39170f06bd4ea5da770bd0fe3d8d08366c48..cef1fa35e3ec613cdea32785fa7848bd39d830d4 100644
+index 2cb08ccd53a1548c1e65065a4eeb5e4f577e34a6..8cde3d6c34226c197645a382e65d3c9ab685fff7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1382,7 +1382,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0647-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0647-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0648-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0648-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0649-Add-PlayerSetSpawnEvent.patch b/patches/server/0650-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0649-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0650-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0651-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0651-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0652-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0652-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0653-Added-EntityDamageItemEvent.patch b/patches/server/0654-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0653-Added-EntityDamageItemEvent.patch
rename to patches/server/0654-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0654-Optimize-indirect-passenger-iteration.patch b/patches/server/0655-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0654-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0655-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0656-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0656-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0657-Clear-bucket-NBT-after-dispense.patch b/patches/server/0658-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0657-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0658-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0659-Add-BlockBreakBlockEvent.patch b/patches/server/0660-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0659-Add-BlockBreakBlockEvent.patch
rename to patches/server/0660-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0661-More-CommandBlock-API.patch b/patches/server/0662-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0661-More-CommandBlock-API.patch
rename to patches/server/0662-More-CommandBlock-API.patch
diff --git a/patches/server/0662-Add-missing-team-sidebar-display-slots.patch b/patches/server/0663-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0662-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0663-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0663-Add-back-EntityPortalExitEvent.patch b/patches/server/0664-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0663-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0664-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0665-Get-entity-default-attributes.patch b/patches/server/0666-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0665-Get-entity-default-attributes.patch
rename to patches/server/0666-Get-entity-default-attributes.patch
diff --git a/patches/server/0666-Left-handed-API.patch b/patches/server/0667-Left-handed-API.patch
similarity index 100%
rename from patches/server/0666-Left-handed-API.patch
rename to patches/server/0667-Left-handed-API.patch
diff --git a/patches/server/0667-Add-more-advancement-API.patch b/patches/server/0668-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0667-Add-more-advancement-API.patch
rename to patches/server/0668-Add-more-advancement-API.patch
diff --git a/patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0669-Add-critical-damage-API.patch b/patches/server/0670-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0669-Add-critical-damage-API.patch
rename to patches/server/0670-Add-critical-damage-API.patch
diff --git a/patches/server/0670-Fix-issues-with-mob-conversion.patch b/patches/server/0671-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0670-Fix-issues-with-mob-conversion.patch
rename to patches/server/0671-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0671-Add-isCollidable-methods-to-various-places.patch b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch
similarity index 96%
rename from patches/server/0671-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0672-Add-isCollidable-methods-to-various-places.patch
index 70fc349cfe..ed647e0b63 100644
--- a/patches/server/0671-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index d37440f78a31c676fc6efe9e59253dbe8097b94e..8d2da07f0793367a51026b50adc8b3dc71073013 100644
+index 50469bbd710375c6046647203435330c5bc21a4f..e649c3296363ea2f8429593e33a7833143bcabba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -482,6 +482,11 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0672-Goat-ram-API.patch b/patches/server/0673-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0672-Goat-ram-API.patch
rename to patches/server/0673-Goat-ram-API.patch
diff --git a/patches/server/0673-Add-API-for-resetting-a-single-score.patch b/patches/server/0674-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0673-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0674-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0675-Vanilla-command-permission-fixes.patch b/patches/server/0676-Vanilla-command-permission-fixes.patch
similarity index 97%
rename from patches/server/0675-Vanilla-command-permission-fixes.patch
rename to patches/server/0676-Vanilla-command-permission-fixes.patch
index 5dd38d933e..9f6f4db1f0 100644
--- a/patches/server/0675-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0676-Vanilla-command-permission-fixes.patch
@@ -51,7 +51,7 @@ index 14c78028ff51fff6f24174ae16b7c42d34d6041a..7592b592a541912f729d6b99f455cd87
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index e396079645332b1982d2368b8f97ec9ff377c8ce..45e85f252acd72800956cc2a120564256d2de797 100644
+index 6b991cd34644077d60269eeba6ce90dbfdf8fbb2..d6a4507f547893bf7f8318723b5f86cc779e47a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -88,7 +88,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
diff --git a/patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0677-Fix-GameProfileCache-concurrency.patch b/patches/server/0678-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0677-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0678-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0678-Improve-and-expand-AsyncCatcher.patch b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch
similarity index 98%
rename from patches/server/0678-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0679-Improve-and-expand-AsyncCatcher.patch
index 9b4cc3bf89..395c7ac16e 100644
--- a/patches/server/0678-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch
@@ -29,7 +29,7 @@ index 75ea5d01a515dcc604a1414d7261887ca71b243e..c534dadb3414c487fd3afbf7be71bfcb
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cef1fa35e3ec613cdea32785fa7848bd39d830d4..9f4e33bbd8d86707d50c280d1b9fc0f8538f7700 100644
+index 8cde3d6c34226c197645a382e65d3c9ab685fff7..199f802b3bed9ec25027d33e47329a80770755f2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1119,7 +1119,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index df1ac9a3e3a3551a798432ded2ba90a3c11db72f..17bb9318262b04c2005bec23bcaf05f3ed06c7db 100644
+index a235247fe0d8ec50d374ec30007fea8427de9cae..1377400a8762158fa1dd40e425bd0999a9275895 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0680-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0680-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0681-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0681-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0682-Optimise-general-POI-access.patch b/patches/server/0683-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0682-Optimise-general-POI-access.patch
rename to patches/server/0683-Optimise-general-POI-access.patch
diff --git a/patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0684-Optimise-chunk-tick-iteration.patch b/patches/server/0685-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0684-Optimise-chunk-tick-iteration.patch
rename to patches/server/0685-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
similarity index 97%
rename from patches/server/0685-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0686-Execute-chunk-tasks-mid-tick.patch
index 8b715e849a..8c3e096cf9 100644
--- a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
@@ -155,10 +155,10 @@ index 0f6d4f80677c54a94a1bbfb861a3bcce17b83489..1d0f87185a8a74394bc2da29828407fd
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e35e25aea3d5f0f9e033a112545a398b636d638a..577262c3e040188f1f25dad26cfa0a5a40712bb7 100644
+index 7113fdf06bc526af62d08313f8c47e14a2f4b652..e8a705c432c4f10944eaac33f7d4670916070715 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -825,6 +825,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -909,6 +909,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // Spigot end
              } else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) {
                  tickingblockentity.tick();
@@ -170,7 +170,7 @@ index e35e25aea3d5f0f9e033a112545a398b636d638a..577262c3e040188f1f25dad26cfa0a5a
              }
          }
          this.blockEntityTickers.removeAll(toRemove);
-@@ -839,6 +844,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -923,6 +928,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
          try {
              tickConsumer.accept(entity);
diff --git a/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0689-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0689-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0690-Distance-manager-tick-timings.patch b/patches/server/0691-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0690-Distance-manager-tick-timings.patch
rename to patches/server/0691-Distance-manager-tick-timings.patch
diff --git a/patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 90%
rename from patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 336cbb88f7..164e7d89c9 100644
--- a/patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,10 +13,10 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 577262c3e040188f1f25dad26cfa0a5a40712bb7..f04f216f052095710d7ef13743489991380d6a62 100644
+index e8a705c432c4f10944eaac33f7d4670916070715..a21b2a100503b1fcceb700da11bef5866f3d178b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -371,6 +371,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -455,6 +455,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
diff --git a/patches/server/0693-Add-packet-limiter-config.patch b/patches/server/0694-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0693-Add-packet-limiter-config.patch
rename to patches/server/0694-Add-packet-limiter-config.patch
diff --git a/patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 87%
rename from patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
index 3497fb942c..d931ef54fa 100644
--- a/patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Don't lookup fluid state when raytracing
 Just use the iblockdata already retrieved, removes a getType call.
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 89aadd30c1973cf45c5c05fd12462e04b0b05c97..04194b5d5560e3620131c2f5cdea84ff814a4c25 100644
+index 24073d4d7c45d501c2baec2d8c8b49f60fb76e65..bd3eb39981c1d6028804f05c21eec6127389ca40 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -79,7 +79,7 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -92,7 +92,7 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
              // Paper end
diff --git a/patches/server/0697-Time-scoreboard-search.patch b/patches/server/0698-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0697-Time-scoreboard-search.patch
rename to patches/server/0698-Time-scoreboard-search.patch
diff --git a/patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 88%
rename from patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
index 61d1c10cc0..75ece1bf8b 100644
--- a/patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
@@ -9,10 +9,10 @@ easy win. The remaining problems with this function
 are mostly with the block getting itself.
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 04194b5d5560e3620131c2f5cdea84ff814a4c25..0e8746759752b692668886370181aa5db1fd0bb0 100644
+index bd3eb39981c1d6028804f05c21eec6127389ca40..799837c172a5f7856c78e6fe2595c575f3058a5e 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -79,6 +79,7 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -92,6 +92,7 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
              // Paper end
diff --git a/patches/server/0700-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0700-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0702-Optimise-random-block-ticking.patch b/patches/server/0703-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0702-Optimise-random-block-ticking.patch
rename to patches/server/0703-Optimise-random-block-ticking.patch
index 852edb5de6..a12f920fa5 100644
--- a/patches/server/0702-Optimise-random-block-ticking.patch
+++ b/patches/server/0703-Optimise-random-block-ticking.patch
@@ -317,10 +317,10 @@ index fd6ce6e8a3a7c889276e06fb427e0d17ed093149..76ab82553488e129882fc9beb603636b
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f04f216f052095710d7ef13743489991380d6a62..69886eb8bf9769aa8f2942ad68aeadbb4e86c223 100644
+index a21b2a100503b1fcceb700da11bef5866f3d178b..270ce3995229aa79074e981bb45e5480a5e924d4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1296,10 +1296,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1380,10 +1380,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract RecipeManager getRecipeManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
diff --git a/patches/server/0703-Optimise-non-flush-packet-sending.patch b/patches/server/0704-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0703-Optimise-non-flush-packet-sending.patch
rename to patches/server/0704-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0704-Optimise-nearby-player-lookups.patch b/patches/server/0705-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0704-Optimise-nearby-player-lookups.patch
rename to patches/server/0705-Optimise-nearby-player-lookups.patch
index cb025f38bc..33337276bb 100644
--- a/patches/server/0704-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0705-Optimise-nearby-player-lookups.patch
@@ -226,7 +226,7 @@ index b6e48531a2a1316eef786e0476574eb1c3c29a9e..e2a25c29ec74147b3e66aa0b3deb85a8
              if (entityhuman != null) {
                  double d0 = entityhuman.distanceToSqr((Entity) this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 69886eb8bf9769aa8f2942ad68aeadbb4e86c223..5778dd4bdcf116d7932cebcd261c5f624edd5874 100644
+index 270ce3995229aa79074e981bb45e5480a5e924d4..fb2e1d6954d244a82c70730241046efad927fc14 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -207,6 +207,69 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0705-Remove-streams-for-villager-AI.patch b/patches/server/0706-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0705-Remove-streams-for-villager-AI.patch
rename to patches/server/0706-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0713-Ensure-valid-vehicle-status.patch b/patches/server/0714-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0713-Ensure-valid-vehicle-status.patch
rename to patches/server/0714-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0716-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0716-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0717-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0717-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0718-Preserve-overstacked-loot.patch b/patches/server/0719-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0718-Preserve-overstacked-loot.patch
rename to patches/server/0719-Preserve-overstacked-loot.patch
diff --git a/patches/server/0719-Update-head-rotation-in-missing-places.patch b/patches/server/0720-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0719-Update-head-rotation-in-missing-places.patch
rename to patches/server/0720-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0720-prevent-unintended-light-block-manipulation.patch b/patches/server/0721-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0720-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0721-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0721-Fix-CraftCriteria-defaults-map.patch b/patches/server/0722-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0721-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0722-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0722-Fix-upstreams-block-state-factories.patch b/patches/server/0723-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0722-Fix-upstreams-block-state-factories.patch
rename to patches/server/0723-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0724-Configurable-feature-seeds.patch b/patches/server/0725-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0724-Configurable-feature-seeds.patch
rename to patches/server/0725-Configurable-feature-seeds.patch
diff --git a/patches/server/0725-Add-root-admin-user-detection.patch b/patches/server/0726-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0725-Add-root-admin-user-detection.patch
rename to patches/server/0726-Add-root-admin-user-detection.patch
index c8662384a1..68ed5d2471 100644
--- a/patches/server/0725-Add-root-admin-user-detection.patch
+++ b/patches/server/0726-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e2c55689e881a14e457bc21ac42cf126f7af56f2..ad3b5a3b1f63b151d9215584152435cd56e6b622 100644
+index 7d917aa8376fed8004f30e92bf88face17165a92..c9a6847b4eb29b8d0ed68741b5e6055de02d1e83 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0726-Always-allow-item-changing-in-Fireball.patch b/patches/server/0727-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0726-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0727-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
index 568f5ba069..b06d7994ff 100644
--- a/patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9f4e33bbd8d86707d50c280d1b9fc0f8538f7700..6220a17852b51f45756d576af662460a28099abc 100644
+index 199f802b3bed9ec25027d33e47329a80770755f2..a26a2cb41206f66c209c6b9c2328f46487ac9aba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2648,13 +2648,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 97%
rename from patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 6b43fb005b..be8f93250a 100644
--- a/patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index e7c0d214abbad1f300049f790ae54e7ea488e150..24f0d61a2fa9ac95dd26443a978209b5
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6220a17852b51f45756d576af662460a28099abc..a5cf00a41c61cc9f851781cc4f55c9bb47c2f5b6 100644
+index a26a2cb41206f66c209c6b9c2328f46487ac9aba..d481eeac08535bc79b5714afa376a2fe2843516c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3157,7 +3157,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
index 499949ee80..52945672aa 100644
--- a/patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,7 +33,7 @@ index bcf93ca2dacbd527db8b17f4e1a7d1836ae493f7..33a7ff327b7ba69fde0ce39bcf347892
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a5cf00a41c61cc9f851781cc4f55c9bb47c2f5b6..f306c9e8f46d80d4c4fdc671e3754b3faff72fa2 100644
+index d481eeac08535bc79b5714afa376a2fe2843516c..b5996e86d2bfcb6d52b10c79bffb92d76954b714 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3159,7 +3159,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0733-Fix-Spigot-growth-modifiers.patch b/patches/server/0734-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0733-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0734-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0735-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0736-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0735-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0736-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0736-Optimize-HashMapPalette.patch b/patches/server/0737-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0736-Optimize-HashMapPalette.patch
rename to patches/server/0737-Optimize-HashMapPalette.patch
diff --git a/patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0741-Add-more-Campfire-API.patch b/patches/server/0742-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0741-Add-more-Campfire-API.patch
rename to patches/server/0742-Add-more-Campfire-API.patch
diff --git a/patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0743-Fix-tripwire-state-inconsistency.patch b/patches/server/0744-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0743-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0744-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0744-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0745-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0744-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0745-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0745-Improve-scoreboard-entries.patch b/patches/server/0746-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0745-Improve-scoreboard-entries.patch
rename to patches/server/0746-Improve-scoreboard-entries.patch
diff --git a/patches/server/0746-Entity-powdered-snow-API.patch b/patches/server/0747-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0746-Entity-powdered-snow-API.patch
rename to patches/server/0747-Entity-powdered-snow-API.patch
diff --git a/patches/server/0747-Add-API-for-item-entity-health.patch b/patches/server/0748-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0747-Add-API-for-item-entity-health.patch
rename to patches/server/0748-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0753-Fix-bees-aging-inside-hives.patch b/patches/server/0754-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0753-Fix-bees-aging-inside-hives.patch
rename to patches/server/0754-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0754-Bucketable-API.patch b/patches/server/0755-Bucketable-API.patch
similarity index 100%
rename from patches/server/0754-Bucketable-API.patch
rename to patches/server/0755-Bucketable-API.patch
diff --git a/patches/server/0755-Validate-usernames.patch b/patches/server/0756-Validate-usernames.patch
similarity index 100%
rename from patches/server/0755-Validate-usernames.patch
rename to patches/server/0756-Validate-usernames.patch
diff --git a/patches/server/0756-Make-water-animal-spawn-height-configurable.patch b/patches/server/0757-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0756-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0757-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0760-Multiple-Entries-with-Scoreboards.patch b/patches/server/0761-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0760-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0761-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0761-Reset-placed-block-on-exception.patch b/patches/server/0762-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0761-Reset-placed-block-on-exception.patch
rename to patches/server/0762-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0762-Add-configurable-height-for-slime-spawn.patch b/patches/server/0763-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0762-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0763-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0764-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0765-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0764-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0765-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0765-Kick-on-main-for-illegal-chat.patch b/patches/server/0766-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0765-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0766-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0766-Multi-Block-Change-API-Implementation.patch b/patches/server/0767-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0766-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0767-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0767-Fix-NotePlayEvent.patch b/patches/server/0768-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0767-Fix-NotePlayEvent.patch
rename to patches/server/0768-Fix-NotePlayEvent.patch
diff --git a/patches/server/0768-Freeze-Tick-Lock-API.patch b/patches/server/0769-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0768-Freeze-Tick-Lock-API.patch
rename to patches/server/0769-Freeze-Tick-Lock-API.patch
index e6c96e1f15..f84b9cd585 100644
--- a/patches/server/0768-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0769-Freeze-Tick-Lock-API.patch
@@ -46,7 +46,7 @@ index d441db38210b15c6fae5a1632f4e2372c7a04b7c..ceddbc2e0fdec358bd7776af264df336
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f306c9e8f46d80d4c4fdc671e3754b3faff72fa2..1822382211b512f88c3e94258bbb6cb27cce3d07 100644
+index b5996e86d2bfcb6d52b10c79bffb92d76954b714..d559d34524e84e7cb5a59756214eac6c9658bd87 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3417,7 +3417,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0769-Dolphin-API.patch b/patches/server/0770-Dolphin-API.patch
similarity index 100%
rename from patches/server/0769-Dolphin-API.patch
rename to patches/server/0770-Dolphin-API.patch
diff --git a/patches/server/0770-More-PotionEffectType-API.patch b/patches/server/0771-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0770-More-PotionEffectType-API.patch
rename to patches/server/0771-More-PotionEffectType-API.patch
diff --git a/patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
index 894f7a6032..c0ea2d68f2 100644
--- a/patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -161,7 +161,7 @@ index eaff8df6c8c12c64e005a68a02e2e35ed88f757c..1c638a4b1f2c841928d8b2a7ae43e4eb
          if (this instanceof CraftBlockCommandSender) {
              if (ServerCommandSender.blockPermInst == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 45e85f252acd72800956cc2a120564256d2de797..c3742b6c4abea173b38307048091fc56bd5051d7 100644
+index d6a4507f547893bf7f8318723b5f86cc779e47a2..c429e580ac791d181916aea2776c558d576d5b3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -83,6 +83,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
diff --git a/patches/server/0773-Add-missing-structure-set-seed-configs.patch b/patches/server/0774-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0773-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0774-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0774-Implement-regenerateChunk.patch b/patches/server/0775-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0774-Implement-regenerateChunk.patch
rename to patches/server/0775-Implement-regenerateChunk.patch
diff --git a/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0777-Add-GameEvent-tags.patch b/patches/server/0778-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0777-Add-GameEvent-tags.patch
rename to patches/server/0778-Add-GameEvent-tags.patch
diff --git a/patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0779-Furnace-RecipesUsed-API.patch b/patches/server/0780-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0779-Furnace-RecipesUsed-API.patch
rename to patches/server/0780-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0780-Configurable-sculk-sensor-listener-range.patch b/patches/server/0781-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0780-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0781-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0781-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0782-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0781-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0782-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0784-Fix-Entity-Position-Desync.patch b/patches/server/0785-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0784-Fix-Entity-Position-Desync.patch
rename to patches/server/0785-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0785-Custom-Potion-Mixes.patch b/patches/server/0786-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0785-Custom-Potion-Mixes.patch
rename to patches/server/0786-Custom-Potion-Mixes.patch
diff --git a/patches/server/0786-Force-close-world-loading-screen.patch b/patches/server/0787-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0786-Force-close-world-loading-screen.patch
rename to patches/server/0787-Force-close-world-loading-screen.patch
diff --git a/patches/server/0787-Fix-falling-block-spawn-methods.patch b/patches/server/0788-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0787-Fix-falling-block-spawn-methods.patch
rename to patches/server/0788-Fix-falling-block-spawn-methods.patch
index 6813f1f772..d866d323f0 100644
--- a/patches/server/0787-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0788-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 2732b952ab18b49f72efcc22facef4f9b2b4fa4d..5fbd881f4f10c0330ddb5a3415062fac2a332b9c 100644
+index 977012bfa4c42d619f2e9729c2be032999c403f7..5ca1bc3a0574c1080cb000245dbc8fa093ee7d01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -598,7 +598,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0788-Expose-furnace-minecart-push-values.patch b/patches/server/0789-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0788-Expose-furnace-minecart-push-values.patch
rename to patches/server/0789-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0790-More-Projectile-API.patch b/patches/server/0791-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0790-More-Projectile-API.patch
rename to patches/server/0791-More-Projectile-API.patch
diff --git a/patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0793-Implement-getComputedBiome-API.patch b/patches/server/0794-Implement-getComputedBiome-API.patch
similarity index 94%
rename from patches/server/0793-Implement-getComputedBiome-API.patch
rename to patches/server/0794-Implement-getComputedBiome-API.patch
index 2c84e13a1e..af32f7bebc 100644
--- a/patches/server/0793-Implement-getComputedBiome-API.patch
+++ b/patches/server/0794-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 5fbd881f4f10c0330ddb5a3415062fac2a332b9c..5c66e0eaefbb639e84e35cbfea614c628332e2fa 100644
+index 5ca1bc3a0574c1080cb000245dbc8fa093ee7d01..5be114bc70c6fdbcb7d804e7558a5172c4461b96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -220,6 +220,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -23,7 +23,7 @@ index 5fbd881f4f10c0330ddb5a3415062fac2a332b9c..5c66e0eaefbb639e84e35cbfea614c62
      public void setBiome(Location location, Biome biome) {
          this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 8d2da07f0793367a51026b50adc8b3dc71073013..61c1f722b99363597613c506cb2fb437e358eb1b 100644
+index e649c3296363ea2f8429593e33a7833143bcabba..0a3fa0f75d2d9f09be8c29d35cb22953ceb8906b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -344,6 +344,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0794-Make-some-itemstacks-nonnull.patch b/patches/server/0795-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0794-Make-some-itemstacks-nonnull.patch
rename to patches/server/0795-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0795-Implement-enchantWithLevels-API.patch b/patches/server/0796-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0795-Implement-enchantWithLevels-API.patch
rename to patches/server/0796-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0796-Fix-saving-in-unloadWorld.patch b/patches/server/0797-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0796-Fix-saving-in-unloadWorld.patch
rename to patches/server/0797-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0797-Buffer-OOB-setBlock-calls.patch b/patches/server/0798-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0797-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0798-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0798-Add-TameableDeathMessageEvent.patch b/patches/server/0799-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0798-Add-TameableDeathMessageEvent.patch
rename to patches/server/0799-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0802-Guard-against-invalid-entity-positions.patch b/patches/server/0803-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0802-Guard-against-invalid-entity-positions.patch
rename to patches/server/0803-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0803-cache-resource-keys.patch b/patches/server/0804-cache-resource-keys.patch
similarity index 96%
rename from patches/server/0803-cache-resource-keys.patch
rename to patches/server/0804-cache-resource-keys.patch
index c56e3412af..c36993cac8 100644
--- a/patches/server/0803-cache-resource-keys.patch
+++ b/patches/server/0804-cache-resource-keys.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] cache resource keys
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 61c1f722b99363597613c506cb2fb437e358eb1b..c04397cc60154ef55027c90be990b9dfb818fd2f 100644
+index 0a3fa0f75d2d9f09be8c29d35cb22953ceb8906b..df104b1f7753d98318a5cc511c6e0e1c68e5c277 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -369,12 +369,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 99%
rename from patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
index 20b190da6f..d456b0145f 100644
--- a/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ad3b5a3b1f63b151d9215584152435cd56e6b622..a0d50b475b21cdcea4ace553a3980411476469f7 100644
+index c9a6847b4eb29b8d0ed68741b5e6055de02d1e83..23c39cc77ae0d2ab7100fff0a3e8ff6752706dbb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0812-WorldCreator-keepSpawnLoaded.patch b/patches/server/0813-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0812-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0813-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0813-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0814-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0813-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0814-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0818-Add-PlayerStopUsingItemEvent.patch b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0818-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0819-Add-PlayerStopUsingItemEvent.patch
index 0e7d33a986..243893434d 100644
--- a/patches/server/0818-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1822382211b512f88c3e94258bbb6cb27cce3d07..269dee8308604fce3333fc2236db9102dd869e09 100644
+index d559d34524e84e7cb5a59756214eac6c9658bd87..0fb20d8680210b91c33aeea4ceae96be536f983b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3976,6 +3976,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0819-FallingBlock-auto-expire-setting.patch b/patches/server/0820-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0819-FallingBlock-auto-expire-setting.patch
rename to patches/server/0820-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0820-Don-t-tick-markers.patch b/patches/server/0821-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0820-Don-t-tick-markers.patch
rename to patches/server/0821-Don-t-tick-markers.patch
diff --git a/patches/server/0821-Do-not-accept-invalid-client-settings.patch b/patches/server/0822-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0821-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0822-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0822-Add-support-for-Proxy-Protocol.patch b/patches/server/0823-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0822-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0823-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
index 2638138390..1e68eef2e0 100644
--- a/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
@@ -2034,10 +2034,10 @@ index 67e096207b08d2ba13ebc1b92ac94ed2e170f896..653c9c41ab7c5cd332565436564396d1
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5778dd4bdcf116d7932cebcd261c5f624edd5874..8107c8e4a994523c75252f7762e362ab6eb13e43 100644
+index fb2e1d6954d244a82c70730241046efad927fc14..af7ffeb70ea696e03d3b8188ed167aa4755e308d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1457,4 +1457,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1541,4 +1541,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return ret;
      }
      // Paper end
diff --git a/patches/server/0830-Dont-resent-entity-on-art-update.patch b/patches/server/0831-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0830-Dont-resent-entity-on-art-update.patch
rename to patches/server/0831-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0831-Add-WardenAngerChangeEvent.patch b/patches/server/0832-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0831-Add-WardenAngerChangeEvent.patch
rename to patches/server/0832-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0834-Nameable-Banner-API.patch b/patches/server/0835-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0834-Nameable-Banner-API.patch
rename to patches/server/0835-Nameable-Banner-API.patch
diff --git a/patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
similarity index 94%
rename from patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
index d4b066c764..940a013bf3 100644
--- a/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
@@ -19,10 +19,10 @@ index 653c9c41ab7c5cd332565436564396d18f26c17c..06df21e55fdb70558b85fc095a04b3bb
              if (captureDrops != null && entity instanceof net.minecraft.world.entity.item.ItemEntity) {
                  captureDrops.add((net.minecraft.world.entity.item.ItemEntity) entity);
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index d1085e6f2de19b380c09a32b31d53374f2785488..b76270c37b568b69af99a2a99dbab3f2f1b57d22 100644
+index 3f479cdca77ad051a8fcf56e99c7811998a92f2a..3b8c76a89249ea4edcae4b59f1fe828f584fb1c1 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -520,7 +520,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -518,7 +518,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      }
  
      public void setItem(ItemStack stack) {
diff --git a/patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0839-Add-Player-getFishHook.patch b/patches/server/0840-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0839-Add-Player-getFishHook.patch
rename to patches/server/0840-Add-Player-getFishHook.patch
diff --git a/patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0843-Fix-Bee-flower-NPE.patch b/patches/server/0844-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0843-Fix-Bee-flower-NPE.patch
rename to patches/server/0844-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0845-More-Teleport-API.patch b/patches/server/0846-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0845-More-Teleport-API.patch
rename to patches/server/0846-More-Teleport-API.patch
diff --git a/patches/server/0846-Add-EntityPortalReadyEvent.patch b/patches/server/0847-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0846-Add-EntityPortalReadyEvent.patch
rename to patches/server/0847-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
similarity index 97%
rename from patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
index a510263a68..a28684e045 100644
--- a/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
@@ -31,7 +31,7 @@ index e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2..55026e1731e41b4e3e4c6a8fef5d96a3
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b76270c37b568b69af99a2a99dbab3f2f1b57d22..08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6 100644
+index 3b8c76a89249ea4edcae4b59f1fe828f584fb1c1..f9c2274c060efdd9b6627ced8485b766aca8951c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -64,7 +64,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0848-Send-block-entities-after-destroy-prediction.patch b/patches/server/0849-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0848-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0849-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 97%
rename from patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
index 111d9702f9..16f0868cd0 100644
--- a/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8107c8e4a994523c75252f7762e362ab6eb13e43..b3f4469c137d221bf5f43565800df59c06101610 100644
+index af7ffeb70ea696e03d3b8188ed167aa4755e308d..6b9b5af04fe06c3f5f20a56955bd12bd2ddb7e5c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -421,7 +421,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -505,7 +505,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
diff --git a/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0851-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0852-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0851-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0852-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0852-Collision-API.patch b/patches/server/0853-Collision-API.patch
similarity index 87%
rename from patches/server/0852-Collision-API.patch
rename to patches/server/0853-Collision-API.patch
index e08d82cd05..331bec6358 100644
--- a/patches/server/0852-Collision-API.patch
+++ b/patches/server/0853-Collision-API.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 5c66e0eaefbb639e84e35cbfea614c628332e2fa..445e6bcebb8d4451c6bd547d3efd98dd01a4664f 100644
+index 5be114bc70c6fdbcb7d804e7558a5172c4461b96..3b9d7f92f4e47da2d7eb1e9cb9e996ee36b57e4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1015,5 +1015,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -1020,5 +1020,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
  
-         return this.getHandle().clip(new net.minecraft.world.level.ClipContext(vec3d, vec3d1, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
+         return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
      }
 +
 +    @Override
diff --git a/patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0854-Block-Ticking-API.patch b/patches/server/0855-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0854-Block-Ticking-API.patch
rename to patches/server/0855-Block-Ticking-API.patch
diff --git a/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
index d0399eb7fd..618589b6a0 100644
--- a/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a0d50b475b21cdcea4ace553a3980411476469f7..584d2e3fe54917542815194d2f06e7c054ddc559 100644
+index 23c39cc77ae0d2ab7100fff0a3e8ff6752706dbb..c49802c936ae8e3f4dc1badd98414d96714ecd60 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0857-Add-NamespacedKey-biome-methods.patch b/patches/server/0858-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0857-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0858-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
index a66acfb1ef..5660492c3c 100644
--- a/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 269dee8308604fce3333fc2236db9102dd869e09..420f4e7d77f2a950a4cce691e57bb2e2ba5bfb23 100644
+index 0fb20d8680210b91c33aeea4ceae96be536f983b..79f989f2331ce3276b46ec4436a8db83f1f1f8b2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3027,37 +3027,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0861-Missing-eating-regain-reason.patch b/patches/server/0862-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0861-Missing-eating-regain-reason.patch
rename to patches/server/0862-Missing-eating-regain-reason.patch
diff --git a/patches/server/0862-Missing-effect-cause.patch b/patches/server/0863-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0862-Missing-effect-cause.patch
rename to patches/server/0863-Missing-effect-cause.patch
diff --git a/patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 97%
rename from patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 4c66876b92..48013a4a31 100644
--- a/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 17bb9318262b04c2005bec23bcaf05f3ed06c7db..7909df54223545bb26a3d530f51c11da12dce0e6 100644
+index 1377400a8762158fa1dd40e425bd0999a9275895..9add16b4bacd5b823f5f0ffa957f8d79b063edb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -509,8 +509,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0865-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0865-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0866-Configurable-chat-thread-limit.patch b/patches/server/0867-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0866-Configurable-chat-thread-limit.patch
rename to patches/server/0867-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0868-fix-Jigsaw-block-kicking-user.patch b/patches/server/0869-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0868-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0869-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0870-Add-getDrops-to-BlockState.patch b/patches/server/0871-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0870-Add-getDrops-to-BlockState.patch
rename to patches/server/0871-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0873-Fix-custom-piglin-loved-items.patch b/patches/server/0874-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0873-Fix-custom-piglin-loved-items.patch
rename to patches/server/0874-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0874-EntityPickupItemEvent-fixes.patch b/patches/server/0875-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0874-EntityPickupItemEvent-fixes.patch
rename to patches/server/0875-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0877-Elder-Guardian-appearance-API.patch b/patches/server/0878-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0877-Elder-Guardian-appearance-API.patch
rename to patches/server/0878-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0878-Allow-changing-bed-s-occupied-property.patch b/patches/server/0879-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0878-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0879-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0879-Add-entity-knockback-API.patch b/patches/server/0880-Add-entity-knockback-API.patch
similarity index 85%
rename from patches/server/0879-Add-entity-knockback-API.patch
rename to patches/server/0880-Add-entity-knockback-API.patch
index 3ee3120449..d12704179a 100644
--- a/patches/server/0879-Add-entity-knockback-API.patch
+++ b/patches/server/0880-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7909df54223545bb26a3d530f51c11da12dce0e6..6c1ef794af467693f9a62d3312f3c969e46e4835 100644
+index 9add16b4bacd5b823f5f0ffa957f8d79b063edb5..4e1cf7e826298986dafc423d258dd7cd532e63c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1011,5 +1011,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
diff --git a/patches/server/0880-Detect-headless-JREs.patch b/patches/server/0881-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0880-Detect-headless-JREs.patch
rename to patches/server/0881-Detect-headless-JREs.patch
diff --git a/patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0882-optimized-dirt-and-snow-spreading.patch b/patches/server/0883-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0882-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0883-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0883-Added-EntityToggleSitEvent.patch b/patches/server/0884-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0883-Added-EntityToggleSitEvent.patch
rename to patches/server/0884-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0884-Add-fire-tick-delay-option.patch b/patches/server/0885-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0884-Add-fire-tick-delay-option.patch
rename to patches/server/0885-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0885-Add-Moving-Piston-API.patch b/patches/server/0886-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0885-Add-Moving-Piston-API.patch
rename to patches/server/0886-Add-Moving-Piston-API.patch
diff --git a/patches/server/0886-Ignore-impossible-spawn-tick.patch b/patches/server/0887-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0886-Ignore-impossible-spawn-tick.patch
rename to patches/server/0887-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0890-Prevent-compass-from-loading-chunks.patch b/patches/server/0891-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0890-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0891-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0891-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0891-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0894-Add-Player-Warden-Warning-API.patch b/patches/server/0895-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0894-Add-Player-Warden-Warning-API.patch
rename to patches/server/0895-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0896-Add-paper-dumplisteners-command.patch b/patches/server/0897-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0896-Add-paper-dumplisteners-command.patch
rename to patches/server/0897-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0897-check-global-player-list-where-appropriate.patch b/patches/server/0898-check-global-player-list-where-appropriate.patch
similarity index 97%
rename from patches/server/0897-check-global-player-list-where-appropriate.patch
rename to patches/server/0898-check-global-player-list-where-appropriate.patch
index 06093f7117..7647acbf1c 100644
--- a/patches/server/0897-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0898-check-global-player-list-where-appropriate.patch
@@ -24,7 +24,7 @@ index 5bdae591d344fc9b72ffcc1a44fb5e495b1e6bb2..37873ea2876a89ac8ea702ab0a71171e
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 420f4e7d77f2a950a4cce691e57bb2e2ba5bfb23..3b480415f6c862206dd733c6a3ffda451668d24b 100644
+index 79f989f2331ce3276b46ec4436a8db83f1f1f8b2..f5eb57cf35a11d135e3bf998d1cb1ce06fc360ce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3613,7 +3613,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 95%
rename from patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
index b414dd2347..3d040ad44c 100644
--- a/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 445e6bcebb8d4451c6bd547d3efd98dd01a4664f..b86abf25c8e51f8133ae5d58c31d2362d895d947 100644
+index 3b9d7f92f4e47da2d7eb1e9cb9e996ee36b57e4c..d8908ba20280d21a2114afebdf13b1a5520e48e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -401,10 +401,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0899-ItemStack-damage-API.patch b/patches/server/0900-ItemStack-damage-API.patch
similarity index 95%
rename from patches/server/0899-ItemStack-damage-API.patch
rename to patches/server/0900-ItemStack-damage-API.patch
index f5dc7f03b0..fa9d589e57 100644
--- a/patches/server/0899-ItemStack-damage-API.patch
+++ b/patches/server/0900-ItemStack-damage-API.patch
@@ -11,10 +11,10 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6c1ef794af467693f9a62d3312f3c969e46e4835..97b66e029880fc625ecd5dff62e1c949a696fdd0 100644
+index 4e1cf7e826298986dafc423d258dd7cd532e63c1..91c9818de29812ee595a65f9620f075021663e47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1012,6 +1012,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
  
diff --git a/patches/server/0900-Friction-API.patch b/patches/server/0901-Friction-API.patch
similarity index 93%
rename from patches/server/0900-Friction-API.patch
rename to patches/server/0901-Friction-API.patch
index c7b1218572..44b44a55e6 100644
--- a/patches/server/0900-Friction-API.patch
+++ b/patches/server/0901-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3b480415f6c862206dd733c6a3ffda451668d24b..fb3eb0125e524c5a06b21c5a6e80f5b6220460cd 100644
+index f5eb57cf35a11d135e3bf998d1cb1ce06fc360ce..279d3ff3e1568fdf396faf635854e5f83e2bb209 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -54,7 +54,7 @@ index 3b480415f6c862206dd733c6a3ffda451668d24b..fb3eb0125e524c5a06b21c5a6e80f5b6
          if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
              this.getAttributes().load(nbt.getList("Attributes", 10));
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6..52196431a6538872755344859a0454a0e50c3b6e 100644
+index f9c2274c060efdd9b6627ced8485b766aca8951c..b3d809c48b041af03471942213070cc3e0b19f2f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -55,6 +55,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -78,7 +78,7 @@ index 08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6..52196431a6538872755344859a0454a0
                      f1 = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F;
                  }
  
-@@ -369,6 +374,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -367,6 +372,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
@@ -90,7 +90,7 @@ index 08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6..52196431a6538872755344859a0454a0
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("PickupDelay", (short) this.pickupDelay);
-@@ -402,6 +412,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -400,6 +410,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
              this.thrower = nbt.getUUID("Thrower");
          }
  
@@ -132,10 +132,10 @@ index d160db37a3b7ef44b6de8fef209eeccef46c3a95..5e83fabb20bc2b0668cbf48530053ca1
      public int getHealth() {
          return item.health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 97b66e029880fc625ecd5dff62e1c949a696fdd0..736eb990bec434729eb3f3432389ab135436b133 100644
+index 91c9818de29812ee595a65f9620f075021663e47..4b8d619e447d761cb09252388e09c843bbc7d3a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1059,6 +1059,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          });
      }
  
diff --git a/patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0902-Fix-player-kick-on-shutdown.patch b/patches/server/0903-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0902-Fix-player-kick-on-shutdown.patch
rename to patches/server/0903-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0903-Sync-offhand-slot-in-menus.patch b/patches/server/0904-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0903-Sync-offhand-slot-in-menus.patch
rename to patches/server/0904-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0904-Player-Entity-Tracking-Events.patch b/patches/server/0905-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0904-Player-Entity-Tracking-Events.patch
rename to patches/server/0905-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0905-Limit-pet-look-distance.patch b/patches/server/0906-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0905-Limit-pet-look-distance.patch
rename to patches/server/0906-Limit-pet-look-distance.patch
diff --git a/patches/server/0906-Properly-resend-entities.patch b/patches/server/0907-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0906-Properly-resend-entities.patch
rename to patches/server/0907-Properly-resend-entities.patch
diff --git a/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 98%
rename from patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
index 5e58b78f23..bd09f37d61 100644
--- a/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
@@ -70,7 +70,7 @@ index 294d22b6b27e96b59c77527efcfefa9410b756e4..bebcdc70c4cb01764428836fff76f03b
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-index 8f08a977f7433b8237aff26c6d03d821a843c261..b8e536c89b00b8f5a853d3b83512d4f0987c08fd 100644
+index 8aaa3cb2248a02b5ee25251cc837a145edd34341..ecb8224beb0ee65855c7529b69ea56b7b6674664 100644
 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 @@ -81,7 +81,7 @@ public class SnifferEggBlock extends Block {
diff --git a/patches/server/0908-fix-Instruments.patch b/patches/server/0909-fix-Instruments.patch
similarity index 100%
rename from patches/server/0908-fix-Instruments.patch
rename to patches/server/0909-fix-Instruments.patch
diff --git a/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0911-Add-BlockLockCheckEvent.patch b/patches/server/0912-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0911-Add-BlockLockCheckEvent.patch
rename to patches/server/0912-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0912-Add-Sneaking-API-for-Entities.patch b/patches/server/0913-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0912-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0913-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0913-Improve-logging-and-errors.patch b/patches/server/0914-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0913-Improve-logging-and-errors.patch
rename to patches/server/0914-Improve-logging-and-errors.patch
diff --git a/patches/server/0914-Improve-PortalEvents.patch b/patches/server/0915-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0914-Improve-PortalEvents.patch
rename to patches/server/0915-Improve-PortalEvents.patch
diff --git a/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0918-Flying-Fall-Damage.patch b/patches/server/0919-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0918-Flying-Fall-Damage.patch
rename to patches/server/0919-Flying-Fall-Damage.patch
diff --git a/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0921-config-for-disabling-entity-tag-tags.patch b/patches/server/0922-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0921-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0922-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0922-Use-single-player-info-update-packet-on-join.patch b/patches/server/0923-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0922-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0923-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 95%
rename from patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 9edc053a77..415df71963 100644
--- a/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fb3eb0125e524c5a06b21c5a6e80f5b6220460cd..0d710469aea2718d5be7806a565b886316d26b0c 100644
+index 279d3ff3e1568fdf396faf635854e5f83e2bb209..849c1245333f11a1a89e895db24f72f4e878a8b3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1582,7 +1582,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0924-Win-Screen-API.patch b/patches/server/0925-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0924-Win-Screen-API.patch
rename to patches/server/0925-Win-Screen-API.patch
diff --git a/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 93%
rename from patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
index 771edbbe74..b85d1dc31d 100644
--- a/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 3f0c1edcc6bf57a72942b4680fccf27c68ea0a44..dc524fd22ce5f9298e3d73b05d72c1ef7459d9ea 100644
+index 28e6933e5b02d1d2f983968692bffa2b9e572051..ce82f313007762b6d1d9f006f21a8858e2976efb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0926-Fix-force-opening-enchantment-tables.patch b/patches/server/0927-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0926-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0927-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0927-Add-Entity-Body-Yaw-API.patch b/patches/server/0928-Add-Entity-Body-Yaw-API.patch
similarity index 93%
rename from patches/server/0927-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0928-Add-Entity-Body-Yaw-API.patch
index 636f5e1999..fca9a9f776 100644
--- a/patches/server/0927-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0928-Add-Entity-Body-Yaw-API.patch
@@ -41,10 +41,10 @@ index 1186ee7cc4671892346b7173d10125febcfbf88a..4c2818f2ab2c53a836622d0ef17b19ec
      // Paper Start - Collision API
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 736eb990bec434729eb3f3432389ab135436b133..860de727f4eb220d5cce62d0850f240b900412ec 100644
+index 4b8d619e447d761cb09252388e09c843bbc7d3a2..ae1a86798a5d65ec6ee4388c650e09850c3f35f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1051,6 +1051,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
      }
  
diff --git a/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 83%
rename from patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 097c2e3932..2aa53d18ab 100644
--- a/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b3f4469c137d221bf5f43565800df59c06101610..147d802d9207e358fdb2d1c7806fc2f634dcfd98 100644
+index 6b9b5af04fe06c3f5f20a56955bd12bd2ddb7e5c..c24944d24d6e40e853823e6e2653275553157b1f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -531,6 +531,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -615,6 +615,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
              }
diff --git a/patches/server/0930-Add-EntityFertilizeEggEvent.patch b/patches/server/0931-Add-EntityFertilizeEggEvent.patch
similarity index 98%
rename from patches/server/0930-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0931-Add-EntityFertilizeEggEvent.patch
index 933ab6eddf..03174594c8 100644
--- a/patches/server/0930-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0931-Add-EntityFertilizeEggEvent.patch
@@ -69,7 +69,7 @@ index 3de0424a18e0a3b0cd2f755adfa859e474d5c643..94965855233509cbe48cebd690a83ef2
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a4653a660e74f5d65489ddbb7b0e46134f2472c0..eb310003414000d76a150a7acbedc08e9b1d7180 100644
+index ee382cae3feca1de40d95faf6af023c8a7df05b9..3362ded586f723ef1f89ad6dfa872ae468f92933 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2047,4 +2047,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
similarity index 97%
rename from patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
index 8f732ca932..3f0d2bec14 100644
--- a/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0d710469aea2718d5be7806a565b886316d26b0c..dee49691dcaac57ab56195a4dd299a5c23a56bbb 100644
+index 849c1245333f11a1a89e895db24f72f4e878a8b3..bed4490bb87b51867c555313163a6b148458f0e0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2273,7 +2273,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0935-Fix-text-display-error-on-spawn.patch b/patches/server/0936-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0935-Fix-text-display-error-on-spawn.patch
rename to patches/server/0936-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0937-Add-Shearable-API.patch b/patches/server/0938-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0937-Add-Shearable-API.patch
rename to patches/server/0938-Add-Shearable-API.patch
diff --git a/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0940-Optimize-Hoppers.patch b/patches/server/0941-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0940-Optimize-Hoppers.patch
rename to patches/server/0941-Optimize-Hoppers.patch
diff --git a/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0943-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0944-remove-duplicate-animate-packet-for-records.patch b/patches/server/0945-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0944-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0945-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0947-Use-array-for-gamerule-storage.patch b/patches/server/0948-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0947-Use-array-for-gamerule-storage.patch
rename to patches/server/0948-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0950-Add-Mob-Experience-reward-API.patch b/patches/server/0951-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0950-Add-Mob-Experience-reward-API.patch
rename to patches/server/0951-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0954-More-accurate-isInOpenWater-impl.patch b/patches/server/0955-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0954-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0955-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0958-Expand-PlayerItemMendEvent.patch b/patches/server/0959-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0958-Expand-PlayerItemMendEvent.patch
rename to patches/server/0959-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0960-Add-transient-modifier-API.patch b/patches/server/0961-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0960-Add-transient-modifier-API.patch
rename to patches/server/0961-Add-transient-modifier-API.patch
diff --git a/patches/server/0961-Fix-block-place-logic.patch b/patches/server/0962-Fix-block-place-logic.patch
similarity index 96%
rename from patches/server/0961-Fix-block-place-logic.patch
rename to patches/server/0962-Fix-block-place-logic.patch
index 2d077f1757..1dce403dbe 100644
--- a/patches/server/0961-Fix-block-place-logic.patch
+++ b/patches/server/0962-Fix-block-place-logic.patch
@@ -41,10 +41,10 @@ index c9363f01b3c2369d5c63e50977c28a3fa760bae1..6f00794aec16db3e7a466f4b446d38bd
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..f39ab10c5b0b8d86b579a5b683491204c51db70b 100644
+index c24944d24d6e40e853823e6e2653275553157b1f..773bfdd3ed457a352b5329f280c0d10297d579ba 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -646,17 +646,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -730,17 +730,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0964-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0965-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0964-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0965-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0967-Fix-sniffer-removeExploredLocation.patch b/patches/server/0968-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0967-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0968-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
similarity index 91%
rename from patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
index 1c886ee26d..27c4ab1089 100644
--- a/patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 860de727f4eb220d5cce62d0850f240b900412ec..f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124 100644
+index ae1a86798a5d65ec6ee4388c650e09850c3f35f8..b25f5931f836fd4d8695120f0bcb7c52deff8583 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0970-Folia-scheduler-and-owned-region-API.patch b/patches/server/0971-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0970-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0971-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0972-Properly-Cancel-Usable-Items.patch b/patches/server/0973-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0972-Properly-Cancel-Usable-Items.patch
rename to patches/server/0973-Properly-Cancel-Usable-Items.patch
index 54a1a3dca4..9e43caa79e 100644
--- a/patches/server/0972-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0973-Properly-Cancel-Usable-Items.patch
@@ -46,7 +46,7 @@ index 3876bcddb3ab69aee1feb0fe19cb343e097a6824..f61b6e0eea4132347ced3c7c18d02733
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dee49691dcaac57ab56195a4dd299a5c23a56bbb..e11d7283662834047b2ff81a2fd25a4263792deb 100644
+index bed4490bb87b51867c555313163a6b148458f0e0..7763450e85146d43fcf84d380d0e7a8183d83747 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3748,6 +3748,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0973-Add-event-for-player-editing-sign.patch b/patches/server/0974-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0973-Add-event-for-player-editing-sign.patch
rename to patches/server/0974-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0975-Improve-command-function-perm-level-checks.patch b/patches/server/0976-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0975-Improve-command-function-perm-level-checks.patch
rename to patches/server/0976-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0976-Add-option-to-disable-block-updates.patch b/patches/server/0977-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0976-Add-option-to-disable-block-updates.patch
rename to patches/server/0977-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0977-Call-missing-BlockDispenseEvent.patch b/patches/server/0978-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0977-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0978-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0979-Optimize-player-lookups-for-beacons.patch b/patches/server/0980-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0979-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0980-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0980-Add-Sign-getInteractableSideFor.patch b/patches/server/0981-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0980-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0981-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0981-Array-backed-synched-entity-data.patch b/patches/server/0982-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0981-Array-backed-synched-entity-data.patch
rename to patches/server/0982-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0982-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0982-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0984-Fix-BanList-API.patch b/patches/server/0985-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0984-Fix-BanList-API.patch
rename to patches/server/0985-Fix-BanList-API.patch
diff --git a/patches/server/0985-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0986-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0985-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0986-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0987-Fix-possible-NPE-on-painting-creation.patch
similarity index 95%
rename from patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0987-Fix-possible-NPE-on-painting-creation.patch
index 44fb375c6f..36cecd13d0 100644
--- a/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0987-Fix-possible-NPE-on-painting-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index b86abf25c8e51f8133ae5d58c31d2362d895d947..602b09323e0f1fda64ced1c285bfe2dbd854bb54 100644
+index d8908ba20280d21a2114afebdf13b1a5520e48e7..3d2b01a04bb0bf4aaa3bbc7550f13e953ed16895 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -916,6 +916,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0989-Don-t-tick-signs.patch b/patches/server/0990-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0989-Don-t-tick-signs.patch
rename to patches/server/0990-Don-t-tick-signs.patch
diff --git a/patches/server/0990-Configurable-Region-Compression-Format.patch b/patches/server/0991-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0990-Configurable-Region-Compression-Format.patch
rename to patches/server/0991-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0992-Add-whitelist-events.patch b/patches/server/0993-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0992-Add-whitelist-events.patch
rename to patches/server/0993-Add-whitelist-events.patch
diff --git a/patches/server/0993-Implement-PlayerFailMoveEvent.patch b/patches/server/0994-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0993-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0994-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0995-API-for-updating-recipes-on-clients.patch b/patches/server/0996-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0995-API-for-updating-recipes-on-clients.patch
rename to patches/server/0996-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0996-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0997-Fix-rotation-when-spawning-display-entities.patch
similarity index 88%
rename from patches/server/0996-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0997-Fix-rotation-when-spawning-display-entities.patch
index d842654fd9..c900f445f1 100644
--- a/patches/server/0996-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0997-Fix-rotation-when-spawning-display-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotation when spawning display entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 602b09323e0f1fda64ced1c285bfe2dbd854bb54..afac16a5f40ca4bce57c267183d9b61298233cbc 100644
+index 3d2b01a04bb0bf4aaa3bbc7550f13e953ed16895..e3501ff996487bc1020470a5bf7c892dbfcdaacd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -986,6 +986,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0997-Only-capture-actual-tree-growth.patch b/patches/server/0998-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0997-Only-capture-actual-tree-growth.patch
rename to patches/server/0998-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0999-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0999-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/1000-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 97%
rename from patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/1000-Respect-randomizeData-on-more-entities-when-spawning.patch
index ba652f02d1..7d2fd2d075 100644
--- a/patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/1000-Respect-randomizeData-on-more-entities-when-spawning.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Respect randomizeData on more entities when spawning
 * ExperienceOrb
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index afac16a5f40ca4bce57c267183d9b61298233cbc..e2a3510cb2208f9cd4fc92d022ff5055a4cced45 100644
+index e3501ff996487bc1020470a5bf7c892dbfcdaacd..bf2cd1eb04c10b8422ddca8efd397290bf58ea4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -603,6 +603,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/1000-Use-correct-seed-on-api-world-load.patch b/patches/server/1001-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/1000-Use-correct-seed-on-api-world-load.patch
rename to patches/server/1001-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/1002-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/1002-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/1002-Cache-map-ids-on-item-frames.patch b/patches/server/1003-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/1002-Cache-map-ids-on-item-frames.patch
rename to patches/server/1003-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/1003-Fix-custom-statistic-criteria-creation.patch b/patches/server/1004-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/1003-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/1004-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/1004-Bandaid-fix-for-Effect.patch b/patches/server/1005-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/1004-Bandaid-fix-for-Effect.patch
rename to patches/server/1005-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/1005-SculkCatalyst-bloom-API.patch b/patches/server/1006-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/1005-SculkCatalyst-bloom-API.patch
rename to patches/server/1006-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/1006-API-for-an-entity-s-scoreboard-name.patch b/patches/server/1007-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/1006-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/1007-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/1007-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/1007-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1008-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/1009-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/1008-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/1009-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/1009-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/1009-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/1010-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/1011-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/1010-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/1011-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/1011-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/1012-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/1011-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/1012-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/1012-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/1013-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/1012-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/1013-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/1013-Add-Listing-API-for-Player.patch b/patches/server/1014-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/1013-Add-Listing-API-for-Player.patch
rename to patches/server/1014-Add-Listing-API-for-Player.patch
diff --git a/patches/server/1014-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1015-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/1014-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/1015-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1015-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1016-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/1015-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/1016-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1016-Expand-Pose-API.patch b/patches/server/1017-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/1016-Expand-Pose-API.patch
rename to patches/server/1017-Expand-Pose-API.patch
diff --git a/patches/server/1017-More-DragonBattle-API.patch b/patches/server/1018-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/1017-More-DragonBattle-API.patch
rename to patches/server/1018-More-DragonBattle-API.patch
diff --git a/patches/server/1018-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1019-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/1018-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/1019-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1019-Add-PlayerPickItemEvent.patch b/patches/server/1020-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/1019-Add-PlayerPickItemEvent.patch
rename to patches/server/1020-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1020-Improve-performance-of-mass-crafts.patch b/patches/server/1021-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1020-Improve-performance-of-mass-crafts.patch
rename to patches/server/1021-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1021-Allow-trident-custom-damage.patch b/patches/server/1022-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/1021-Allow-trident-custom-damage.patch
rename to patches/server/1022-Allow-trident-custom-damage.patch
diff --git a/patches/server/1022-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1023-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/1022-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/1023-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1023-Optimize-nearest-structure-border-iteration.patch b/patches/server/1024-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1023-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/1024-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1024-Implement-OfflinePlayer-isConnected.patch b/patches/server/1025-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/1024-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1025-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1025-Fix-inventory-desync.patch b/patches/server/1026-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1025-Fix-inventory-desync.patch
rename to patches/server/1026-Fix-inventory-desync.patch
diff --git a/patches/server/1026-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1027-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1026-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1027-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1027-Configure-sniffer-egg-hatch-time.patch b/patches/server/1028-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1027-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1028-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1028-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1029-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1028-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1029-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1030-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1030-Skip-POI-finding-if-stuck-in-vehicle.patch
new file mode 100644
index 0000000000..e45ced771d
--- /dev/null
+++ b/patches/server/1030-Skip-POI-finding-if-stuck-in-vehicle.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paul Sauve <paul@technove.co>
+Date: Thu, 18 Feb 2021 13:13:27 -0600
+Subject: [PATCH] Skip POI finding if stuck in vehicle
+
+Copyright (C) 2020 Technove LLC
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..8f8b29f80d1573981ccffd207dd6e0941e71a352 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+@@ -47,6 +47,7 @@ public class AcquirePoi {
+                         return false;
+                     } else {
+                         mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20));
++                        if (entity.getNavigation().isStuck()) mutableLong.add(200); // Paper - Wait an additional 10s to check again if they're stuck
+                         PoiManager poiManager = world.getPoiManager();
+                         long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
+                             return !entry.getValue().isStillValid(time);