Delete patch to fix #9612 (#9621)

PaperMC · Aug 17, 2023 · ea1f33c · ea1f33c
1 parent 73af2d4
commit ea1f33c
Show file tree

Hide file tree

Showing 578 changed files with 94 additions and 141 deletions.
diff --git a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/...vert-legacy-attributes-in-Item-Meta.patch → ...vert-legacy-attributes-in-Item-Meta.patch b/...vert-legacy-attributes-in-Item-Meta.patch → ...vert-legacy-attributes-in-Item-Meta.patch
diff --git a/...Remove-some-streams-from-structures.patch → ...Remove-some-streams-from-structures.patch b/...Remove-some-streams-from-structures.patch → ...Remove-some-streams-from-structures.patch
diff --git a/...rom-classes-related-villager-gossip.patch → ...rom-classes-related-villager-gossip.patch b/...rom-classes-related-villager-gossip.patch → ...rom-classes-related-villager-gossip.patch
diff --git a/...0431-Support-components-in-ItemMeta.patch → ...0430-Support-components-in-ItemMeta.patch b/...0431-Support-components-in-ItemMeta.patch → ...0430-Support-components-in-ItemMeta.patch
diff --git a/...e-fix-EntityTargetLivingEntityEvent.patch → ...e-fix-EntityTargetLivingEntityEvent.patch b/...e-fix-EntityTargetLivingEntityEvent.patch → ...e-fix-EntityTargetLivingEntityEvent.patch
diff --git a/...s/server/0433-Add-entity-liquid-API.patch → ...s/server/0432-Add-entity-liquid-API.patch b/...s/server/0433-Add-entity-liquid-API.patch → ...s/server/0432-Add-entity-liquid-API.patch
diff --git a/...date-itemstack-legacy-name-and-lore.patch → ...date-itemstack-legacy-name-and-lore.patch b/...date-itemstack-legacy-name-and-lore.patch → ...date-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7d80eded30109982fd3a1b815ba5dff4b699689a..dcb01c399d2b30d907bfc51584215d9300b6d23e 100644
+index 0caf3eeb7984e842f7a0bdfed3021d0b231a0dd0..ee274fb9c8292a807e438902cc5d7f49c30d6627 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -171,6 +171,44 @@ public final class ItemStack {

diff --git a/...wn-player-in-correct-world-on-login.patch → ...wn-player-in-correct-world-on-login.patch b/...wn-player-in-correct-world-on-login.patch → ...wn-player-in-correct-world-on-login.patch
diff --git a/.../server/0436-Add-PrepareResultEvent.patch → .../server/0435-Add-PrepareResultEvent.patch b/.../server/0436-Add-PrepareResultEvent.patch → .../server/0435-Add-PrepareResultEvent.patch
diff --git a/...-for-portal-on-world-gen-entity-add.patch → ...-for-portal-on-world-gen-entity-add.patch b/...-for-portal-on-world-gen-entity-add.patch → ...-for-portal-on-world-gen-entity-add.patch
diff --git a/...e-NetworkManager-Exception-Handling.patch → ...e-NetworkManager-Exception-Handling.patch b/...e-NetworkManager-Exception-Handling.patch → ...e-NetworkManager-Exception-Handling.patch
diff --git a/...x-arrows-never-despawning-MC-125757.patch → ...x-arrows-never-despawning-MC-125757.patch b/...x-arrows-never-despawning-MC-125757.patch → ...x-arrows-never-despawning-MC-125757.patch
diff --git a/...Vanilla-Command-permission-checking.patch → ...Vanilla-Command-permission-checking.patch b/...Vanilla-Command-permission-checking.patch → ...Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0441-Fix-SPIGOT-5989.patch → patches/server/0440-Fix-SPIGOT-5989.patch b/patches/server/0441-Fix-SPIGOT-5989.patch → patches/server/0440-Fix-SPIGOT-5989.patch
diff --git a/...-Bukkit-world-container-is-not-used.patch → ...-Bukkit-world-container-is-not-used.patch b/...-Bukkit-world-container-is-not-used.patch → ...-Bukkit-world-container-is-not-used.patch
diff --git a/...5885-Unable-to-disable-advancements.patch → ...5885-Unable-to-disable-advancements.patch b/...5885-Unable-to-disable-advancements.patch → ...5885-Unable-to-disable-advancements.patch
diff --git a/...taPlayer-leak-due-from-quitting-ear.patch → ...taPlayer-leak-due-from-quitting-ear.patch b/...taPlayer-leak-due-from-quitting-ear.patch → ...taPlayer-leak-due-from-quitting-ear.patch
diff --git a/...ix-some-rails-connecting-improperly.patch → ...ix-some-rails-connecting-improperly.patch b/...ix-some-rails-connecting-improperly.patch → ...ix-some-rails-connecting-improperly.patch
diff --git a/...stake-in-CB-NBT-int-deserialization.patch → ...stake-in-CB-NBT-int-deserialization.patch b/...stake-in-CB-NBT-int-deserialization.patch → ...stake-in-CB-NBT-int-deserialization.patch
diff --git a/...rver-load-chunks-from-newer-version.patch → ...rver-load-chunks-from-newer-version.patch b/...rver-load-chunks-from-newer-version.patch → ...rver-load-chunks-from-newer-version.patch
diff --git a/patches/server/0448-Brand-support.patch → patches/server/0447-Brand-support.patch b/patches/server/0448-Brand-support.patch → patches/server/0447-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f3cd16845d5ea265666f5535b7f893e0a9d0fcf..a37a29d771511b960c6c033b649833c223f40990 100644
+index 2f0fb75a35a1fa45614621da9e24cec6e842b693..a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -304,6 +304,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...PickupItemAnimation-to-LivingEntity.patch → ...PickupItemAnimation-to-LivingEntity.patch b/...PickupItemAnimation-to-LivingEntity.patch → ...PickupItemAnimation-to-LivingEntity.patch
diff --git a/...rver/0450-Don-t-require-FACING-data.patch → ...rver/0449-Don-t-require-FACING-data.patch b/...rver/0450-Don-t-require-FACING-data.patch → ...rver/0449-Don-t-require-FACING-data.patch
diff --git a/...eEvent-not-firing-for-all-use-cases.patch → ...eEvent-not-firing-for-all-use-cases.patch b/...eEvent-not-firing-for-all-use-cases.patch → ...eEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0452-Add-moon-phase-API.patch → patches/server/0451-Add-moon-phase-API.patch b/patches/server/0452-Add-moon-phase-API.patch → patches/server/0451-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 4dc5c75d1fa0748b6e7e95d90b92a865b2f6362e..0452a59d6eec947589b4791c977327046f7b0d6e 100644
+index 91fbc67eefea473211b99e4338f6464f58dc5592..b5981001d8ad4d6c79b965be9a446352971b0d29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -980,4 +980,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {

diff --git a/...headless-pistons-from-being-created.patch → ...headless-pistons-from-being-created.patch b/...headless-pistons-from-being-created.patch → ...headless-pistons-from-being-created.patch
diff --git a/patches/server/0454-Add-BellRingEvent.patch → patches/server/0453-Add-BellRingEvent.patch b/patches/server/0454-Add-BellRingEvent.patch → patches/server/0453-Add-BellRingEvent.patch
diff --git a/...dd-zombie-targets-turtle-egg-config.patch → ...dd-zombie-targets-turtle-egg-config.patch b/...dd-zombie-targets-turtle-egg-config.patch → ...dd-zombie-targets-turtle-egg-config.patch
diff --git a/...s/server/0456-Buffer-joins-to-world.patch → ...s/server/0455-Buffer-joins-to-world.patch b/...s/server/0456-Buffer-joins-to-world.patch → ...s/server/0455-Buffer-joins-to-world.patch
diff --git a/...-Eigencraft-redstone-implementation.patch → ...-Eigencraft-redstone-implementation.patch b/...-Eigencraft-redstone-implementation.patch → ...-Eigencraft-redstone-implementation.patch
diff --git a/...s-not-working-in-some-kick-messages.patch → ...s-not-working-in-some-kick-messages.patch b/...s-not-working-in-some-kick-messages.patch → ...s-not-working-in-some-kick-messages.patch
diff --git a/...reateEvent-needs-to-know-its-entity.patch → ...reateEvent-needs-to-know-its-entity.patch b/...reateEvent-needs-to-know-its-entity.patch → ...reateEvent-needs-to-know-its-entity.patch
diff --git a/...hes/server/0460-Add-more-Evoker-API.patch → ...hes/server/0459-Add-more-Evoker-API.patch b/...hes/server/0460-Add-more-Evoker-API.patch → ...hes/server/0459-Add-more-Evoker-API.patch
diff --git a/...Add-methods-to-get-translation-keys.patch → ...Add-methods-to-get-translation-keys.patch b/...Add-methods-to-get-translation-keys.patch → ...Add-methods-to-get-translation-keys.patch
diff --git a/...te-HoverEvent-from-ItemStack-Entity.patch → ...te-HoverEvent-from-ItemStack-Entity.patch b/...te-HoverEvent-from-ItemStack-Entity.patch → ...te-HoverEvent-from-ItemStack-Entity.patch
diff --git a/...erver/0463-Cache-block-data-strings.patch → ...erver/0462-Cache-block-data-strings.patch b/...erver/0463-Cache-block-data-strings.patch → ...erver/0462-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56e98ea2964c2779537ac607b7c4677bc695d92a..0ed8add0a2acec7d109f9687b7d77967a7ccdf3e 100644
+index f704725928b0ec05ffff554901e7558ef8f308d6..1a8bc8d508202012130441397fe1a404fb1357fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...rtation-and-cancel-velocity-if-tele.patch → ...rtation-and-cancel-velocity-if-tele.patch b/...rtation-and-cancel-velocity-if-tele.patch → ...rtation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f43de26f3d757dc14572c2d42dd8b6694e9fb0a..4341fdd364194690a4f2329bbf4415c455a144bf 100644
+index a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b..d7696d0bf090adb403e9461c93f0649585985d50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -762,7 +762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...l-open-container-api-to-HumanEntity.patch → ...l-open-container-api-to-HumanEntity.patch b/...l-open-container-api-to-HumanEntity.patch → ...l-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 55a3035516552f4d429ae5f36bacb1b4c4d5666c..b0d2038cf2622c8ee7f810026ed735ff954d7ad0 100644
+index 63208cf28a7ea005f9f328281676ed113ae23a00..f4cda5fbf12c59dc1ecec4aac6719837444382e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {

diff --git a/...aFixerUpper-Rewrite-Rules-on-demand.patch → ...aFixerUpper-Rewrite-Rules-on-demand.patch b/...aFixerUpper-Rewrite-Rules-on-demand.patch → ...aFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/...-capture-to-capture-all-items-added.patch → ...-capture-to-capture-all-items-added.patch b/...-capture-to-capture-all-items-added.patch → ...-capture-to-capture-all-items-added.patch
diff --git a/...-Counter-to-allow-plugins-to-use-va.patch → ...-Counter-to-allow-plugins-to-use-va.patch b/...-Counter-to-allow-plugins-to-use-va.patch → ...-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4cac7ae766e71fedfd2be8d17741ffd40ae1cee4..b8f49e7b8727c757950a74c834eed4871de0e4ce 100644
+index fca862584439c87b049af4cdd9f79fe4ee30ea40..71d2557e6e244384042ce3b13cc6e3008227399d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4433,4 +4433,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/...track-plugin-scoreboards-by-default.patch → ...track-plugin-scoreboards-by-default.patch b/...track-plugin-scoreboards-by-default.patch → ...track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0470-Entity-isTicking.patch → patches/server/0469-Entity-isTicking.patch b/patches/server/0470-Entity-isTicking.patch → patches/server/0469-Entity-isTicking.patch
diff --git a/...non-whitelisted-player-when-white-l.patch → ...non-whitelisted-player-when-white-l.patch b/...non-whitelisted-player-when-white-l.patch → ...non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0ed8add0a2acec7d109f9687b7d77967a7ccdf3e..412e5db21a83e9ca6ba5aa0d457507ce51176ebc 100644
+index 1a8bc8d508202012130441397fe1a404fb1357fd..8ca3bb41307f1f7ba1b1340981cc37e331fa9388 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2132,13 +2132,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...-Concurrency-issue-in-ShufflingList.patch → ...-Concurrency-issue-in-ShufflingList.patch b/...-Concurrency-issue-in-ShufflingList.patch → ...-Concurrency-issue-in-ShufflingList.patch
diff --git a/...eset-Ender-Crystals-on-Dragon-Spawn.patch → ...eset-Ender-Crystals-on-Dragon-Spawn.patch b/...eset-Ender-Crystals-on-Dragon-Spawn.patch → ...eset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/...-large-move-vectors-crashing-server.patch → ...-large-move-vectors-crashing-server.patch b/...-large-move-vectors-crashing-server.patch → ...-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4341fdd364194690a4f2329bbf4415c455a144bf..7d70b03b7b5e283ce5cbeb99d2cb61a48cc70932 100644
+index d7696d0bf090adb403e9461c93f0649585985d50..87f3ac68e8e60ac8c890280d491c326a1575f810 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/.../server/0475-Optimise-getType-calls.patch → .../server/0474-Optimise-getType-calls.patch b/.../server/0475-Optimise-getType-calls.patch → .../server/0474-Optimise-getType-calls.patch
diff --git a/...es/server/0476-Villager-resetOffers.patch → ...es/server/0475-Villager-resetOffers.patch b/...es/server/0476-Villager-resetOffers.patch → ...es/server/0475-Villager-resetOffers.patch
diff --git a/...ce-order-when-capturing-blockstates.patch → ...ce-order-when-capturing-blockstates.patch b/...ce-order-when-capturing-blockstates.patch → ...ce-order-when-capturing-blockstates.patch
diff --git a/...lockpos-allocation-from-pathfinding.patch → ...lockpos-allocation-from-pathfinding.patch b/...lockpos-allocation-from-pathfinding.patch → ...lockpos-allocation-from-pathfinding.patch
diff --git a/...em-locations-dropped-from-campfires.patch → ...em-locations-dropped-from-campfires.patch b/...em-locations-dropped-from-campfires.patch → ...em-locations-dropped-from-campfires.patch
diff --git a/...server/0480-Player-elytra-boost-API.patch → ...server/0479-Player-elytra-boost-API.patch b/...server/0480-Player-elytra-boost-API.patch → ...server/0479-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a407bb7854f8a100fbf52f2268c3f1e5531c9bf5..09c1fc712e6913c338132770e616bb00f2c291d6 100644
+index d5f03bd485403fd2222bba0dbbf37e438b99ef28..5179e70d91bdbf2f466e15ade3466f30e8a3fe2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -624,6 +624,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

diff --git a/...81-Fixed-TileEntityBell-memory-leak.patch → ...80-Fixed-TileEntityBell-memory-leak.patch b/...81-Fixed-TileEntityBell-memory-leak.patch → ...80-Fixed-TileEntityBell-memory-leak.patch
diff --git a/...ing-up-when-item-stack-is-empty-in-.patch → ...ing-up-when-item-stack-is-empty-in-.patch b/...ing-up-when-item-stack-is-empty-in-.patch → ...ing-up-when-item-stack-is-empty-in-.patch
diff --git a/...Add-getOfflinePlayerIfCached-String.patch → ...Add-getOfflinePlayerIfCached-String.patch b/...Add-getOfflinePlayerIfCached-String.patch → ...Add-getOfflinePlayerIfCached-String.patch
diff --git a/...erver/0484-Add-ignore-discounts-API.patch → ...erver/0483-Add-ignore-discounts-API.patch b/...erver/0484-Add-ignore-discounts-API.patch → ...erver/0483-Add-ignore-discounts-API.patch
diff --git a/...Toggle-for-removing-existing-dragon.patch → ...Toggle-for-removing-existing-dragon.patch b/...Toggle-for-removing-existing-dragon.patch → ...Toggle-for-removing-existing-dragon.patch
diff --git a/...x-client-lag-on-advancement-loading.patch → ...x-client-lag-on-advancement-loading.patch b/...x-client-lag-on-advancement-loading.patch → ...x-client-lag-on-advancement-loading.patch
diff --git a/...r/0487-Item-no-age-no-player-pickup.patch → ...r/0486-Item-no-age-no-player-pickup.patch b/...r/0487-Item-no-age-no-player-pickup.patch → ...r/0486-Item-no-age-no-player-pickup.patch
diff --git a/...er-Remove-Streams-Optimized-collect.patch → ...er-Remove-Streams-Optimized-collect.patch b/...er-Remove-Streams-Optimized-collect.patch → ...er-Remove-Streams-Optimized-collect.patch
diff --git a/...489-Beacon-API-custom-effect-ranges.patch → ...488-Beacon-API-custom-effect-ranges.patch b/...489-Beacon-API-custom-effect-ranges.patch → ...488-Beacon-API-custom-effect-ranges.patch
diff --git a/...server/0490-Add-API-for-quit-reason.patch → ...server/0489-Add-API-for-quit-reason.patch b/...server/0490-Add-API-for-quit-reason.patch → ...server/0489-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index e087b62f88157d57eb037feb0d39c076b286f755..0b81878a951643af1ce785b3adcca9b3
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7d70b03b7b5e283ce5cbeb99d2cb61a48cc70932..c6a1e8246ac22e83121cb17eee8e00ab1dd48306 100644
+index 87f3ac68e8e60ac8c890280d491c326a1575f810..a82b911450feb011cc8776a0dece478bb94d4221 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -509,6 +509,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...ng-Trader-spawn-rate-config-options.patch → ...ng-Trader-spawn-rate-config-options.patch b/...ng-Trader-spawn-rate-config-options.patch → ...ng-Trader-spawn-rate-config-options.patch
diff --git a/...erver/0492-Expose-world-spawn-angle.patch → ...erver/0491-Expose-world-spawn-angle.patch b/...erver/0492-Expose-world-spawn-angle.patch → ...erver/0491-Expose-world-spawn-angle.patch
diff --git a/...s/server/0493-Add-Destroy-Speed-API.patch → ...s/server/0492-Add-Destroy-Speed-API.patch b/...s/server/0493-Add-Destroy-Speed-API.patch → ...s/server/0492-Add-Destroy-Speed-API.patch
diff --git a/...-spawnParticle-x-y-z-precision-loss.patch → ...-spawnParticle-x-y-z-precision-loss.patch b/...-spawnParticle-x-y-z-precision-loss.patch → ...-spawnParticle-x-y-z-precision-loss.patch
diff --git a/...95-Add-LivingEntity-clearActiveItem.patch → ...94-Add-LivingEntity-clearActiveItem.patch b/...95-Add-LivingEntity-clearActiveItem.patch → ...94-Add-LivingEntity-clearActiveItem.patch
diff --git a/...er/0496-Add-PlayerItemCooldownEvent.patch → ...er/0495-Add-PlayerItemCooldownEvent.patch b/...er/0496-Add-PlayerItemCooldownEvent.patch → ...er/0495-Add-PlayerItemCooldownEvent.patch
diff --git a/...rove-performance-of-the-end-generat.patch → ...rove-performance-of-the-end-generat.patch b/...rove-performance-of-the-end-generat.patch → ...rove-performance-of-the-end-generat.patch
diff --git a/patches/server/0498-More-lightning-API.patch → patches/server/0497-More-lightning-API.patch b/patches/server/0498-More-lightning-API.patch → patches/server/0497-More-lightning-API.patch
diff --git a/...should-not-bypass-cramming-gamerule.patch → ...should-not-bypass-cramming-gamerule.patch b/...should-not-bypass-cramming-gamerule.patch → ...should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0718a0cc2ed15a5350b1ee77747d93c6a92048d..57b85654c5af2e3c3681e3a03c11d5a02703749d 100644
+index 73a2ddf2806ea1e1826d553b7d13cf4d58be43fc..01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2049,6 +2049,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/...-missing-default-perms-for-commands.patch → ...-missing-default-perms-for-commands.patch b/...-missing-default-perms-for-commands.patch → ...-missing-default-perms-for-commands.patch
diff --git a/...rver/0501-Add-PlayerShearBlockEvent.patch → ...rver/0500-Add-PlayerShearBlockEvent.patch b/...rver/0501-Add-PlayerShearBlockEvent.patch → ...rver/0500-Add-PlayerShearBlockEvent.patch
diff --git a/...ng-zombie-villager-discount-exploit.patch → ...ng-zombie-villager-discount-exploit.patch b/...ng-zombie-villager-discount-exploit.patch → ...ng-zombie-villager-discount-exploit.patch
diff --git a/...es/server/0503-Limit-recipe-packets.patch → ...es/server/0502-Limit-recipe-packets.patch b/...es/server/0503-Limit-recipe-packets.patch → ...es/server/0502-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 25a01e0a6dc87bc5785d1ede6a7344fcdc9daf7e..e1999066bb12d39a03dca00f99618045b2cee471 100644
+index a82b911450feb011cc8776a0dece478bb94d4221..9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -268,6 +268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...-CraftSound-backwards-compatibility.patch → ...-CraftSound-backwards-compatibility.patch b/...-CraftSound-backwards-compatibility.patch → ...-CraftSound-backwards-compatibility.patch
diff --git a/...505-Player-Chunk-Load-Unload-Events.patch → ...504-Player-Chunk-Load-Unload-Events.patch b/...505-Player-Chunk-Load-Unload-Events.patch → ...504-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index abde8074da754667d65f3894097ad2255c97f3f0..fa9c1f323ef372c8a8210118eae0558da58c3c4e 100644
+index 0b81878a951643af1ce785b3adcca9b3eec7f1c3..4581bdf4525c05df235e47ab772fbf5c5f2d6b50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2232,11 +2232,21 @@ public class ServerPlayer extends Player {

diff --git a/...6-Optimize-Dynamic-get-Missing-Keys.patch → ...5-Optimize-Dynamic-get-Missing-Keys.patch b/...6-Optimize-Dynamic-get-Missing-Keys.patch → ...5-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/...-Expose-LivingEntity-hurt-direction.patch → ...-Expose-LivingEntity-hurt-direction.patch b/...-Expose-LivingEntity-hurt-direction.patch → ...-Expose-LivingEntity-hurt-direction.patch
diff --git a/...OBSTRUCTED-reason-to-BedEnterResult.patch → ...OBSTRUCTED-reason-to-BedEnterResult.patch b/...OBSTRUCTED-reason-to-BedEnterResult.patch → ...OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/...-invalid-ingredient-lists-in-Villag.patch → ...-invalid-ingredient-lists-in-Villag.patch b/...-invalid-ingredient-lists-in-Villag.patch → ...-invalid-ingredient-lists-in-Villag.patch
diff --git a/...rTradeEvent-and-PlayerPurchaseEvent.patch → ...rTradeEvent-and-PlayerPurchaseEvent.patch b/...rTradeEvent-and-PlayerPurchaseEvent.patch → ...rTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/...erver/0511-Implement-TargetHitEvent.patch → ...erver/0510-Implement-TargetHitEvent.patch b/...erver/0511-Implement-TargetHitEvent.patch → ...erver/0510-Implement-TargetHitEvent.patch
diff --git a/.../0512-MC-4-Fix-item-position-desync.patch → .../0511-MC-4-Fix-item-position-desync.patch b/.../0512-MC-4-Fix-item-position-desync.patch → .../0511-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 5ca3ad7b3d7606accd0a58b3c708fadb349608f7..4b6e0fe2fabcc55007fd8979e81f66df
 
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57b85654c5af2e3c3681e3a03c11d5a02703749d..7d244133234c35f8f5f3769d8fd8aacba9a65998 100644
+index 01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2..1bca9f5d58c5adfff3610ab1e7296de3647adaec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4221,6 +4221,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/...513-Additional-Block-Material-API-s.patch → ...512-Additional-Block-Material-API-s.patch b/...513-Additional-Block-Material-API-s.patch → ...512-Additional-Block-Material-API-s.patch
diff --git a/...server/0514-Fix-harming-potion-dupe.patch → ...server/0513-Fix-harming-potion-dupe.patch b/...server/0514-Fix-harming-potion-dupe.patch → ...server/0513-Fix-harming-potion-dupe.patch
diff --git a/...get-Material-from-Boats-and-Minecar.patch → ...get-Material-from-Boats-and-Minecar.patch b/...get-Material-from-Boats-and-Minecar.patch → ...get-Material-from-Boats-and-Minecar.patch
diff --git a/...es/server/0516-Cache-burn-durations.patch → ...es/server/0515-Cache-burn-durations.patch b/...es/server/0516-Cache-burn-durations.patch → ...es/server/0515-Cache-burn-durations.patch
diff --git a/...ob-spawner-spawn-egg-transformation.patch → ...ob-spawner-spawn-egg-transformation.patch b/...ob-spawner-spawn-egg-transformation.patch → ...ob-spawner-spawn-egg-transformation.patch
diff --git a/...ix-Not-a-string-Map-Conversion-spam.patch → ...ix-Not-a-string-Map-Conversion-spam.patch b/...ix-Not-a-string-Map-Conversion-spam.patch → ...ix-Not-a-string-Map-Conversion-spam.patch
diff --git a/...ment-PlayerFlowerPotManipulateEvent.patch → ...ment-PlayerFlowerPotManipulateEvent.patch b/...ment-PlayerFlowerPotManipulateEvent.patch → ...ment-PlayerFlowerPotManipulateEvent.patch
diff --git a/...ct-event-not-being-called-sometimes.patch → ...ct-event-not-being-called-sometimes.patch b/...ct-event-not-being-called-sometimes.patch → ...ct-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1636c313994dc4b3ae4c19fc66137bd080a501c..ec1d92a71518b9329e81f12bc8ccef846fefc168 100644
+index 9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e..d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...rver/0521-Zombie-API-breaking-doors.patch → ...rver/0520-Zombie-API-breaking-doors.patch b/...rver/0521-Zombie-API-breaking-doors.patch → ...rver/0520-Zombie-API-breaking-doors.patch
diff --git a/...522-Fix-nerfed-slime-when-splitting.patch → ...521-Fix-nerfed-slime-when-splitting.patch b/...522-Fix-nerfed-slime-when-splitting.patch → ...521-Fix-nerfed-slime-when-splitting.patch
diff --git a/...er/0523-Add-EntityLoadCrossbowEvent.patch → ...er/0522-Add-EntityLoadCrossbowEvent.patch b/...er/0523-Add-EntityLoadCrossbowEvent.patch → ...er/0522-Add-EntityLoadCrossbowEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityLoadCrossbowEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 9bea5e94c246d843f3d67680ffb57075bd9d3467..a433910fb4d0bd8d7b6b0d66c8fc88d62a0e4879 100644
+index ba570f1c9654e1004e068a1efe2118f36c954505..eede02c3f125d230af537bb67bebed9b88f7d1b4 100644
 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
 +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
 @@ -89,7 +89,14 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {

diff --git a/...0524-Added-WorldGameRuleChangeEvent.patch → ...0523-Added-WorldGameRuleChangeEvent.patch b/...0524-Added-WorldGameRuleChangeEvent.patch → ...0523-Added-WorldGameRuleChangeEvent.patch
diff --git a/...-Added-ServerResourcesReloadedEvent.patch → ...-Added-ServerResourcesReloadedEvent.patch b/...-Added-ServerResourcesReloadedEvent.patch → ...-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 412e5db21a83e9ca6ba5aa0d457507ce51176ebc..d29b66d9db69309087ee2eac2561ab2fcd797eb8 100644
+index 8ca3bb41307f1f7ba1b1340981cc37e331fa9388..676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...d-settings-for-mobs-picking-up-loot.patch → ...d-settings-for-mobs-picking-up-loot.patch b/...d-settings-for-mobs-picking-up-loot.patch → ...d-settings-for-mobs-picking-up-loot.patch
diff --git a/...mplemented-BlockFailedDispenseEvent.patch → ...mplemented-BlockFailedDispenseEvent.patch b/...mplemented-BlockFailedDispenseEvent.patch → ...mplemented-BlockFailedDispenseEvent.patch
diff --git a/...-Added-PlayerLecternPageChangeEvent.patch → ...-Added-PlayerLecternPageChangeEvent.patch b/...-Added-PlayerLecternPageChangeEvent.patch → ...-Added-PlayerLecternPageChangeEvent.patch
diff --git a/...-Added-PlayerLoomPatternSelectEvent.patch → ...-Added-PlayerLoomPatternSelectEvent.patch b/...-Added-PlayerLoomPatternSelectEvent.patch → ...-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/...nfigurable-door-breaking-difficulty.patch → ...nfigurable-door-breaking-difficulty.patch b/...nfigurable-door-breaking-difficulty.patch → ...nfigurable-door-breaking-difficulty.patch
diff --git a/...ty-commands-shall-not-be-dispatched.patch → ...ty-commands-shall-not-be-dispatched.patch b/...ty-commands-shall-not-be-dispatched.patch → ...ty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0532-Remove-stale-POIs.patch → patches/server/0531-Remove-stale-POIs.patch b/patches/server/0532-Remove-stale-POIs.patch → patches/server/0531-Remove-stale-POIs.patch
diff --git a/...rver/0533-Fix-villager-boat-exploit.patch → ...rver/0532-Fix-villager-boat-exploit.patch b/...rver/0533-Fix-villager-boat-exploit.patch → ...rver/0532-Fix-villager-boat-exploit.patch
diff --git a/...hes/server/0534-Add-sendOpLevel-API.patch → ...hes/server/0533-Add-sendOpLevel-API.patch b/...hes/server/0534-Add-sendOpLevel-API.patch → ...hes/server/0533-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 13e2fb9e48ed8722b68b2ce2994d9d84bb22cee4..600bb44d97b477960108ea8cd84a8e73
 
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b21e27a3b3f8907a8239ccc071c291479c7fa027..d27c4b7a9db3b3970858eeacecabcc7926ff3ed8 100644
+index 4a363ffbf6ee527b1eaea00e41b3387cb31e70a2..f4ac6130d1112fb908cfd61698207b81d182b492 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -638,6 +638,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

diff --git a/...0535-TODO-Registry-Modification-API.patch → ...0534-TODO-Registry-Modification-API.patch b/...0535-TODO-Registry-Modification-API.patch → ...0534-TODO-Registry-Modification-API.patch
diff --git a/...rver/0536-Add-StructuresLocateEvent.patch → ...rver/0535-Add-StructuresLocateEvent.patch b/...rver/0536-Add-StructuresLocateEvent.patch → ...rver/0535-Add-StructuresLocateEvent.patch
diff --git a/...-for-requiring-a-player-participant.patch → ...-for-requiring-a-player-participant.patch b/...-for-requiring-a-player-participant.patch → ...-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7d244133234c35f8f5f3769d8fd8aacba9a65998..5f93c2fa9be835825d9a3c5fbd85ab285eced34d 100644
+index 1bca9f5d58c5adfff3610ab1e7296de3647adaec..3d1cde6740e2b68d8d6e372cb52a6485fc3f7316 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1919,6 +1919,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/...leHitEvent-call-when-fireballs-dead.patch → ...leHitEvent-call-when-fireballs-dead.patch b/...leHitEvent-call-when-fireballs-dead.patch → ...leHitEvent-call-when-fireballs-dead.patch
diff --git a/...nent-with-empty-text-instead-of-thr.patch → ...nent-with-empty-text-instead-of-thr.patch b/...nent-with-empty-text-instead-of-thr.patch → ...nent-with-empty-text-instead-of-thr.patch
diff --git a/...540-Make-schedule-command-per-world.patch → ...539-Make-schedule-command-per-world.patch b/...540-Make-schedule-command-per-world.patch → ...539-Make-schedule-command-per-world.patch
diff --git a/...541-Configurable-max-leash-distance.patch → ...540-Configurable-max-leash-distance.patch b/...541-Configurable-max-leash-distance.patch → ...540-Configurable-max-leash-distance.patch
diff --git a/...542-Implement-BlockPreDispenseEvent.patch → ...541-Implement-BlockPreDispenseEvent.patch b/...542-Implement-BlockPreDispenseEvent.patch → ...541-Implement-BlockPreDispenseEvent.patch
diff --git a/...ng-of-PlayerChangeBeaconEffectEvent.patch → ...ng-of-PlayerChangeBeaconEffectEvent.patch b/...ng-of-PlayerChangeBeaconEffectEvent.patch → ...ng-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/...e-for-always-placing-the-dragon-egg.patch → ...e-for-always-placing-the-dragon-egg.patch b/...e-for-always-placing-the-dragon-egg.patch → ...e-for-always-placing-the-dragon-egg.patch
diff --git a/...-PlayerStonecutterRecipeSelectEvent.patch → ...-PlayerStonecutterRecipeSelectEvent.patch b/...-PlayerStonecutterRecipeSelectEvent.patch → ...-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/...eash-variable-to-EntityUnleashEvent.patch → ...eash-variable-to-EntityUnleashEvent.patch b/...eash-variable-to-EntityUnleashEvent.patch → ...eash-variable-to-EntityUnleashEvent.patch
diff --git a/...shield-blocking-on-dimension-change.patch → ...shield-blocking-on-dimension-change.patch b/...shield-blocking-on-dimension-change.patch → ...shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fa9c1f323ef372c8a8210118eae0558da58c3c4e..fba3ac571fafd5c738d0dcfd5492112817c443e3 100644
+index 4581bdf4525c05df235e47ab772fbf5c5f2d6b50..03bb3c6a7cca2c5363d8c4a8836fea865b571df0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1240,6 +1240,11 @@ public class ServerPlayer extends Player {

diff --git a/.../server/0548-add-DragonEggFormEvent.patch → .../server/0547-add-DragonEggFormEvent.patch b/.../server/0548-add-DragonEggFormEvent.patch → .../server/0547-add-DragonEggFormEvent.patch
diff --git a/patches/server/0549-EntityMoveEvent.patch → patches/server/0548-EntityMoveEvent.patch b/patches/server/0549-EntityMoveEvent.patch → patches/server/0548-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d29b66d9db69309087ee2eac2561ab2fcd797eb8..5ac0773a375d833f141f1a1754ca8a0661a0499b 100644
+index 676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87..5a4437f4244ad7243e82a231b0206910384e5db8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1504,6 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...isable-pathfinding-updates-on-block.patch → ...isable-pathfinding-updates-on-block.patch b/...isable-pathfinding-updates-on-block.patch → ...isable-pathfinding-updates-on-block.patch
diff --git a/.../0551-Inline-shift-direction-fields.patch → .../0550-Inline-shift-direction-fields.patch b/.../0551-Inline-shift-direction-fields.patch → .../0550-Inline-shift-direction-fields.patch
diff --git a/...-adding-items-to-BlockDropItemEvent.patch → ...-adding-items-to-BlockDropItemEvent.patch b/...-adding-items-to-BlockDropItemEvent.patch → ...-adding-items-to-BlockDropItemEvent.patch
diff --git a/...inThreadExecutor-to-BukkitScheduler.patch → ...inThreadExecutor-to-BukkitScheduler.patch b/...inThreadExecutor-to-BukkitScheduler.patch → ...inThreadExecutor-to-BukkitScheduler.patch
diff --git a/...entity-allow-attribute-registration.patch → ...entity-allow-attribute-registration.patch b/...entity-allow-attribute-registration.patch → ...entity-allow-attribute-registration.patch
diff --git a/...ix-dead-slime-setSize-invincibility.patch → ...ix-dead-slime-setSize-invincibility.patch b/...ix-dead-slime-setSize-invincibility.patch → ...ix-dead-slime-setSize-invincibility.patch
diff --git a/...pes-should-return-an-immutable-list.patch → ...pes-should-return-an-immutable-list.patch b/...pes-should-return-an-immutable-list.patch → ...pes-should-return-an-immutable-list.patch
diff --git a/.../server/0557-Expose-Tracked-Players.patch → .../server/0556-Expose-Tracked-Players.patch b/.../server/0557-Expose-Tracked-Players.patch → .../server/0556-Expose-Tracked-Players.patch
diff --git a/...8-Remove-streams-from-SensorNearest.patch → ...7-Remove-streams-from-SensorNearest.patch b/...8-Remove-streams-from-SensorNearest.patch → ...7-Remove-streams-from-SensorNearest.patch
diff --git a/...er-exception-on-empty-JsonList-file.patch → ...er-exception-on-empty-JsonList-file.patch b/...er-exception-on-empty-JsonList-file.patch → ...er-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0560-Improve-ServerGUI.patch → patches/server/0559-Improve-ServerGUI.patch b/patches/server/0560-Improve-ServerGUI.patch → patches/server/0559-Improve-ServerGUI.patch
diff --git a/...561-fix-converting-txt-to-json-file.patch → ...560-fix-converting-txt-to-json-file.patch b/...561-fix-converting-txt-to-json-file.patch → ...560-fix-converting-txt-to-json-file.patch
diff --git a/.../server/0562-Add-worldborder-events.patch → .../server/0561-Add-worldborder-events.patch b/.../server/0562-Add-worldborder-events.patch → .../server/0561-Add-worldborder-events.patch
diff --git a/...er/0563-added-PlayerNameEntityEvent.patch → ...er/0562-added-PlayerNameEntityEvent.patch b/...er/0563-added-PlayerNameEntityEvent.patch → ...er/0562-added-PlayerNameEntityEvent.patch
diff --git a/...grindstones-from-overstacking-items.patch → ...grindstones-from-overstacking-items.patch b/...grindstones-from-overstacking-items.patch → ...grindstones-from-overstacking-items.patch
diff --git a/...rver/0565-Add-recipe-to-cook-events.patch → ...rver/0564-Add-recipe-to-cook-events.patch b/...rver/0565-Add-recipe-to-cook-events.patch → ...rver/0564-Add-recipe-to-cook-events.patch
diff --git a/...s/server/0566-Add-Block-isValidTool.patch → ...s/server/0565-Add-Block-isValidTool.patch b/...s/server/0566-Add-Block-isValidTool.patch → ...s/server/0565-Add-Block-isValidTool.patch
diff --git a/...using-signs-inside-spawn-protection.patch → ...using-signs-inside-spawn-protection.patch b/...using-signs-inside-spawn-protection.patch → ...using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ec1d92a71518b9329e81f12bc8ccef846fefc168..bf80dda7cb227f56a3a38bbd821e2ec57bcbcec6 100644
+index d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f..a384a212431326d22ca3d08dfbebe4f22e829434 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1831,7 +1831,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...es/server/0568-Expand-world-key-API.patch → ...es/server/0567-Expand-world-key-API.patch b/...es/server/0568-Expand-world-key-API.patch → ...es/server/0567-Expand-world-key-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0452a59d6eec947589b4791c977327046f7b0d6e..f50d48d737aa7a6561a8868a607a68dc39c51042 100644
+index b5981001d8ad4d6c79b965be9a446352971b0d29..0624ba7f1f5b352a5730b6b4736b24998af0ad2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -986,5 +986,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {

diff --git a/...ternative-constructor-for-Rotations.patch → ...ternative-constructor-for-Rotations.patch b/...ternative-constructor-for-Rotations.patch → ...ternative-constructor-for-Rotations.patch
diff --git a/patches/server/0570-Item-Rarity-API.patch → patches/server/0569-Item-Rarity-API.patch b/patches/server/0570-Item-Rarity-API.patch → patches/server/0569-Item-Rarity-API.patch
diff --git a/...d-item-when-player-has-disconnected.patch → ...d-item-when-player-has-disconnected.patch b/...d-item-when-player-has-disconnected.patch → ...d-item-when-player-has-disconnected.patch
diff --git a/...elist-use-configurable-kick-message.patch → ...elist-use-configurable-kick-message.patch b/...elist-use-configurable-kick-message.patch → ...elist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ac0773a375d833f141f1a1754ca8a0661a0499b..39dd0ef9af89d4a752f101740ae58797fb2adc4d 100644
+index 5a4437f4244ad7243e82a231b0206910384e5db8..974cb4108f11394d7b7dbb270cae93aefe4e5511 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa