Compiler issues v2

364 files changed, 151 insertions, 165 deletions

diff --git a/patches/api/0063-Add-getI18NDisplayName-API.patch b/patches/api/0063-Add-getI18NDisplayName-API.patch
index dd788d0c27..ecdf3c006c 100644
--- a/patches/api/0063-Add-getI18NDisplayName-API.patch
+++ b/patches/api/0063-Add-getI18NDisplayName-API.patch
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index d5342258086066d3b9ef404916bad8440f0cf0cd..c92843d0adb438d7a64a5d00ce67b67efd65ca14 100644
+index d5342258086066d3b9ef404916bad8440f0cf0cd..333884bc8fe45c66d37a1bbcebc10ea655d2055f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -220,4 +220,20 @@ public interface ItemFactory {
@@ -28,7 +28,7 @@ index d5342258086066d3b9ef404916bad8440f0cf0cd..c92843d0adb438d7a64a5d00ce67b67e
 +     * {@link net.kyori.adventure.text.Component#translatable(net.kyori.adventure.translation.Translatable)} instead.
 +     */
 +    @Nullable
-+    @Deprecated(since = "1.18.1")
++    @Deprecated(since = "1.18.1", forRemoval = true)
 +    String getI18NDisplayName(@Nullable ItemStack item);
 +    // Paper end - add getI18NDisplayName
  }
diff --git a/patches/api/0064-ensureServerConversions-API.patch b/patches/api/0064-ensureServerConversions-API.patch
index 8fa95dd9cb..9d1a4cb932 100644
--- a/patches/api/0064-ensureServerConversions-API.patch
+++ b/patches/api/0064-ensureServerConversions-API.patch
@@ -7,11 +7,11 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index c92843d0adb438d7a64a5d00ce67b67efd65ca14..3d08beee52f2247db6f6e679206ed6a965fbf9a8 100644
+index 333884bc8fe45c66d37a1bbcebc10ea655d2055f..c1ec8efffd5ff2a4dcb1d761be9a431a62284607 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -236,4 +236,18 @@ public interface ItemFactory {
-     @Deprecated(since = "1.18.1")
+     @Deprecated(since = "1.18.1", forRemoval = true)
      String getI18NDisplayName(@Nullable ItemStack item);
      // Paper end - add getI18NDisplayName
 +
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
index 69952b7034..8107a6a7af 100644
--- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
@@ -1579,7 +1579,7 @@ index ebc14022c9ef9b0b3331ee53e96a32667e4762e0..5c258b6077277575daa5d96349837bdf
      public void setTitle(@NotNull String title);
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 3d08beee52f2247db6f6e679206ed6a965fbf9a8..1b4f9b93860e58762ac28715adad5a67298b06d7 100644
+index c1ec8efffd5ff2a4dcb1d761be9a431a62284607..a1d8ef8eda3c0256e8c82b7a01c3e7b11454b250 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -29,7 +29,7 @@ public interface ItemFactory {
diff --git a/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch
index 8722000ff7..27625797e0 100644
--- a/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 1b4f9b93860e58762ac28715adad5a67298b06d7..96546712f788e091749a1b4eebc6b1d6c3db7814 100644
+index a1d8ef8eda3c0256e8c82b7a01c3e7b11454b250..579a9037b656bef9fb65c6da03611e981492074a 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -250,4 +250,65 @@ public interface ItemFactory {
diff --git a/patches/api/0340-Add-enchantWithLevels-API.patch b/patches/api/0340-Add-enchantWithLevels-API.patch
index 093eaf700c..744a7aa963 100644
--- a/patches/api/0340-Add-enchantWithLevels-API.patch
+++ b/patches/api/0340-Add-enchantWithLevels-API.patch
@@ -7,7 +7,7 @@ Deprecate upstream's newer and poorly implemented similar
 API.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 96546712f788e091749a1b4eebc6b1d6c3db7814..bd0e55562f1cabef3078573182e0cf9fbc844585 100644
+index 579a9037b656bef9fb65c6da03611e981492074a..e1986aea72bb1f1ba2ea76f3ba53f274b6aac899 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -170,8 +170,11 @@ public interface ItemFactory {
diff --git a/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 41f106e80f..1978c0b073 100644
--- a/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enchantWithLevels with enchantment registry set
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index bd0e55562f1cabef3078573182e0cf9fbc844585..2669d783088b9f63f0edd6d0384c3a307ddccac7 100644
+index e1986aea72bb1f1ba2ea76f3ba53f274b6aac899..0a814c1f65afc00034a454e3ff720d26e6c17ecc 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -338,4 +338,21 @@ public interface ItemFactory {
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 589db52a3c..812a9e1167 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -4155,7 +4155,7 @@ index 55945b83a5426b352bad9507cc9e94afb1278032..9ea1537408ff2d790747b6e5a681d917
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a3550d84c273c9720491484382a4bc50dc3246a6..2222fd316ec2463f7e40b2673b29fb338b9d6385 100644
+index a3550d84c273c9720491484382a4bc50dc3246a6..24631135f90bb74bf829160ed079e152573666a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -395,14 +395,40 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -4437,10 +4437,10 @@ index a3550d84c273c9720491484382a4bc50dc3246a6..2222fd316ec2463f7e40b2673b29fb33
 +    }
 +
 +    private net.minecraft.network.chat.ChatType.Bound toHandle(net.kyori.adventure.chat.ChatType.Bound boundChatType) {
-+        net.minecraft.core.Registry<net.minecraft.network.chat.ChatType> chatTypeRegistry = this.getHandle().level().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.CHAT_TYPE);
++        net.minecraft.core.Registry<net.minecraft.network.chat.ChatType> chatTypeRegistry = this.getHandle().level().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.CHAT_TYPE);
 +
 +        return new net.minecraft.network.chat.ChatType.Bound(
-+            chatTypeRegistry.getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.CHAT_TYPE, io.papermc.paper.adventure.PaperAdventure.asVanilla(boundChatType.type().key()))),
++            chatTypeRegistry.getOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.CHAT_TYPE, io.papermc.paper.adventure.PaperAdventure.asVanilla(boundChatType.type().key()))),
 +            io.papermc.paper.adventure.PaperAdventure.asVanilla(boundChatType.name()),
 +            Optional.ofNullable(io.papermc.paper.adventure.PaperAdventure.asVanilla(boundChatType.target()))
 +        );
@@ -4483,7 +4483,7 @@ index a3550d84c273c9720491484382a4bc50dc3246a6..2222fd316ec2463f7e40b2673b29fb33
 +    @Override
 +    public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) {
 +        if (getHandle().connection == null) return;
-+        final net.minecraft.core.Registry<net.minecraft.network.chat.ChatType> chatTypeRegistry = this.getHandle().level().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.CHAT_TYPE);
++        final net.minecraft.core.Registry<net.minecraft.network.chat.ChatType> chatTypeRegistry = this.getHandle().level().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.CHAT_TYPE);
 +        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(message, false));
 +    }
 +
diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch
index 91ba72a474..a8f502b7e6 100644
--- a/patches/server/0023-Timings-v2.patch
+++ b/patches/server/0023-Timings-v2.patch
@@ -1807,7 +1807,7 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2222fd316ec2463f7e40b2673b29fb338b9d6385..1e23ea353a552d156cfddb2f620add11c89abbb0 100644
+index 24631135f90bb74bf829160ed079e152573666a2..f7833cd528797ba46b001db5208c29eb11ae2529 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2809,6 +2809,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0034-Player-affects-spawning-API.patch b/patches/server/0034-Player-affects-spawning-API.patch
index e5e9286e92..8439cb2b0a 100644
--- a/patches/server/0034-Player-affects-spawning-API.patch
+++ b/patches/server/0034-Player-affects-spawning-API.patch
@@ -135,7 +135,7 @@ index f689b2ca0ebc15c099f36ebfd14e455bda540296..fb043d67eaa6336fc0b5d62774b8f110
          for (Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e23ea353a552d156cfddb2f620add11c89abbb0..da568a74260a7068437681bddf102929e6b8f168 100644
+index f7833cd528797ba46b001db5208c29eb11ae2529..2be8dc983d008cb3da597f3aabd5efc0df51f9e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2452,6 +2452,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0035-Only-refresh-abilities-if-needed.patch b/patches/server/0035-Only-refresh-abilities-if-needed.patch
index 2d9c017bc3..330dfcd491 100644
--- a/patches/server/0035-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0035-Only-refresh-abilities-if-needed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index da568a74260a7068437681bddf102929e6b8f168..29990d84d9e3ee67a4766149c09be6d582999173 100644
+index 2be8dc983d008cb3da597f3aabd5efc0df51f9e8..5600dce95548ffffa1a338f9c9f6d682d30cf02f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2120,12 +2120,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0048-Use-null-Locale-by-default.patch b/patches/server/0048-Use-null-Locale-by-default.patch
index 7b688c0d3a..0ffa4b3c95 100644
--- a/patches/server/0048-Use-null-Locale-by-default.patch
+++ b/patches/server/0048-Use-null-Locale-by-default.patch
@@ -36,7 +36,7 @@ index 4303bde198050cd037f006234d269af406606eff..911ec630c5925b160cc05f99f0d5bb5a
              this.server.server.getPluginManager().callEvent(event);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 29990d84d9e3ee67a4766149c09be6d582999173..9409244db73282816e4f7560dd7d73a961f9e1d3 100644
+index 5600dce95548ffffa1a338f9c9f6d682d30cf02f..17a5b37a7591274a45a6818144b62b5cd1412a40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2450,7 +2450,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0055-Improve-Player-chat-API-handling.patch b/patches/server/0055-Improve-Player-chat-API-handling.patch
index 8844c6eaf3..c119f32750 100644
--- a/patches/server/0055-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0055-Improve-Player-chat-API-handling.patch
@@ -53,7 +53,7 @@ index 9683759c36de3b9d791e56dc1fb993087c1bc37c..3b58cc979c4e2fb5382f0c67ccfaa844
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9409244db73282816e4f7560dd7d73a961f9e1d3..60bf3f000bbaa8dac201e868ff46963f45251062 100644
+index 17a5b37a7591274a45a6818144b62b5cd1412a40..51bf9e36ec13af09240c329e40391d79f715a021 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -563,7 +563,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0059-Player-Tab-List-and-Title-APIs.patch b/patches/server/0059-Player-Tab-List-and-Title-APIs.patch
index d9b0772237..79923e2cfc 100644
--- a/patches/server/0059-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0059-Player-Tab-List-and-Title-APIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 60bf3f000bbaa8dac201e868ff46963f45251062..650a9dcb88e9c50fe60e91cfb55f6c440598a356 100644
+index 51bf9e36ec13af09240c329e40391d79f715a021..e3b8cc11a5523614594f1c3a144991fa70227e57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -393,6 +393,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0066-Complete-resource-pack-API.patch b/patches/server/0066-Complete-resource-pack-API.patch
index 1951dc79ca..f330036b94 100644
--- a/patches/server/0066-Complete-resource-pack-API.patch
+++ b/patches/server/0066-Complete-resource-pack-API.patch
@@ -22,7 +22,7 @@ index 99f89854e43ed6742dc9ac1624fa7140b4594b3b..d4527831f66bf1c55e6273c7f8923d6e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 650a9dcb88e9c50fe60e91cfb55f6c440598a356..6e86a515bbea29f3287e968569c177c22c033766 100644
+index e3b8cc11a5523614594f1c3a144991fa70227e57..e904d8558c425d3b2027053f4083999f0deb36fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -213,6 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 6f523d7d27..b46ff88f53 100644
--- a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,7 +44,7 @@ index 4fa5e7127549e090338b11e6493413a3fab254a0..14d9e62c86309676ddd7eed19cce2f4b
  
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e86a515bbea29f3287e968569c177c22c033766..cbc8c9bea2a92ecd78ead69e35b9b179819a4c5f 100644
+index e904d8558c425d3b2027053f4083999f0deb36fb..d578d65883f23cc4aaa5b0a7cf1fc88bb337f3a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2365,6 +2365,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0095-LootTable-API-and-replenishable-lootables.patch b/patches/server/0095-LootTable-API-and-replenishable-lootables.patch
index 45fb79040d..edb6659a69 100644
--- a/patches/server/0095-LootTable-API-and-replenishable-lootables.patch
+++ b/patches/server/0095-LootTable-API-and-replenishable-lootables.patch
@@ -261,7 +261,7 @@ index 0000000000000000000000000000000000000000..9e7c22ef49f1699df298f7121d50d27b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..cd61276a45894a02cbefc41a63c27e2cf6361d1e
+index 0000000000000000000000000000000000000000..861bff267cb397e13e8e1c79bd0776b130c6e5da
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -0,0 +1,249 @@
@@ -391,12 +391,12 @@ index 0000000000000000000000000000000000000000..cd61276a45894a02cbefc41a63c27e2c
 +
 +        @Override
 +        public void setSeed(final ContainerEntity holder, final long seed) {
-+            holder.setLootTableSeed(seed);
++            holder.setContainerLootTableSeed(seed);
 +        }
 +
 +        @Override
 +        public boolean hasLootTable(final ContainerEntity holder) {
-+            return holder.getLootTable() != null;
++            return holder.getContainerLootTable() != null;
 +        }
 +
 +        @Override
diff --git a/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch
index 6c39d5db19..4c44ca39c9 100644
--- a/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0098-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/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 3d489fdc14b3e29bab63f330d5edbbc1d354382a..f45a466120291103e4501276b3d8f97d79070360 100644
+index 3d489fdc14b3e29bab63f330d5edbbc1d354382a..45c224198135e48f94dc72312c805bf451bf7b0e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -135,6 +135,27 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -22,7 +22,7 @@ index 3d489fdc14b3e29bab63f330d5edbbc1d354382a..f45a466120291103e4501276b3d8f97d
 +            net.minecraft.server.level.ChunkMap.TrackedEntity ete = ((net.minecraft.server.level.ServerLevel) this.level()).getChunkSource().chunkMap.entityMap.get(this.getId());
 +            if (ete != null) {
 +                net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
-+                net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = new net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket(this);
++                net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket.teleport(this.getId(), net.minecraft.world.entity.PositionMoveRotation.of(this), java.util.Set.of(), this.onGround);
 +
 +                ete.seenBy.stream()
 +                    .filter(viewer -> (viewer.getPlayer().getX() - this.getX()) * (viewer.getPlayer().getY() - this.getY()) * (viewer.getPlayer().getZ() - this.getZ()) < 16 * 16)
diff --git a/patches/server/0119-String-based-Action-Bar-API.patch b/patches/server/0119-String-based-Action-Bar-API.patch
index 3dfd3c5e76..028bc2e2c0 100644
--- a/patches/server/0119-String-based-Action-Bar-API.patch
+++ b/patches/server/0119-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cbc8c9bea2a92ecd78ead69e35b9b179819a4c5f..d3666250037ff4d6594fe859a7b6b0d0ca679d06 100644
+index d578d65883f23cc4aaa5b0a7cf1fc88bb337f3a5..bf8453b2fa3549c827bff784b0d98aa827053634 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -395,6 +395,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0144-Implement-getI18NDisplayName.patch b/patches/server/0144-Implement-getI18NDisplayName.patch
index 8ade912d8f..32d65af2dc 100644
--- a/patches/server/0144-Implement-getI18NDisplayName.patch
+++ b/patches/server/0144-Implement-getI18NDisplayName.patch
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 91010267b8c4df582415a8f7cd7386723b556cc0..685aa3c35dc593b1d923a31967649b468df8a238 100644
+index 91010267b8c4df582415a8f7cd7386723b556cc0..b407968b111ff9cb9f428319d211e5d9c4c99138 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -234,4 +234,19 @@ public final class CraftItemFactory implements ItemFactory {
@@ -27,7 +27,7 @@ index 91010267b8c4df582415a8f7cd7386723b556cc0..685aa3c35dc593b1d923a31967649b46
 +            nms = CraftItemStack.asNMSCopy(item);
 +        }
 +
-+        return nms != null ? net.minecraft.locale.Language.getInstance().getOrDefault(nms.getItem().getDescriptionId(nms)) : null;
++        return nms != null ? nms.getItem().getName(nms).getString() : null;
 +    }
 +    // Paper end - add getI18NDisplayName
  }
diff --git a/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch
index e88a2bfe3d..2c7a6a7911 100644
--- a/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 7ae4279768b70a4fdc8f4438898871a17c8fe402..582bbb376c75ab5bf737f3015ce8ad45
  
      private void beginLogin(ClientIntentionPacket packet, boolean transfer) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d3666250037ff4d6594fe859a7b6b0d0ca679d06..ce777a7872e34fed0dfdb984127067ffd835477e 100644
+index bf8453b2fa3549c827bff784b0d98aa827053634..63499a4fa349b3fa61040244db8be2d5d2569b96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -341,6 +341,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch
index 5f8abf9d97..7a580a6eb7 100644
--- a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0163-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 ce777a7872e34fed0dfdb984127067ffd835477e..d98c0b9faa4ec97ef251d397456458668c911012 100644
+index 63499a4fa349b3fa61040244db8be2d5d2569b96..d222de793776b0217c8ec0a4a3151d085efa339f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1665,7 +1665,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0176-Player.setPlayerProfile-API.patch b/patches/server/0176-Player.setPlayerProfile-API.patch
index 98bd61340a..a44003c55f 100644
--- a/patches/server/0176-Player.setPlayerProfile-API.patch
+++ b/patches/server/0176-Player.setPlayerProfile-API.patch
@@ -64,7 +64,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..f6b2ca92fd3510a76cbf56d0ea55aa6c
  
      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 d98c0b9faa4ec97ef251d397456458668c911012..862001f88b4613cb420bf8b8ca1471f41729ad0f 100644
+index d222de793776b0217c8ec0a4a3151d085efa339f..6191c780cfab682464e23c53873d0acb0c642b0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -254,11 +254,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0181-Flag-to-disable-the-channel-limit.patch b/patches/server/0181-Flag-to-disable-the-channel-limit.patch
index 415d4913b1..bbb4d82685 100644
--- a/patches/server/0181-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0181-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 862001f88b4613cb420bf8b8ca1471f41729ad0f..b295c2cb3758f653b28120291b2f6c08ad2e4acf 100644
+index 6191c780cfab682464e23c53873d0acb0c642b0d..afee0dd824cfa229f9ebdbc2b4ca9beee485d6e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0207-InventoryCloseEvent-Reason-API.patch b/patches/server/0207-InventoryCloseEvent-Reason-API.patch
index 1384bfc2db..335dc0d881 100644
--- a/patches/server/0207-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0207-InventoryCloseEvent-Reason-API.patch
@@ -165,7 +165,7 @@ index 6d4e0a90c70f7a66450cbb18ebec1d7bf9200af2..5ff159be1a6dfb4b1a5b9aa1e435d294
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b295c2cb3758f653b28120291b2f6c08ad2e4acf..dc0a04f68482a5101acd19bfc61a64aea689b773 100644
+index afee0dd824cfa229f9ebdbc2b4ca9beee485d6e7..d1b14e7460bd2974e2c3c49a085968a90e1f410f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1290,7 +1290,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch
index 9e8e772688..2288caab49 100644
--- a/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc0a04f68482a5101acd19bfc61a64aea689b773..e3048a5ce7528c056a90a3bc75cea25d832c1d8c 100644
+index d1b14e7460bd2974e2c3c49a085968a90e1f410f..6fb400243e491bb8492342327fe98127b2df331e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3007,6 +3007,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0241-Improve-death-events.patch b/patches/server/0241-Improve-death-events.patch
index c2ce8d6f23..17d781e34a 100644
--- a/patches/server/0241-Improve-death-events.patch
+++ b/patches/server/0241-Improve-death-events.patch
@@ -420,7 +420,7 @@ index 2caba38a50b7ea535337a3540aa5272d4a9f1878..e20565cf256aacd012a1722c5ebbf901
          // CraftBukkit end
          this.gameEvent(GameEvent.ENTITY_DIE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e3048a5ce7528c056a90a3bc75cea25d832c1d8c..d7db67d8bf1f8c9f94547d43e8291e13c9ba34ac 100644
+index 6fb400243e491bb8492342327fe98127b2df331e..5dab50309b9441ddb3fe66aec653be0246b049d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2544,7 +2544,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0270-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0270-Replace-OfflinePlayer-getLastPlayed.patch
index ac848098b4..51b5df8832 100644
--- a/patches/server/0270-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0270-Replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index f6b2ca92fd3510a76cbf56d0ea55aa6caaf12ba1..e0d342a0ddd140b342f7af138c71596c
      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 d7db67d8bf1f8c9f94547d43e8291e13c9ba34ac..5e14d93fe151847969d8c4ca9e1aa960aad39dcc 100644
+index 5dab50309b9441ddb3fe66aec653be0246b049d2..38989d2e0702e6edba0e81e292b439b7ef48023c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0272-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0272-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 52e9b55fd2..f2bcc599c0 100644
--- a/patches/server/0272-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0272-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5e14d93fe151847969d8c4ca9e1aa960aad39dcc..d4b6a3c2bb63022c00f5d847a1e406ed4efd98c6 100644
+index 38989d2e0702e6edba0e81e292b439b7ef48023c..92fb4dfce832f5cb98b476365c060acfd8277183 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -229,8 +229,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0337-Implement-Player-Client-Options-API.patch b/patches/server/0337-Implement-Player-Client-Options-API.patch
index 6bd62a8882..1ca74a9891 100644
--- a/patches/server/0337-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0337-Implement-Player-Client-Options-API.patch
@@ -136,7 +136,7 @@ index 363175d3325c012f31ba84060bb0bfac694f6ab8..9911e231ad021286f2da90057b06874f
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d4b6a3c2bb63022c00f5d847a1e406ed4efd98c6..077d47858ac87f732d8ff0d22191b35bc2a58c42 100644
+index 92fb4dfce832f5cb98b476365c060acfd8277183..330a64edf72dc598fb5458702cf7cae5dd83ab00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -670,6 +670,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0389-Brand-support.patch b/patches/server/0389-Brand-support.patch
index 226edc4d04..291a5334d5 100644
--- a/patches/server/0389-Brand-support.patch
+++ b/patches/server/0389-Brand-support.patch
@@ -57,7 +57,7 @@ index b9fbaddcc8239bf737fdea51790f678306e511eb..9a8b08d4b70b8890961e4af7ce6e870a
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 077d47858ac87f732d8ff0d22191b35bc2a58c42..9042bbcfb161d91b1e2c4d6e0461f141fa41872e 100644
+index 330a64edf72dc598fb5458702cf7cae5dd83ab00..3b0e7473b3e0c5d9e9e34ed505eae4823e626aae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3166,6 +3166,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0402-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0402-Create-HoverEvent-from-ItemStack-Entity.patch
index ff6ef6b1cc..66d23bfd33 100644
--- a/patches/server/0402-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0402-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 685aa3c35dc593b1d923a31967649b468df8a238..19c1faecb398f5b91dd04827b66038c352e5b4e4 100644
+index b407968b111ff9cb9f428319d211e5d9c4c99138..cab7a3d21699605cb7fc480830d7529f70e69e88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -249,4 +249,44 @@ public final class CraftItemFactory implements ItemFactory {
-         return nms != null ? net.minecraft.locale.Language.getInstance().getOrDefault(nms.getItem().getDescriptionId(nms)) : null;
+         return nms != null ? nms.getItem().getName(nms).getString() : null;
      }
      // Paper end - add getI18NDisplayName
 +
diff --git a/patches/server/0430-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0430-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 535ffd4869..b8670990f3 100644
--- a/patches/server/0430-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0430-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9042bbcfb161d91b1e2c4d6e0461f141fa41872e..8d9c2c58f7216e1ae7dc382732bd6920c7c72e5c 100644
+index 3b0e7473b3e0c5d9e9e34ed505eae4823e626aae..875d96ca1461d254745e53970b401634c07a8dd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2734,7 +2734,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0466-Add-sendOpLevel-API.patch b/patches/server/0466-Add-sendOpLevel-API.patch
index e10d6a9c4f..2a4354226e 100644
--- a/patches/server/0466-Add-sendOpLevel-API.patch
+++ b/patches/server/0466-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 70b7871091ab9b64d2a5503620a71c3d5585c25d..7676dbe55b4bf6e0472dc0190c01e6ec
  
      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 8d9c2c58f7216e1ae7dc382732bd6920c7c72e5c..680909750f9db56d3cc062b63913e3bd9f69d8a5 100644
+index 875d96ca1461d254745e53970b401634c07a8dd6..0ca539a7e037b7f8791ed4c71ce3093a3def2746 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -694,6 +694,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0527-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0527-Expand-PlayerGameModeChangeEvent.patch
index c9ccc145c0..050751dcc7 100644
--- a/patches/server/0527-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0527-Expand-PlayerGameModeChangeEvent.patch
@@ -147,7 +147,7 @@ index e6a927e991779bad84a02d81010057a4e36b9c95..9007a0f01b823c613c39c974d9e0f585
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 680909750f9db56d3cc062b63913e3bd9f69d8a5..3cb6f46492a3441c09a452836d01c15d1837f6ea 100644
+index 0ca539a7e037b7f8791ed4c71ce3093a3def2746..8551d626fd4eb38f57414d022f752c0a389a1095 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1681,7 +1681,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0539-Add-PlayerKickEvent-causes.patch b/patches/server/0539-Add-PlayerKickEvent-causes.patch
index 15cf2d5574..d11448420f 100644
--- a/patches/server/0539-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0539-Add-PlayerKickEvent-causes.patch
@@ -495,7 +495,7 @@ index 9e2ad78b12cadbf0e2bda1e12fe844120529c347..6a7d7fad990fc44fdda6849d43dad141
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3cb6f46492a3441c09a452836d01c15d1837f6ea..4b28318dbdeb3fa5935949740343c996d30aa2dd 100644
+index 8551d626fd4eb38f57414d022f752c0a389a1095..f0f8238aeb49c45921c7ec48cc49ed628087741f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -280,7 +280,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0566-Add-PlayerSetSpawnEvent.patch b/patches/server/0566-Add-PlayerSetSpawnEvent.patch
index ddf33c1b0d..e28f1bfdd7 100644
--- a/patches/server/0566-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0566-Add-PlayerSetSpawnEvent.patch
@@ -187,7 +187,7 @@ index db26b5a0464bd6087eeacaf6dd61eba37365df92..9117c035d5a6ff114b028fad3380ceb1
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4b28318dbdeb3fa5935949740343c996d30aa2dd..eacfcaee0f534ff63c723af11517e6c895bc84ed 100644
+index f0f8238aeb49c45921c7ec48cc49ed628087741f..efc9b5f6864b09fcf116bbad82424b82448f5469 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1430,9 +1430,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0583-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0583-Add-ItemFactory-getSpawnEgg-API.patch
index c0f37d4a0b..715b0b753d 100644
--- a/patches/server/0583-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0583-Add-ItemFactory-getSpawnEgg-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getSpawnEgg API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 19c1faecb398f5b91dd04827b66038c352e5b4e4..237df8b37ee8cf5b15e8e6d30fa3b51ef394434d 100644
+index cab7a3d21699605cb7fc480830d7529f70e69e88..ad86ee4372e55c82968fd4fc6a65debab0092028 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -9,6 +9,7 @@ import net.minecraft.core.HolderSet;
@@ -30,7 +30,7 @@ index 19c1faecb398f5b91dd04827b66038c352e5b4e4..237df8b37ee8cf5b15e8e6d30fa3b51e
 +        }
 +        String typeId = type.getKey().toString();
 +        net.minecraft.resources.ResourceLocation typeKey = ResourceLocation.parse(typeId);
-+        net.minecraft.world.entity.EntityType<?> nmsType = net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(typeKey);
++        net.minecraft.world.entity.EntityType<?> nmsType = net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getValue(typeKey);
 +        net.minecraft.world.item.SpawnEggItem eggItem = net.minecraft.world.item.SpawnEggItem.byId(nmsType);
 +        return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
 +    }
diff --git a/patches/server/0649-Multi-Block-Change-API-Implementation.patch b/patches/server/0649-Multi-Block-Change-API-Implementation.patch
index 7a27fe0df9..45d3534bd9 100644
--- a/patches/server/0649-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0649-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eacfcaee0f534ff63c723af11517e6c895bc84ed..0bb2a75b2dd3d6d5d7815d3f4b1d8b11b002db62 100644
+index efc9b5f6864b09fcf116bbad82424b82448f5469..5274ee417ba3b9ccdab70449c87ce8f3809ea137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -947,6 +947,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0666-Force-close-world-loading-screen.patch b/patches/server/0666-Force-close-world-loading-screen.patch
index d29eaabc90..edae404607 100644
--- a/patches/server/0666-Force-close-world-loading-screen.patch
+++ b/patches/server/0666-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f34cad30c982f2bb563f0deab030111720858fa8..f64a4693855899409a0ba7ec15ca0b0351febdd3 100644
+index f34cad30c982f2bb563f0deab030111720858fa8..215a3c9839d664f6cfd4c9360338abcf5863799a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -407,6 +407,16 @@ public abstract class PlayerList {
@@ -20,7 +20,7 @@ index f34cad30c982f2bb563f0deab030111720858fa8..f64a4693855899409a0ba7ec15ca0b03
 +        // Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
 +        if (player.isDeadOrDying()) {
 +            net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = worldserver1.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BIOME)
-+                    .getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
++                    .getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
 +            player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
 +                    new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
 +                    worldserver1.getLightEngine(), (java.util.BitSet)null, (java.util.BitSet) null)
diff --git a/patches/server/0675-Implement-enchantWithLevels-API.patch b/patches/server/0675-Implement-enchantWithLevels-API.patch
index 08f1ffbe3e..45f1f704ca 100644
--- a/patches/server/0675-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0675-Implement-enchantWithLevels-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement enchantWithLevels API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 237df8b37ee8cf5b15e8e6d30fa3b51ef394434d..944dcc1126c947b4c8c3b4fdd174eb57320abbba 100644
+index ad86ee4372e55c82968fd4fc6a65debab0092028..d9eec6cff3c7c6515f4d61bf1063e7d609d4bcb3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -305,4 +305,47 @@ public final class CraftItemFactory implements ItemFactory {
@@ -24,7 +24,7 @@ index 237df8b37ee8cf5b15e8e6d30fa3b51ef394434d..944dcc1126c947b4c8c3b4fdd174eb57
 +                // NON_TREASURE, which does contain all enchantments not in the treasure tag.
 +                // Additionally, the allowTreasure boolean is more intended to configure this method to behave like
 +                // an enchanting table.
-+                : net.minecraft.server.MinecraftServer.getServer().registryAccess().registryOrThrow(Registries.ENCHANTMENT).getTag(EnchantmentTags.IN_ENCHANTING_TABLE),
++                : net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).get(EnchantmentTags.IN_ENCHANTING_TABLE),
 +            random
 +        );
 +    }
diff --git a/patches/server/0686-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0686-Use-username-instead-of-display-name-in-PlayerList-g.patch
index cf9ec6d966..b4d6c33900 100644
--- a/patches/server/0686-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0686-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f64a4693855899409a0ba7ec15ca0b0351febdd3..f0ce0041497d038c55019e0f5a8e8b8619cec398 100644
+index 215a3c9839d664f6cfd4c9360338abcf5863799a..0646e435e869b5cc067968feb09ff5c6a979a8a7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1354,7 +1354,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0714-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0714-Add-various-missing-EntityDropItemEvent-calls.patch
index 4f072bfdb0..0a9ed2d8c1 100644
--- a/patches/server/0714-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0714-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -24,7 +24,7 @@ index 37111113f6ab6d77c558b10c4162758135db99b0..911b6391455402922e8bd52cfe9e5694
              EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
              Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index db8bb6e47b28bac6cf568415af3ffdd6eeac6ac7..34f35502faf2029525a8e0a8f347456b2868804b 100644
+index db8bb6e47b28bac6cf568415af3ffdd6eeac6ac7..59b00aa57f62ec9d56c28d18c493e952e66f39c7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -604,7 +604,7 @@ public class Dolphin extends AgeableWaterCreature {
@@ -32,12 +32,12 @@ index db8bb6e47b28bac6cf568415af3ffdd6eeac6ac7..34f35502faf2029525a8e0a8f347456b
  
                  entityitem.setDeltaMovement((double) (0.3F * -Mth.sin(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.cos(f1) * f2), (double) (0.3F * Mth.sin(Dolphin.this.getXRot() * 0.017453292F) * 1.5F), (double) (0.3F * Mth.cos(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.sin(f1) * f2));
 -                Dolphin.this.level().addFreshEntity(entityitem);
-+                Dolphin.this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
++                Dolphin.this.spawnAtLocation(getServerLevel(Dolphin.this), entityitem); // Paper - Call EntityDropItemEvent
              }
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 205aefd38a185fa411ff17cfb0155769de8fc2fd..ca45a8ccf7f4593d557d157470603e4d233d948d 100644
+index 205aefd38a185fa411ff17cfb0155769de8fc2fd..67ea374ae3c66af434b4aadbe702a44d230fbe09 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -492,14 +492,14 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
@@ -45,7 +45,7 @@ index 205aefd38a185fa411ff17cfb0155769de8fc2fd..ca45a8ccf7f4593d557d157470603e4d
              entityitem.setThrower(this);
              this.playSound(SoundEvents.FOX_SPIT, 1.0F, 1.0F);
 -            this.level().addFreshEntity(entityitem);
-+            this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
++            this.spawnAtLocation((net.minecraft.server.level.ServerLevel) this.level(), entityitem); // Paper - Call EntityDropItemEvent
          }
      }
  
@@ -53,12 +53,12 @@ index 205aefd38a185fa411ff17cfb0155769de8fc2fd..ca45a8ccf7f4593d557d157470603e4d
          ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), stack);
  
 -        this.level().addFreshEntity(entityitem);
-+        this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
++        this.spawnAtLocation((net.minecraft.server.level.ServerLevel) this.level(), entityitem); // Paper - Call EntityDropItemEvent
      }
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 14e02f9b0169db8388c515a68315ad5cc3f13d22..dbcf14f5af9c9c0655a82529ee99450a8da14525 100644
+index 14e02f9b0169db8388c515a68315ad5cc3f13d22..14b47d6fa189f2a666b12ef7e7708d204c2b0452 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -365,8 +365,7 @@ public class Goat extends Animal {
@@ -67,19 +67,19 @@ index 14e02f9b0169db8388c515a68315ad5cc3f13d22..dbcf14f5af9c9c0655a82529ee99450a
  
 -            this.level().addFreshEntity(entityitem);
 -            return true;
-+            return this.spawnAtLocation(entityitem) != null; // Paper - Call EntityDropItemEvent
++            return this.spawnAtLocation((net.minecraft.server.level.ServerLevel) this.level(), entityitem) != null; // Paper - Call EntityDropItemEvent
          }
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 5e586f174ff4b610a2584f28c9ffdd445ad58bea..0395b120590552518a85f36a46b68532e936de49 100644
+index 5e586f174ff4b610a2584f28c9ffdd445ad58bea..014e1ea1603bc7a7b42ae7ff7d12e5a41f331d2f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -345,8 +345,9 @@ public class Sniffer extends Animal {
  
          entityitem.setDefaultPickUpDelay();
          this.finalizeSpawnChildFromBreeding(world, other, (AgeableMob) null);
-+        if (this.spawnAtLocation(entityitem) != null) { // Paper - Call EntityDropItemEvent
++        if (this.spawnAtLocation(world, entityitem) != null) { // Paper - Call EntityDropItemEvent
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
 -        world.addFreshEntity(entityitem);
 +        } // Paper - Call EntityDropItemEvent
diff --git a/patches/server/0716-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0716-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
deleted file mode 100644
index d96ba39bb4..0000000000
--- a/patches/server/0716-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Doc <[email protected]>
-Date: Sun, 17 Jul 2022 11:49:43 -0400
-Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ac2ad33a44ce04d9673adc08ff21a167d606e4db..b34245e82306c4ce607aa984ab8f597dec2ba4b5 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2402,7 +2402,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-         // Spigot end
-         // this.chatSpamThrottler.increment();
--        if (!this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) {
-+        if (counted && !this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { // Paper - exclude from SpigotConfig.spamExclusions
-             // CraftBukkit end
-             this.disconnect((Component) Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
-         }
diff --git a/patches/server/0717-More-Teleport-API.patch b/patches/server/0716-More-Teleport-API.patch
index 2bbaf5b834..70bc44b3da 100644
--- a/patches/server/0717-More-Teleport-API.patch
+++ b/patches/server/0716-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b34245e82306c4ce607aa984ab8f597dec2ba4b5..ebe3d51ccc02b46d9bae4ba4f9185eadfec278f2 100644
+index ac2ad33a44ce04d9673adc08ff21a167d606e4db..349da8b85b7a122977fcad80a399605109b88db2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1585,11 +1585,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -15,7 +15,7 @@ index b34245e82306c4ce607aa984ab8f597dec2ba4b5..ebe3d51ccc02b46d9bae4ba4f9185ead
 -        PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause);
 +        // Paper start - Teleport API
 +        Set<io.papermc.paper.entity.TeleportFlag.Relative> relativeFlags = java.util.EnumSet.noneOf(io.papermc.paper.entity.TeleportFlag.Relative.class);
-+        for (RelativeMovement relativeArgument : set) {
++        for (Relative relativeArgument : set) {
 +            relativeFlags.add(org.bukkit.craftbukkit.entity.CraftPlayer.toApiRelativeFlag(relativeArgument));
 +        }
 +        PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags));
@@ -112,7 +112,7 @@ index 4e6afa243d6108cb946a8a7cf96c4036a3c2ac0c..43786eacc72cdf3bb209d3dfb1808ea9
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0bb2a75b2dd3d6d5d7815d3f4b1d8b11b002db62..2514fbae7c87a96c12e44d21ff7df1d2f3243387 100644
+index 5274ee417ba3b9ccdab70449c87ce8f3809ea137..c45753f4b65b189ebfdaea4fb0ec51217dd990c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1303,13 +1303,102 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0718-Add-EntityPortalReadyEvent.patch b/patches/server/0717-Add-EntityPortalReadyEvent.patch
index 46f19b8cc8..46f19b8cc8 100644
--- a/patches/server/0718-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0717-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0719-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0718-Don-t-use-level-random-in-entity-constructors.patch
index 5fab2f6349..9ec489bd3e 100644
--- a/patches/server/0719-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0718-Don-t-use-level-random-in-entity-constructors.patch
@@ -27,7 +27,7 @@ index 6b19689a19465554b943470fc6f959e48169ac5b..aa41c4cf8d3ae291c4147118c96190ff
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index f45a466120291103e4501276b3d8f97d79070360..96453be982623c7eb210a828404122e1d0f78b5d 100644
+index 45c224198135e48f94dc72312c805bf451bf7b0e..de87483600e55d88176fe25db621bbd3e464729f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -68,7 +68,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
diff --git a/patches/server/0720-Send-block-entities-after-destroy-prediction.patch b/patches/server/0719-Send-block-entities-after-destroy-prediction.patch
index 8cc9f6fcd4..2742769b83 100644
--- a/patches/server/0720-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0719-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 5c3e5c348e6fececccd8097355f423b9e7ad982b..064a7a3e1c4d192010e072a5e985a541
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ebe3d51ccc02b46d9bae4ba4f9185eadfec278f2..19b90fe644da59216e11b35af33e62c0fc66db7b 100644
+index 349da8b85b7a122977fcad80a399605109b88db2..32ed76fca856b7d121e2215748be4f6d1b18791a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1723,8 +1723,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0721-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0720-Warn-on-plugins-accessing-faraway-chunks.patch
index ebdb019a1b..ebdb019a1b 100644
--- a/patches/server/0721-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0720-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0722-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0721-Custom-Chat-Completion-Suggestions-API.patch
index 7a419b3d74..d204b1a24f 100644
--- a/patches/server/0722-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0721-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2514fbae7c87a96c12e44d21ff7df1d2f3243387..dc360a7a8a8d23be9d8301a5e6fbff5499c9a947 100644
+index c45753f4b65b189ebfdaea4fb0ec51217dd990c3..2b5eb586eda41d465f3f1faae8159f6fbe346312 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -708,6 +708,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0723-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0722-Add-and-fix-missing-BlockFadeEvents.patch
index 1ac5d1e5ab..1ac5d1e5ab 100644
--- a/patches/server/0723-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0722-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0724-Collision-API.patch b/patches/server/0723-Collision-API.patch
index 892f39211e..892f39211e 100644
--- a/patches/server/0724-Collision-API.patch
+++ b/patches/server/0723-Collision-API.patch
diff --git a/patches/server/0725-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0724-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 34f5fa3e3d..34f5fa3e3d 100644
--- a/patches/server/0725-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0724-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0726-Block-Ticking-API.patch b/patches/server/0725-Block-Ticking-API.patch
index c2a5c23d6c..c2a5c23d6c 100644
--- a/patches/server/0726-Block-Ticking-API.patch
+++ b/patches/server/0725-Block-Ticking-API.patch
diff --git a/patches/server/0727-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0726-Add-Velocity-IP-Forwarding-Support.patch
index cba81cdb0f..cba81cdb0f 100644
--- a/patches/server/0727-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0726-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0728-Add-NamespacedKey-biome-methods.patch b/patches/server/0727-Add-NamespacedKey-biome-methods.patch
index 0991968c4d..0991968c4d 100644
--- a/patches/server/0728-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0727-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0729-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0728-Fix-plugin-loggers-on-server-shutdown.patch
index b7a4eac4a8..b7a4eac4a8 100644
--- a/patches/server/0729-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0728-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0730-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0729-Stop-large-look-changes-from-crashing-the-server.patch
index 7c262a4f87..7c262a4f87 100644
--- a/patches/server/0730-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0729-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0731-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0730-Fire-EntityChangeBlockEvent-in-more-places.patch
index 3fab5db628..3fab5db628 100644
--- a/patches/server/0731-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0730-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0732-Missing-eating-regain-reason.patch b/patches/server/0731-Missing-eating-regain-reason.patch
index 38626b6352..38626b6352 100644
--- a/patches/server/0732-Missing-eating-regain-reason.patch
+++ b/patches/server/0731-Missing-eating-regain-reason.patch
diff --git a/patches/server/0733-Missing-effect-cause.patch b/patches/server/0732-Missing-effect-cause.patch
index 6157121022..6157121022 100644
--- a/patches/server/0733-Missing-effect-cause.patch
+++ b/patches/server/0732-Missing-effect-cause.patch
diff --git a/patches/server/0734-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0733-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0734-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0733-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0735-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0734-Call-BlockPhysicsEvent-more-often.patch
index ad24091f87..ad24091f87 100644
--- a/patches/server/0735-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0734-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0736-Configurable-chat-thread-limit.patch b/patches/server/0735-Configurable-chat-thread-limit.patch
index 882f700d25..882f700d25 100644
--- a/patches/server/0736-Configurable-chat-thread-limit.patch
+++ b/patches/server/0735-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0737-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0736-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index fb6e8b07ea..fb6e8b07ea 100644
--- a/patches/server/0737-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0736-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0738-fix-Jigsaw-block-kicking-user.patch b/patches/server/0737-fix-Jigsaw-block-kicking-user.patch
index a7960e5bc3..a7960e5bc3 100644
--- a/patches/server/0738-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0737-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0739-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0738-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 3159c4b594..3159c4b594 100644
--- a/patches/server/0739-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0738-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0740-Add-getDrops-to-BlockState.patch b/patches/server/0739-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0740-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0739-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0741-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0740-Fix-a-bunch-of-vanilla-bugs.patch
index 023d12d11e..c52bbed900 100644
--- a/patches/server/0741-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0740-Fix-a-bunch-of-vanilla-bugs.patch
@@ -130,7 +130,7 @@ index 064a7a3e1c4d192010e072a5e985a54135748d87..a706f0855fdf88cc9aece3ba00ef574b
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 19b90fe644da59216e11b35af33e62c0fc66db7b..8c615974a738b87116830538646750bb6f7ef7f0 100644
+index 32ed76fca856b7d121e2215748be4f6d1b18791a..72ac67c6d42a1763fd63bd0d0db18ba709f48314 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 extends ServerCommonPacketListenerImpl
@@ -143,7 +143,7 @@ index 19b90fe644da59216e11b35af33e62c0fc66db7b..8c615974a738b87116830538646750bb
                          MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i).withStyle(ChatFormatting.RED);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f0ce0041497d038c55019e0f5a8e8b8619cec398..8e71eeb5be2df1352447f3662a6d092a7db9e2d0 100644
+index 0646e435e869b5cc067968feb09ff5c6a979a8a7..61c37bf5f75207085f22093e48986dab8231e1c1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -261,7 +261,7 @@ public abstract class PlayerList {
@@ -219,7 +219,7 @@ index ef71b3ef4444c05b4211de87e1c8ec52cbe3e72a..137ec75ee803789deb7b1ca93dd9369c
      public void start() {
          this.creeper.getNavigation().stop();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index dbcf14f5af9c9c0655a82529ee99450a8da14525..f745a554b9b84a53d9bd942ca9908153fb0a668c 100644
+index 14b47d6fa189f2a666b12ef7e7708d204c2b0452..4c6dc427b90012b0945e073dd905dc7e8d1bec82 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -247,9 +247,10 @@ public class Goat extends Animal {
diff --git a/patches/server/0742-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0741-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 9cef4dcb92..9cef4dcb92 100644
--- a/patches/server/0742-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0741-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0743-Fix-custom-piglin-loved-items.patch b/patches/server/0742-Fix-custom-piglin-loved-items.patch
index 358bd47f1e..358bd47f1e 100644
--- a/patches/server/0743-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0742-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0744-EntityPickupItemEvent-fixes.patch b/patches/server/0743-EntityPickupItemEvent-fixes.patch
index 9d6076ced9..839a01673d 100644
--- a/patches/server/0744-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0743-EntityPickupItemEvent-fixes.patch
@@ -56,7 +56,7 @@ index 5c26beef2d3f3d4afa51950ddeb7089989218462..e283b1296c1e831376bfe9491cbf02ed
              if (!flag) {
                  PiglinAi.putInInventory(piglin, itemstack);
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 45375ccdcf730732dd915304dea2f523807eedd6..2eb1ad88bd39b3e6539d6c4ac61fb1d58edb5eb2 100644
+index 45375ccdcf730732dd915304dea2f523807eedd6..ab132041982df2a701e4baea8195873f31b4a5fb 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -228,6 +228,11 @@ public abstract class Raider extends PatrollingMonster {
@@ -64,7 +64,7 @@ index 45375ccdcf730732dd915304dea2f523807eedd6..2eb1ad88bd39b3e6539d6c4ac61fb1d5
  
          if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getOminousBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) {
 +            // Paper start - EntityPickupItemEvent fixes
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, itemstack, 0, false).isCancelled()) {
++            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, itemEntity, 0, false).isCancelled()) {
 +                return;
 +            }
 +            // Paper end - EntityPickupItemEvent fixes
diff --git a/patches/server/0745-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0744-Correctly-handle-interactions-with-items-on-cooldown.patch
index a86affadb8..a86affadb8 100644
--- a/patches/server/0745-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0744-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0746-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0745-Add-PlayerInventorySlotChangeEvent.patch
index cca34b90d0..cca34b90d0 100644
--- a/patches/server/0746-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0745-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0747-Elder-Guardian-appearance-API.patch b/patches/server/0746-Elder-Guardian-appearance-API.patch
index 4a603b81c0..bf49ebc163 100644
--- a/patches/server/0747-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0746-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc360a7a8a8d23be9d8301a5e6fbff5499c9a947..74cfa4313c8aba96b792d7855627be68efc41d51 100644
+index 2b5eb586eda41d465f3f1faae8159f6fbe346312..d8d3d256910790fd7fc406d64ab38e1c372ecfa7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3326,6 +3326,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0748-Add-entity-knockback-API.patch b/patches/server/0747-Add-entity-knockback-API.patch
index 71f4427274..71f4427274 100644
--- a/patches/server/0748-Add-entity-knockback-API.patch
+++ b/patches/server/0747-Add-entity-knockback-API.patch
diff --git a/patches/server/0749-Detect-headless-JREs.patch b/patches/server/0748-Detect-headless-JREs.patch
index e680b6146f..e680b6146f 100644
--- a/patches/server/0749-Detect-headless-JREs.patch
+++ b/patches/server/0748-Detect-headless-JREs.patch
diff --git a/patches/server/0750-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0749-fix-entity-vehicle-collision-event-not-called.patch
index 9b38b32086..9b38b32086 100644
--- a/patches/server/0750-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0749-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0751-Add-EntityToggleSitEvent.patch b/patches/server/0750-Add-EntityToggleSitEvent.patch
index 8b679dd170..965b35e0f4 100644
--- a/patches/server/0751-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0750-Add-EntityToggleSitEvent.patch
@@ -31,7 +31,7 @@ index 550c7f3435cc6c3180769e47f05bf693bdc380e3..e9e4d6fd69f9eec25a75b2610e15a19f
  
          if (inSittingPose) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index ca45a8ccf7f4593d557d157470603e4d233d948d..d98e4882dcba8a903bc86c8d30b290e6e967cc75 100644
+index 67ea374ae3c66af434b4aadbe702a44d230fbe09..a9a8ebb2cebe668628d5bdb33fa1399e0ab1e08b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -419,7 +419,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
diff --git a/patches/server/0752-Add-fire-tick-delay-option.patch b/patches/server/0751-Add-fire-tick-delay-option.patch
index 7db107dee9..7db107dee9 100644
--- a/patches/server/0752-Add-fire-tick-delay-option.patch
+++ b/patches/server/0751-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0753-Add-Moving-Piston-API.patch b/patches/server/0752-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0753-Add-Moving-Piston-API.patch
+++ b/patches/server/0752-Add-Moving-Piston-API.patch
diff --git a/patches/server/0754-Ignore-impossible-spawn-tick.patch b/patches/server/0753-Ignore-impossible-spawn-tick.patch
index ee2750f36d..ee2750f36d 100644
--- a/patches/server/0754-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0753-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0755-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0754-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0755-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/server/0754-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0756-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0755-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index ff618c7595..ff618c7595 100644
--- a/patches/server/0756-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0755-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0757-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0756-Add-PrePlayerAttackEntityEvent.patch
index 5a925374e5..5a925374e5 100644
--- a/patches/server/0757-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0756-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0758-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0757-ensure-reset-EnderDragon-boss-event-name.patch
index 4c5db1221b..4c5db1221b 100644
--- a/patches/server/0758-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0757-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0759-Add-Player-Warden-Warning-API.patch b/patches/server/0758-Add-Player-Warden-Warning-API.patch
index c44c1b1bc3..9ec7039092 100644
--- a/patches/server/0759-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0758-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74cfa4313c8aba96b792d7855627be68efc41d51..a000d41fd6b6d9e690ea2a16ac1bd77589b64f14 100644
+index d8d3d256910790fd7fc406d64ab38e1c372ecfa7..bc96e6a4f6833b351da5ac91563fd6f0d057c854 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3331,6 +3331,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0760-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0759-More-vanilla-friendly-methods-to-update-trades.patch
index b3901a0ae7..b3901a0ae7 100644
--- a/patches/server/0760-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0759-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0761-Add-paper-dumplisteners-command.patch b/patches/server/0760-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0761-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0760-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0762-check-global-player-list-where-appropriate.patch b/patches/server/0761-check-global-player-list-where-appropriate.patch
index 586cac4e19..586cac4e19 100644
--- a/patches/server/0762-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0761-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0763-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0762-Fix-async-entity-add-due-to-fungus-trees.patch
index 009feeb37a..009feeb37a 100644
--- a/patches/server/0763-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0762-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0764-ItemStack-damage-API.patch b/patches/server/0763-ItemStack-damage-API.patch
index f6d47719ca..55e7f06af1 100644
--- a/patches/server/0764-ItemStack-damage-API.patch
+++ b/patches/server/0763-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ 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/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index bcb3a45166e5dd75dd727adf92304b3a75399c8d..d8dc3228f3cd8c9efc8359162edac601a87bf762 100644
+index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf69322973a2b5274 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -693,8 +693,13 @@ public final class ItemStack implements DataComponentHolder {
@@ -29,18 +29,21 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..d8dc3228f3cd8c9efc8359162edac601
          // CraftBukkit start
          if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
              PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, originalDamage); // Paper - Add EntityDamageItemEvent
-@@ -725,8 +730,8 @@ public final class ItemStack implements DataComponentHolder {
- 
+@@ -726,7 +731,12 @@ public final class ItemStack implements DataComponentHolder {
      }
  
--    private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player) {  // Paper - Add EntityDamageItemEvent
+     private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player) {  // Paper - Add EntityDamageItemEvent
 -        return !this.isDamageableItem() ? 0 : (player instanceof ServerPlayer && player.hasInfiniteMaterials() ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage));  // Paper - Add EntityDamageItemEvent
-+    private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player, boolean force) {  // Paper - Add EntityDamageItemEvent
++        // Paper start - itemstack damage api
++        return processDurabilityChange(baseDamage, world, player, false);
++    }
++    private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player, boolean force) {
 +        return !this.isDamageableItem() ? 0 : (player instanceof ServerPlayer && player.hasInfiniteMaterials() && !force ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage));  // Paper - Add EntityDamageItemEvent
++        // Paper end - itemstack damage api
      }
  
      private void applyDamage(int damage, @Nullable LivingEntity player, Consumer<Item> breakCallback) { // Paper - Add EntityDamageItemEvent
-@@ -766,6 +771,11 @@ public final class ItemStack implements DataComponentHolder {
+@@ -766,6 +776,11 @@ public final class ItemStack implements DataComponentHolder {
      }
  
      public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot) {
@@ -52,7 +55,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..d8dc3228f3cd8c9efc8359162edac601
          Level world = entity.level();
  
          if (world instanceof ServerLevel worldserver) {
-@@ -778,8 +788,8 @@ public final class ItemStack implements DataComponentHolder {
+@@ -778,8 +793,8 @@ public final class ItemStack implements DataComponentHolder {
              }
  
              this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent
diff --git a/patches/server/0765-Friction-API.patch b/patches/server/0764-Friction-API.patch
index 469868818a..469868818a 100644
--- a/patches/server/0765-Friction-API.patch
+++ b/patches/server/0764-Friction-API.patch
diff --git a/patches/server/0766-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0765-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 0b482955d5..0b482955d5 100644
--- a/patches/server/0766-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0765-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0767-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0766-Fix-premature-player-kicks-on-shutdown.patch
index a6293cf126..a6293cf126 100644
--- a/patches/server/0767-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0766-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0768-Sync-offhand-slot-in-menus.patch b/patches/server/0767-Sync-offhand-slot-in-menus.patch
index b8a6ce0108..b8a6ce0108 100644
--- a/patches/server/0768-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0767-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0769-Player-Entity-Tracking-Events.patch b/patches/server/0768-Player-Entity-Tracking-Events.patch
index c3458e621d..c3458e621d 100644
--- a/patches/server/0769-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0768-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0770-Limit-pet-look-distance.patch b/patches/server/0769-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0770-Limit-pet-look-distance.patch
+++ b/patches/server/0769-Limit-pet-look-distance.patch
diff --git a/patches/server/0771-fix-Instruments.patch b/patches/server/0770-fix-Instruments.patch
index 6ac52bdf25..fa555c5aa3 100644
--- a/patches/server/0771-fix-Instruments.patch
+++ b/patches/server/0770-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a000d41fd6b6d9e690ea2a16ac1bd77589b64f14..a70db1d658127ed72f82580c1dd743c6c9d5f809 100644
+index bc96e6a4f6833b351da5ac91563fd6f0d057c854..b0818d1fc60ab75770e671d30cdbfd531b3dfa99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -785,7 +785,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0772-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0771-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6825374465..6825374465 100644
--- a/patches/server/0772-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0771-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0773-Add-BlockLockCheckEvent.patch b/patches/server/0772-Add-BlockLockCheckEvent.patch
index b06f734eb2..b06f734eb2 100644
--- a/patches/server/0773-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0772-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0774-Add-Sneaking-API-for-Entities.patch b/patches/server/0773-Add-Sneaking-API-for-Entities.patch
index 27bb5274f8..27bb5274f8 100644
--- a/patches/server/0774-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0773-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0775-Improve-logging-and-errors.patch b/patches/server/0774-Improve-logging-and-errors.patch
index 242eb6cb0e..d8fff73a33 100644
--- a/patches/server/0775-Improve-logging-and-errors.patch
+++ b/patches/server/0774-Improve-logging-and-errors.patch
@@ -52,7 +52,7 @@ index 4037a1057ebc87e3df6333e0d546fc85b5148d2a..eb9dab7be7da11ab1c4046a7fc4a29d5
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c615974a738b87116830538646750bb6f7ef7f0..abe5490b54bda4e0767a65244c29b236a40ec8d6 100644
+index 72ac67c6d42a1763fd63bd0d0db18ba709f48314..6f3e25d41420b5e54721e88c84fd3194d6170b9a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3451,7 +3451,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0776-Improve-PortalEvents.patch b/patches/server/0775-Improve-PortalEvents.patch
index 6968fe1a35..6968fe1a35 100644
--- a/patches/server/0776-Improve-PortalEvents.patch
+++ b/patches/server/0775-Improve-PortalEvents.patch
diff --git a/patches/server/0777-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0776-Add-config-option-for-spider-worldborder-climbing.patch
index 6d4efc38b6..6d4efc38b6 100644
--- a/patches/server/0777-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0776-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0778-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0777-Add-missing-SpigotConfig-logCommands-check.patch
index c4fb5944f4..1bd83dc7d8 100644
--- a/patches/server/0778-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0777-Add-missing-SpigotConfig-logCommands-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <[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 abe5490b54bda4e0767a65244c29b236a40ec8d6..984ee21a6fc59efeabc2e5eeedced548d03f413d 100644
+index 6f3e25d41420b5e54721e88c84fd3194d6170b9a..59b64ea82c84ff7d9b9123473b4466ec01918cd2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2078,7 +2078,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0779-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0778-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0779-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0778-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0780-Flying-Fall-Damage.patch b/patches/server/0779-Flying-Fall-Damage.patch
index b16a488ee2..a9fc10c351 100644
--- a/patches/server/0780-Flying-Fall-Damage.patch
+++ b/patches/server/0779-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c45
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a70db1d658127ed72f82580c1dd743c6c9d5f809..7029f8c76a18b76ab13e43f2d0ec4f910646caee 100644
+index b0818d1fc60ab75770e671d30cdbfd531b3dfa99..05d95294a5183612c171fbd0e5181ac02270e784 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2609,6 +2609,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0781-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0780-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 98305f38a5..98305f38a5 100644
--- a/patches/server/0781-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0780-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0782-config-for-disabling-entity-tag-tags.patch b/patches/server/0781-config-for-disabling-entity-tag-tags.patch
index d0d803196a..d0d803196a 100644
--- a/patches/server/0782-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0781-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0783-Use-single-player-info-update-packet-on-join.patch b/patches/server/0782-Use-single-player-info-update-packet-on-join.patch
index f0e844f29c..68e488cbf6 100644
--- a/patches/server/0783-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0782-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 984ee21a6fc59efeabc2e5eeedced548d03f413d..f9dffac2a10a6d2aea488197d1302de06980d354 100644
+index 59b64ea82c84ff7d9b9123473b4466ec01918cd2..51f4d1e5c02c516b5c57095d35348ba53f5b3193 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3489,7 +3489,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -18,7 +18,7 @@ index 984ee21a6fc59efeabc2e5eeedced548d03f413d..f9dffac2a10a6d2aea488197d1302de0
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8e71eeb5be2df1352447f3662a6d092a7db9e2d0..4fe3024e26b56c2d796acf703a1bc200ff309f09 100644
+index 61c37bf5f75207085f22093e48986dab8231e1c1..f9212fc2db00531da1618780e231e8ad21285907 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -365,6 +365,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0784-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0783-Correctly-shrink-items-during-EntityResurrectEvent.patch
index c14b325882..c14b325882 100644
--- a/patches/server/0784-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0783-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0785-Win-Screen-API.patch b/patches/server/0784-Win-Screen-API.patch
index 981c12ddbe..65a47054b5 100644
--- a/patches/server/0785-Win-Screen-API.patch
+++ b/patches/server/0784-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7029f8c76a18b76ab13e43f2d0ec4f910646caee..e90f477207ca0107e23cb29da0cacf6fed3dcfc4 100644
+index 05d95294a5183612c171fbd0e5181ac02270e784..0a700df3e4f4f6e2e902f0c69dd6ae149978be47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1322,6 +1322,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0786-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0785-Remove-CraftItemStack-setAmount-null-assignment.patch
index aa0acd564f..aa0acd564f 100644
--- a/patches/server/0786-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0785-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0787-Fix-force-opening-enchantment-tables.patch b/patches/server/0786-Fix-force-opening-enchantment-tables.patch
index 6ddc05bd3f..6ddc05bd3f 100644
--- a/patches/server/0787-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0786-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0788-Add-Entity-Body-Yaw-API.patch b/patches/server/0787-Add-Entity-Body-Yaw-API.patch
index bac79c9d69..bac79c9d69 100644
--- a/patches/server/0788-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0787-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0789-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0788-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 9c1f7e2d47..9c1f7e2d47 100644
--- a/patches/server/0789-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0788-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0790-Add-EntityFertilizeEggEvent.patch b/patches/server/0789-Add-EntityFertilizeEggEvent.patch
index 24b2e1a1af..5ba280ce96 100644
--- a/patches/server/0790-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0789-Add-EntityFertilizeEggEvent.patch
@@ -47,7 +47,7 @@ index 100be2ed533450eda32d9c4eb9eb1067846d1516..36846ba6b6c7494c745ebd8b221479a9
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 0395b120590552518a85f36a46b68532e936de49..7f70237a274fde0fb97880c1d47246157e3b3415 100644
+index 014e1ea1603bc7a7b42ae7ff7d12e5a41f331d2f..af2f6e690fc51d319b77d081466c2dc7a1d8fe19 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -340,11 +340,16 @@ public class Sniffer extends Animal {
@@ -65,7 +65,7 @@ index 0395b120590552518a85f36a46b68532e936de49..7f70237a274fde0fb97880c1d4724615
          entityitem.setDefaultPickUpDelay();
 -        this.finalizeSpawnChildFromBreeding(world, other, (AgeableMob) null);
 +        this.finalizeSpawnChildFromBreeding(world, other, (AgeableMob) null, result.getExperience()); // Paper - Add EntityFertilizeEggEvent event
-         if (this.spawnAtLocation(entityitem) != null) { // Paper - Call EntityDropItemEvent
+         if (this.spawnAtLocation(world, entityitem) != null) { // Paper - Call EntityDropItemEvent
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper - Call EntityDropItemEvent
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
diff --git a/patches/server/0791-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0790-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 21d4d0ad65..21d4d0ad65 100644
--- a/patches/server/0791-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0790-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0792-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0791-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index eba5cdc5c9..eba5cdc5c9 100644
--- a/patches/server/0792-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0791-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0793-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0792-Correctly-handle-ArmorStand-invisibility.patch
index c3b0b191aa..c3b0b191aa 100644
--- a/patches/server/0793-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0792-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0794-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0793-Fix-advancement-triggers-for-entity-damage.patch
index d85577a078..d85577a078 100644
--- a/patches/server/0794-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0793-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0795-Fix-text-display-error-on-spawn.patch b/patches/server/0794-Fix-text-display-error-on-spawn.patch
index d783ac8eee..d783ac8eee 100644
--- a/patches/server/0795-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0794-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0796-Fix-inventories-returning-null-Locations.patch b/patches/server/0795-Fix-inventories-returning-null-Locations.patch
index 1a65689fad..1a65689fad 100644
--- a/patches/server/0796-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0795-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0797-Add-Shearable-API.patch b/patches/server/0796-Add-Shearable-API.patch
index 5d99e92e0b..5d99e92e0b 100644
--- a/patches/server/0797-Add-Shearable-API.patch
+++ b/patches/server/0796-Add-Shearable-API.patch
diff --git a/patches/server/0798-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0797-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0798-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0797-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0799-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0798-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 05a14ce977..05a14ce977 100644
--- a/patches/server/0799-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0798-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0800-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0799-Treat-sequence-violations-like-they-should-be.patch
index d881aea8c0..387f4dcf4f 100644
--- a/patches/server/0800-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0799-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f9dffac2a10a6d2aea488197d1302de06980d354..90392c7c87feb08711b0af80163a4ea8021448f4 100644
+index 51f4d1e5c02c516b5c57095d35348ba53f5b3193..c2328bc821730dd829440ab17b7c8b1800a1f5ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1997,6 +1997,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0801-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0800-Prevent-causing-expired-keys-from-impacting-new-join.patch
index b1858d9775..2001b0974c 100644
--- a/patches/server/0801-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0800-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -26,7 +26,7 @@ index d0b2a8b5ded71a9a41753f4addea1c49826b34a3..29b465fc1dc50e0e84ddb889c5303e80
          UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
          UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 90392c7c87feb08711b0af80163a4ea8021448f4..eb81cd8421aa2fc011e5cb38e8a52b55fc1938b7 100644
+index c2328bc821730dd829440ab17b7c8b1800a1f5ca..60d58622fd568932c019ba6a4e4070a881fdda53 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -305,6 +305,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0802-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0801-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 7621693e89..7621693e89 100644
--- a/patches/server/0802-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0801-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0803-Use-array-for-gamerule-storage.patch b/patches/server/0802-Use-array-for-gamerule-storage.patch
index efb6cfeb50..efb6cfeb50 100644
--- a/patches/server/0803-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0802-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0804-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0803-Fix-a-couple-of-upstream-bed-issues.patch
index 76cfa7bc0d..76cfa7bc0d 100644
--- a/patches/server/0804-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0803-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0805-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0804-Fix-demo-flag-not-enabling-demo-mode.patch
index 1a72571965..1a72571965 100644
--- a/patches/server/0805-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0804-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0806-Add-Mob-Experience-reward-API.patch b/patches/server/0805-Add-Mob-Experience-reward-API.patch
index 9e59c458f8..9e59c458f8 100644
--- a/patches/server/0806-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0805-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0807-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0806-Break-redstone-on-top-of-trap-doors-early.patch
index ded460b32b..ded460b32b 100644
--- a/patches/server/0807-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0806-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0808-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0807-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0808-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0807-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0809-More-accurate-isInOpenWater-impl.patch b/patches/server/0808-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0809-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0808-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0810-Expand-PlayerItemMendEvent.patch b/patches/server/0809-Expand-PlayerItemMendEvent.patch
index 10de3ba9b2..73abf28aa3 100644
--- a/patches/server/0810-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0809-Expand-PlayerItemMendEvent.patch
@@ -30,7 +30,7 @@ index 3a7af27bb1ce0cbe56bd3760cd400083daf98d4c..bf0838f574fa3fb9654e087d602b8d38
                  if (l > 0) {
                      // this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e90f477207ca0107e23cb29da0cacf6fed3dcfc4..de0dc5b37bd0823409974befdd96676b2575cf48 100644
+index 0a700df3e4f4f6e2e902f0c69dd6ae149978be47..3d52de930c4358843c5a8c88a1dce478b61ed616 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1881,11 +1881,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0811-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0810-Refresh-ProjectileSource-for-projectiles.patch
index 1cac178f6b..1cac178f6b 100644
--- a/patches/server/0811-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0810-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0812-Add-transient-modifier-API.patch b/patches/server/0811-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0812-Add-transient-modifier-API.patch
+++ b/patches/server/0811-Add-transient-modifier-API.patch
diff --git a/patches/server/0813-Fix-block-place-logic.patch b/patches/server/0812-Fix-block-place-logic.patch
index 6f5dfc260e..6f5dfc260e 100644
--- a/patches/server/0813-Fix-block-place-logic.patch
+++ b/patches/server/0812-Fix-block-place-logic.patch
diff --git a/patches/server/0814-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0813-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 45955c4fa8..69e6a10e57 100644
--- a/patches/server/0814-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0813-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d8dc3228f3cd8c9efc8359162edac601a87bf762..5867a0e3e2ce9be7514771549ad318947e387470 100644
+index 90a55f00c36903d52630c51bf69322973a2b5274..1b7d797dac1ff7ee945cf4ef8c6861475a31903d 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -577,7 +577,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0815-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0814-Call-BlockGrowEvent-for-missing-blocks.patch
index d48638c261..d48638c261 100644
--- a/patches/server/0815-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0814-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0816-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0815-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 761e3cb98f..761e3cb98f 100644
--- a/patches/server/0816-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0815-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0817-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0816-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0817-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0816-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0818-Fix-sniffer-removeExploredLocation.patch b/patches/server/0817-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0818-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0817-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0819-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0818-Add-method-to-remove-all-active-potion-effects.patch
index e730bcf1d4..e730bcf1d4 100644
--- a/patches/server/0819-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0818-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0820-Add-event-for-player-editing-sign.patch b/patches/server/0819-Add-event-for-player-editing-sign.patch
index 9ea10f8448..5029597839 100644
--- a/patches/server/0820-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0819-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 5867a0e3e2ce9be7514771549ad318947e387470..612eb27b471a9ebfdea29a58e5a32931f869bfb6 100644
+index 1b7d797dac1ff7ee945cf4ef8c6861475a31903d..f81b3e050f21ce10ea86892d9a6bee9a42561514 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -556,7 +556,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0821-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0820-Only-tick-item-frames-if-players-can-see-it.patch
index c7c6cd499f..c7c6cd499f 100644
--- a/patches/server/0821-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0820-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0822-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0821-Fix-cmd-permission-levels-for-command-blocks.patch
index aa96a27db6..aa96a27db6 100644
--- a/patches/server/0822-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0821-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0823-Add-option-to-disable-block-updates.patch b/patches/server/0822-Add-option-to-disable-block-updates.patch
index 0ea835ecc9..0ea835ecc9 100644
--- a/patches/server/0823-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0822-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0824-Call-missing-BlockDispenseEvent.patch b/patches/server/0823-Call-missing-BlockDispenseEvent.patch
index c8d68a1ed8..c8d68a1ed8 100644
--- a/patches/server/0824-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0823-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0825-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0824-Don-t-load-chunks-for-supporting-block-checks.patch
index bcb87c4448..bcb87c4448 100644
--- a/patches/server/0825-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0824-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0826-Optimize-player-lookups-for-beacons.patch b/patches/server/0825-Optimize-player-lookups-for-beacons.patch
index 7e1285d891..7e1285d891 100644
--- a/patches/server/0826-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0825-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0827-More-Sign-Block-API.patch b/patches/server/0826-More-Sign-Block-API.patch
index 70558b0010..70558b0010 100644
--- a/patches/server/0827-More-Sign-Block-API.patch
+++ b/patches/server/0826-More-Sign-Block-API.patch
diff --git a/patches/server/0828-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0827-fix-item-meta-for-tadpole-buckets.patch
index 04c4b6a873..04c4b6a873 100644
--- a/patches/server/0828-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0827-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0829-Fix-BanList-API.patch b/patches/server/0828-Fix-BanList-API.patch
index 58b6ec4b04..639d56d79e 100644
--- a/patches/server/0829-Fix-BanList-API.patch
+++ b/patches/server/0828-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index de0dc5b37bd0823409974befdd96676b2575cf48..642cdf6a205017b9835ad423206617fd3b9a32bf 100644
+index 3d52de930c4358843c5a8c88a1dce478b61ed616..de96fdd4b6129f875e710670f6734bf7fa7a4cfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1775,23 +1775,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0830-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0829-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 4f2b8e09cd..4f2b8e09cd 100644
--- a/patches/server/0830-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0829-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0831-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0830-Fix-possible-NPE-on-painting-creation.patch
index d5fa31bd07..d5fa31bd07 100644
--- a/patches/server/0831-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0830-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0832-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0831-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 28dc555f08..28dc555f08 100644
--- a/patches/server/0832-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0831-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0833-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0832-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 40dec00abb..40dec00abb 100644
--- a/patches/server/0833-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0832-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0834-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0833-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0834-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0833-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0835-Add-whitelist-events.patch b/patches/server/0834-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0835-Add-whitelist-events.patch
+++ b/patches/server/0834-Add-whitelist-events.patch
diff --git a/patches/server/0836-Implement-PlayerFailMoveEvent.patch b/patches/server/0835-Implement-PlayerFailMoveEvent.patch
index 6d31aefbe8..19858740af 100644
--- a/patches/server/0836-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0835-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eb81cd8421aa2fc011e5cb38e8a52b55fc1938b7..3b5beeb1599700fcc92f741613f84d6141078626 100644
+index 60d58622fd568932c019ba6a4e4070a881fdda53..368547270a3e6cdbda812fcf0ed2519d71383b81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1271,8 +1271,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0837-Folia-scheduler-and-owned-region-API.patch b/patches/server/0836-Folia-scheduler-and-owned-region-API.patch
index 14d6c5a05c..ed91fc99ab 100644
--- a/patches/server/0837-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0836-Folia-scheduler-and-owned-region-API.patch
@@ -1173,7 +1173,7 @@ index ce35bce647a6f7250b855ad7e542367b5ffd10d1..96fdbdcbe43c22b62f679837409da08f
          gameprofilerfiller.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4fe3024e26b56c2d796acf703a1bc200ff309f09..7356a027ae3bca3a9f2056ef6849d5fab38a0df3 100644
+index f9212fc2db00531da1618780e231e8ad21285907..a9063533ea4b2b349d476127b99c822203d7dfcb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -598,6 +598,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0838-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0837-Only-erase-allay-memory-on-non-item-targets.patch
index b26cfd040b..b26cfd040b 100644
--- a/patches/server/0838-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0837-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0839-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0838-Fix-rotation-when-spawning-display-entities.patch
index 240a093118..240a093118 100644
--- a/patches/server/0839-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0838-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0840-Only-capture-actual-tree-growth.patch b/patches/server/0839-Only-capture-actual-tree-growth.patch
index 9ec84e6c2e..63a72d6ca2 100644
--- a/patches/server/0840-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0839-Only-capture-actual-tree-growth.patch
@@ -38,7 +38,7 @@ index 509a67aff07bcdcad47eb77e923d442349a4f20c..1cb5e107a391ab56942cdb2d1cae7d56
      @Override
      public CrashReportCategory fillReportDetails(CrashReport report) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 612eb27b471a9ebfdea29a58e5a32931f869bfb6..db971851a9e219ead89d71bb97d65ff73d9fd285 100644
+index f81b3e050f21ce10ea86892d9a6bee9a42561514..cb6bcf8b61793882252827309ffa99526244e445 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -469,6 +469,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0841-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0840-Use-correct-source-for-mushroom-block-spread-event.patch
index 658d9ec376..658d9ec376 100644
--- a/patches/server/0841-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0840-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0842-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0841-Respect-randomizeData-on-more-entities-when-spawning.patch
index 67a5238077..67a5238077 100644
--- a/patches/server/0842-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0841-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0843-Use-correct-seed-on-api-world-load.patch b/patches/server/0842-Use-correct-seed-on-api-world-load.patch
index 099c091a64..099c091a64 100644
--- a/patches/server/0843-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0842-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0844-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0843-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index d87f310ded..d87f310ded 100644
--- a/patches/server/0844-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0843-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0845-Cache-map-ids-on-item-frames.patch b/patches/server/0844-Cache-map-ids-on-item-frames.patch
index 38554e1a9c..38554e1a9c 100644
--- a/patches/server/0845-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0844-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0846-Fix-custom-statistic-criteria-creation.patch b/patches/server/0845-Fix-custom-statistic-criteria-creation.patch
index 6e562a7f2d..6e562a7f2d 100644
--- a/patches/server/0846-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0845-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0847-Bandaid-fix-for-Effect.patch b/patches/server/0846-Bandaid-fix-for-Effect.patch
index 2fa9de2aa8..a4996fb167 100644
--- a/patches/server/0847-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0846-Bandaid-fix-for-Effect.patch
@@ -81,7 +81,7 @@ index 67d6840faea539b41ba3abb6d94b28e417a84511..b646f882de3ab04d54d07e9e944c261c
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 642cdf6a205017b9835ad423206617fd3b9a32bf..ebc0c5c2365cca1f7ca28cc3f6a3f7494134a047 100644
+index de96fdd4b6129f875e710670f6734bf7fa7a4cfb..86f74c35a74b3c3a1d04d6be79e0df30642d475a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -934,7 +934,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0848-SculkCatalyst-bloom-API.patch b/patches/server/0847-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0848-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0847-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0849-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0848-API-for-an-entity-s-scoreboard-name.patch
index ac005db821..ac005db821 100644
--- a/patches/server/0849-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0848-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0850-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0849-Deprecate-and-replace-methods-with-old-StructureType.patch
index b4264b8b52..b4264b8b52 100644
--- a/patches/server/0850-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0849-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0851-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0850-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 43c52d9c14..58454d7267 100644
--- a/patches/server/0851-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0850-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b5beeb1599700fcc92f741613f84d6141078626..8e877e4cea2a14cc0a8fed41e983712645ba8c48 100644
+index 368547270a3e6cdbda812fcf0ed2519d71383b81..293c42dd5e870986a2797840756bd7c4d6a34a5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -832,6 +832,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0852-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0851-Properly-handle-BlockBreakEvent-isDropItems.patch
index 047d717ba6..047d717ba6 100644
--- a/patches/server/0852-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0851-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0853-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0852-Fire-entity-death-event-for-ender-dragon.patch
index 0efcc781a4..0efcc781a4 100644
--- a/patches/server/0853-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0852-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0854-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0853-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 6c2edf83e2..6c2edf83e2 100644
--- a/patches/server/0854-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0853-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0855-Add-Listing-API-for-Player.patch b/patches/server/0854-Add-Listing-API-for-Player.patch
index 5090bed698..34070f7cf3 100644
--- a/patches/server/0855-Add-Listing-API-for-Player.patch
+++ b/patches/server/0854-Add-Listing-API-for-Player.patch
@@ -85,7 +85,7 @@ index 29b465fc1dc50e0e84ddb889c5303e80fe662874..4d67d98257b2cb9045d03c999cfd4ba2
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7356a027ae3bca3a9f2056ef6849d5fab38a0df3..a4937d11b79cef41f3fbf79282c0c435e794dbfe 100644
+index a9063533ea4b2b349d476127b99c822203d7dfcb..218e18b9c7836bc4c9d3eba78e0717cabb9d6b61 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -363,14 +363,22 @@ public abstract class PlayerList {
@@ -122,7 +122,7 @@ index 7356a027ae3bca3a9f2056ef6849d5fab38a0df3..a4937d11b79cef41f3fbf79282c0c435
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ebc0c5c2365cca1f7ca28cc3f6a3f7494134a047..7104ffd4dd72a053793eb52c8df29eadbd184221 100644
+index 86f74c35a74b3c3a1d04d6be79e0df30642d475a..9b59e7efde0516d55643e8ceb6d94e02ed22aacc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -206,6 +206,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0856-Configurable-Region-Compression-Format.patch b/patches/server/0855-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0856-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0855-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0857-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0856-Add-BlockFace-to-BlockDamageEvent.patch
index 2dcf331517..2dcf331517 100644
--- a/patches/server/0857-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0856-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0858-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0857-Fix-NPE-on-Boat-getStatus.patch
index 8ec449ba6c..8ec449ba6c 100644
--- a/patches/server/0858-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0857-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0859-Expand-Pose-API.patch b/patches/server/0858-Expand-Pose-API.patch
index 891dd712d6..891dd712d6 100644
--- a/patches/server/0859-Expand-Pose-API.patch
+++ b/patches/server/0858-Expand-Pose-API.patch
diff --git a/patches/server/0860-More-DragonBattle-API.patch b/patches/server/0859-More-DragonBattle-API.patch
index a752a4de81..a752a4de81 100644
--- a/patches/server/0860-More-DragonBattle-API.patch
+++ b/patches/server/0859-More-DragonBattle-API.patch
diff --git a/patches/server/0861-Add-PlayerPickItemEvent.patch b/patches/server/0860-Add-PlayerPickItemEvent.patch
index 8309e2c118..8a28695a2b 100644
--- a/patches/server/0861-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0860-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8e877e4cea2a14cc0a8fed41e983712645ba8c48..d4250cc73bc51c51b78a9392a9879d47dc67f159 100644
+index 293c42dd5e870986a2797840756bd7c4d6a34a5d..c50c3d11700aadd4c0e7114b4b6d5c5d15a33ac4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -947,7 +947,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0862-Allow-trident-custom-damage.patch b/patches/server/0861-Allow-trident-custom-damage.patch
index ee7ac1a043..ee7ac1a043 100644
--- a/patches/server/0862-Allow-trident-custom-damage.patch
+++ b/patches/server/0861-Allow-trident-custom-damage.patch
diff --git a/patches/server/0863-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0862-Expose-hand-in-BlockCanBuildEvent.patch
index f3ed54f3f9..f3ed54f3f9 100644
--- a/patches/server/0863-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0862-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0864-Optimize-nearest-structure-border-iteration.patch b/patches/server/0863-Optimize-nearest-structure-border-iteration.patch
index f16f98ea9b..f16f98ea9b 100644
--- a/patches/server/0864-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0863-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0865-Implement-OfflinePlayer-isConnected.patch b/patches/server/0864-Implement-OfflinePlayer-isConnected.patch
index 6c7d4f55cc..7c4e1d3536 100644
--- a/patches/server/0865-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0864-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 2c2c4db31a746b4eb853dc04c6b3e5631bbfa034..4f4e3ee18d586f61706504218cddc06a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7104ffd4dd72a053793eb52c8df29eadbd184221..ea5e3973a4021a4584d3b8b33c9d50001f4c0fe6 100644
+index 9b59e7efde0516d55643e8ceb6d94e02ed22aacc..4de2a6a04a5bcf635f2bb5da640eb5941183e87c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -261,6 +261,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0866-Fix-slot-desync.patch b/patches/server/0865-Fix-slot-desync.patch
index afdb75279e..5b0a3d5721 100644
--- a/patches/server/0866-Fix-slot-desync.patch
+++ b/patches/server/0865-Fix-slot-desync.patch
@@ -22,7 +22,7 @@ index f05a9fd321a4af28e9771bbf39d73f80dd4160c9..90aa8e401e1d092a31ff21699409b836
          this.containerMenu.findSlot(this.getInventory(), this.getInventory().selected).ifPresent(s -> {
              this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d4250cc73bc51c51b78a9392a9879d47dc67f159..182897b4ab9415b7aab0b968274993dd43a47903 100644
+index c50c3d11700aadd4c0e7114b4b6d5c5d15a33ac4..af7696900171ea6b7941251046bfc10c1f4eb469 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2749,10 +2749,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -67,7 +67,7 @@ index d99760f943846a1cfe5d0ec97313f453004feb98..3e00bbff266fc71b07014e7e047d77b7
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index f745a554b9b84a53d9bd942ca9908153fb0a668c..ec3edd2eefc398dac9058e082c52a98dc48db36d 100644
+index 4c6dc427b90012b0945e073dd905dc7e8d1bec82..76aca47d8638d5c37c57d3a59fa7f8ceaa5a53b4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -238,6 +238,7 @@ public class Goat extends Animal {
diff --git a/patches/server/0867-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0866-Add-titleOverride-to-InventoryOpenEvent.patch
index 1b98c1b4a0..1b98c1b4a0 100644
--- a/patches/server/0867-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0866-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0868-Configure-sniffer-egg-hatch-time.patch b/patches/server/0867-Configure-sniffer-egg-hatch-time.patch
index e39971b614..e39971b614 100644
--- a/patches/server/0868-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0867-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0869-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0868-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0ba2ce3d55..0ba2ce3d55 100644
--- a/patches/server/0869-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0868-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0870-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0869-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0870-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0869-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0871-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0870-Add-slot-sanity-checks-in-container-clicks.patch
index 22ddd65752..08f85bdb3b 100644
--- a/patches/server/0871-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0870-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 182897b4ab9415b7aab0b968274993dd43a47903..17402d393df27474b38c8d9b0b7aa424ec34d1a9 100644
+index af7696900171ea6b7941251046bfc10c1f4eb469..836e6b705b201253f2b81d1ca0228b8a0266a1dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3011,6 +3011,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0872-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0871-Call-BlockRedstoneEvents-for-lecterns.patch
index 7726626d78..7726626d78 100644
--- a/patches/server/0872-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0871-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0873-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0872-Allow-proper-checking-of-empty-item-stacks.patch
index 85819379c1..85819379c1 100644
--- a/patches/server/0873-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0872-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0874-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0873-Fix-silent-equipment-change-for-mobs.patch
index 14b0a2dab0..14b0a2dab0 100644
--- a/patches/server/0874-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0873-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0875-Fix-spigot-s-Forced-Stats.patch b/patches/server/0874-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0875-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0874-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0876-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0875-Add-missing-InventoryHolders-to-inventories.patch
index d6bf23a4f8..d6bf23a4f8 100644
--- a/patches/server/0876-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0875-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0877-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0876-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index c55e56d157..c55e56d157 100644
--- a/patches/server/0877-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0876-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0878-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0877-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0878-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0877-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0879-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0878-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index b6ec32df61..b6ec32df61 100644
--- a/patches/server/0879-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0878-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0880-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0879-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0880-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0879-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0881-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0880-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0881-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0880-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0882-Fix-missing-map-initialize-event-call.patch b/patches/server/0881-Fix-missing-map-initialize-event-call.patch
index 795f551f59..795f551f59 100644
--- a/patches/server/0882-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0881-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0883-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0882-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0883-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0882-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0884-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0883-Fix-UnsafeValues-loadAdvancement.patch
index 57e986f1b7..57e986f1b7 100644
--- a/patches/server/0884-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0883-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0885-Add-player-idle-duration-API.patch b/patches/server/0884-Add-player-idle-duration-API.patch
index d715a2ed4a..3f3f534dbc 100644
--- a/patches/server/0885-Add-player-idle-duration-API.patch
+++ b/patches/server/0884-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ea5e3973a4021a4584d3b8b33c9d50001f4c0fe6..c73089566eccc15aa747e3e3707d089a0f2b8d1d 100644
+index 4de2a6a04a5bcf635f2bb5da640eb5941183e87c..4060a25f414631f702f04a53169b14e2ae6f9e31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3447,6 +3447,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0886-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0885-Don-t-check-if-we-can-see-non-visible-entities.patch
index e86be5d784..e86be5d784 100644
--- a/patches/server/0886-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0885-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0887-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0886-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f44bad4f1..3f44bad4f1 100644
--- a/patches/server/0887-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0886-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0888-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0887-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index fe05ccc109..272dd0236d 100644
--- a/patches/server/0888-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0887-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c73089566eccc15aa747e3e3707d089a0f2b8d1d..74b90ee971ec799cf19551ac63a9b01f77500967 100644
+index 4060a25f414631f702f04a53169b14e2ae6f9e31..a343684b52594c295d5a75b9005da3434b72f329 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1144,7 +1144,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0889-Optimize-VarInts.patch b/patches/server/0888-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0889-Optimize-VarInts.patch
+++ b/patches/server/0888-Optimize-VarInts.patch
diff --git a/patches/server/0890-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0889-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 50464e50cb..50464e50cb 100644
--- a/patches/server/0890-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0889-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0891-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0890-Add-predicate-for-blocks-when-raytracing.patch
index ea7280cbe5..ea7280cbe5 100644
--- a/patches/server/0891-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0890-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0892-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0891-Broadcast-take-item-packets-with-collector-as-source.patch
index 03d6650dc1..03d6650dc1 100644
--- a/patches/server/0892-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0891-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0893-Expand-LingeringPotion-API.patch b/patches/server/0892-Expand-LingeringPotion-API.patch
index 3a58f0528a..3a58f0528a 100644
--- a/patches/server/0893-Expand-LingeringPotion-API.patch
+++ b/patches/server/0892-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0894-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0893-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index ba091fe841..ba091fe841 100644
--- a/patches/server/0894-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0893-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0895-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0894-Add-hand-to-fish-event-for-all-player-interactions.patch
index cb3197a1b2..cb3197a1b2 100644
--- a/patches/server/0895-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0894-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0896-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0895-Fix-several-issues-with-EntityBreedEvent.patch
index 7d7a988fc0..7d7a988fc0 100644
--- a/patches/server/0896-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0895-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0897-Add-UUID-attribute-modifier-API.patch b/patches/server/0896-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0897-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0896-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0898-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0897-Fix-missing-event-call-for-entity-teleport-API.patch
index 90e9f0e671..90e9f0e671 100644
--- a/patches/server/0898-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0897-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0899-Lazily-create-LootContext-for-criterions.patch b/patches/server/0898-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0899-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0898-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0900-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
index bc57e531f9..bc57e531f9 100644
--- a/patches/server/0900-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0901-Add-Structure-check-API.patch b/patches/server/0900-Add-Structure-check-API.patch
index 5bbc01bd9f..5bbc01bd9f 100644
--- a/patches/server/0901-Add-Structure-check-API.patch
+++ b/patches/server/0900-Add-Structure-check-API.patch
diff --git a/patches/server/0902-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0901-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index db45e464ac..db45e464ac 100644
--- a/patches/server/0902-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0901-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0903-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0902-Restore-vanilla-entity-drops-behavior.patch
index 0eede4fd44..0eede4fd44 100644
--- a/patches/server/0903-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0902-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0904-Dont-resend-blocks-on-interactions.patch b/patches/server/0903-Dont-resend-blocks-on-interactions.patch
index 72f6df6566..04f0061970 100644
--- a/patches/server/0904-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0903-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 002e2f8e956b2631529e2189be225385dfb501df..3bddfb6f7412ab86e0c090d0cbc6cf25
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index db971851a9e219ead89d71bb97d65ff73d9fd285..bba4fbde31ef25bc086fefaa86f9a479ef6ccf26 100644
+index cb6bcf8b61793882252827309ffa99526244e445..98b5208baeaa12a5ff2788e457c542000d6ea48b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -506,10 +506,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0905-add-more-scoreboard-API.patch b/patches/server/0904-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0905-add-more-scoreboard-API.patch
+++ b/patches/server/0904-add-more-scoreboard-API.patch
diff --git a/patches/server/0906-Improve-Registry.patch b/patches/server/0905-Improve-Registry.patch
index d5769f63c0..d5769f63c0 100644
--- a/patches/server/0906-Improve-Registry.patch
+++ b/patches/server/0905-Improve-Registry.patch
diff --git a/patches/server/0907-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0906-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 8082b201b8..8082b201b8 100644
--- a/patches/server/0907-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0906-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0908-Add-experience-points-API.patch b/patches/server/0907-Add-experience-points-API.patch
index 9111f82b8f..14c94b5af4 100644
--- a/patches/server/0908-Add-experience-points-API.patch
+++ b/patches/server/0907-Add-experience-points-API.patch
@@ -18,7 +18,7 @@ index aca888c2f02b09ac6739bdc81b194c4527dd69f5..a19a795deaa7f46c92b97912e2ade006
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74b90ee971ec799cf19551ac63a9b01f77500967..a807f37a4b937fc3a1d89cb5d116224c9b3c5f49 100644
+index a343684b52594c295d5a75b9005da3434b72f329..a6b26d33de210e8c5351f3246b9ac391eb688689 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1949,6 +1949,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0909-Add-drops-to-shear-events.patch b/patches/server/0908-Add-drops-to-shear-events.patch
index 21efa0e414..d09a2508e8 100644
--- a/patches/server/0909-Add-drops-to-shear-events.patch
+++ b/patches/server/0908-Add-drops-to-shear-events.patch
@@ -44,7 +44,7 @@ index a3095eee48d8b87a35ad35da9c8a2a9ca20c92bc..88dcde6c901753d002a99333eb646bda
 +    // Paper end - custom shear drops
  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index d4d343e2d75a3e3ea787c3c68c64970f5b239f81..fad312784476d361e548a4d4ea942fa60ec72c66 100644
+index d4d343e2d75a3e3ea787c3c68c64970f5b239f81..feeb7bc34ae02e44d7f13f0bae5d175ef924c53a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -46,6 +46,7 @@ import net.minecraft.world.level.storage.loot.BuiltInLootTables;
@@ -115,7 +115,7 @@ index d4d343e2d75a3e3ea787c3c68c64970f5b239f81..fad312784476d361e548a4d4ea942fa6
 +            drops.forEach(itemstack1 -> {
 +                for (final ItemStack drop : drops) {
 +                    ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), drop);
-+                    this.spawnAtLocation(entityitem);
++                    this.spawnAtLocation(world, entityitem);
                  }
 -
 +            // Paper end - custom shear drops; moved drop generation to separate method
diff --git a/patches/server/0910-Add-PlayerShieldDisableEvent.patch b/patches/server/0909-Add-PlayerShieldDisableEvent.patch
index d2d860a028..d2d860a028 100644
--- a/patches/server/0910-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0909-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0911-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0910-Validate-ResourceLocation-in-NBT-reading.patch
index 75089641a9..75089641a9 100644
--- a/patches/server/0911-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0910-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0912-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0911-Properly-handle-experience-dropping-on-block-break.patch
index e5caf980cd..e5caf980cd 100644
--- a/patches/server/0912-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0911-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0913-Fixup-NamespacedKey-handling.patch b/patches/server/0912-Fixup-NamespacedKey-handling.patch
index 932cc370d8..932cc370d8 100644
--- a/patches/server/0913-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0912-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0914-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0913-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0914-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0913-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0915-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0914-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index a9f20c91ac..a9f20c91ac 100644
--- a/patches/server/0915-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0914-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0916-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0915-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 4ed1121ea1..4ed1121ea1 100644
--- a/patches/server/0916-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0915-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0917-Add-ShulkerDuplicateEvent.patch b/patches/server/0916-Add-ShulkerDuplicateEvent.patch
index f06c91ae48..f06c91ae48 100644
--- a/patches/server/0917-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0916-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0918-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0917-Add-api-for-spawn-egg-texture-colors.patch
index 255e25785b..255e25785b 100644
--- a/patches/server/0918-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0917-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0919-Add-Lifecycle-Event-system.patch b/patches/server/0918-Add-Lifecycle-Event-system.patch
index e2eaeec2f9..e2eaeec2f9 100644
--- a/patches/server/0919-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0918-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0920-ItemStack-Tooltip-API.patch b/patches/server/0919-ItemStack-Tooltip-API.patch
index c7e83e2f18..c7e83e2f18 100644
--- a/patches/server/0920-ItemStack-Tooltip-API.patch
+++ b/patches/server/0919-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0921-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0920-Add-getChunkSnapshot-includeLightData-parameter.patch
index ba33560bab..ba33560bab 100644
--- a/patches/server/0921-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0920-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0922-Add-FluidState-API.patch b/patches/server/0921-Add-FluidState-API.patch
index e1e2fe004f..e1e2fe004f 100644
--- a/patches/server/0922-Add-FluidState-API.patch
+++ b/patches/server/0921-Add-FluidState-API.patch
diff --git a/patches/server/0923-add-number-format-api.patch b/patches/server/0922-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0923-add-number-format-api.patch
+++ b/patches/server/0922-add-number-format-api.patch
diff --git a/patches/server/0924-improve-BanList-types.patch b/patches/server/0923-improve-BanList-types.patch
index 1b56c10b04..1b56c10b04 100644
--- a/patches/server/0924-improve-BanList-types.patch
+++ b/patches/server/0923-improve-BanList-types.patch
diff --git a/patches/server/0925-Expanded-Hopper-API.patch b/patches/server/0924-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0925-Expanded-Hopper-API.patch
+++ b/patches/server/0924-Expanded-Hopper-API.patch
diff --git a/patches/server/0926-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0925-Add-BlockBreakProgressUpdateEvent.patch
index 81399fe283..81399fe283 100644
--- a/patches/server/0926-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0925-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0927-Deprecate-ItemStack-setType.patch b/patches/server/0926-Deprecate-ItemStack-setType.patch
index e58b22013f..e58b22013f 100644
--- a/patches/server/0927-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0926-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0928-Add-CartographyItemEvent.patch b/patches/server/0927-Add-CartographyItemEvent.patch
index e02b1544db..b8a1377ce9 100644
--- a/patches/server/0928-Add-CartographyItemEvent.patch
+++ b/patches/server/0927-Add-CartographyItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 17402d393df27474b38c8d9b0b7aa424ec34d1a9..605488d9b2b20c82906b5870ffe4e0e37b6d36bf 100644
+index 836e6b705b201253f2b81d1ca0228b8a0266a1dd..d3975496dcf94d3474e891bcd3105120559b6a61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3133,6 +3133,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0929-More-Raid-API.patch b/patches/server/0928-More-Raid-API.patch
index daaeb2bdea..daaeb2bdea 100644
--- a/patches/server/0929-More-Raid-API.patch
+++ b/patches/server/0928-More-Raid-API.patch
diff --git a/patches/server/0930-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0929-Add-onboarding-message-for-initial-server-start.patch
index df74ef8161..df74ef8161 100644
--- a/patches/server/0930-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0929-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0931-Configurable-max-block-fluid-ticks.patch b/patches/server/0930-Configurable-max-block-fluid-ticks.patch
index 4699e81a98..4699e81a98 100644
--- a/patches/server/0931-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0930-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0932-Fix-bees-aging-inside-hives.patch b/patches/server/0931-Fix-bees-aging-inside-hives.patch
index 8d4dcd0b64..8d4dcd0b64 100644
--- a/patches/server/0932-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0931-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0933-Disable-memory-reserve-allocating.patch b/patches/server/0932-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0933-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0932-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0934-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0933-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 3cf04503d8..3cf04503d8 100644
--- a/patches/server/0934-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0933-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0935-Fix-DamageSource-API.patch b/patches/server/0934-Fix-DamageSource-API.patch
index 306d0de492..306d0de492 100644
--- a/patches/server/0935-Fix-DamageSource-API.patch
+++ b/patches/server/0934-Fix-DamageSource-API.patch
diff --git a/patches/server/0936-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0935-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index f476845b96..f476845b96 100644
--- a/patches/server/0936-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0935-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0937-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0936-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 7e0fabb39a..7e0fabb39a 100644
--- a/patches/server/0937-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0936-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0938-Improve-tag-parser-handling.patch b/patches/server/0937-Improve-tag-parser-handling.patch
index a3ceebed68..c7b698366d 100644
--- a/patches/server/0938-Improve-tag-parser-handling.patch
+++ b/patches/server/0937-Improve-tag-parser-handling.patch
@@ -252,7 +252,7 @@ index 898b19887ed34c87003fc63cb5905df2ba6234a5..b47eeb23055b135d5567552ba983bfbc
  
      private void write(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 605488d9b2b20c82906b5870ffe4e0e37b6d36bf..ac2a2722e154bdee0c4bbea22f3fb032c3ba39c9 100644
+index d3975496dcf94d3474e891bcd3105120559b6a61..2cef6390ce8cdc43ae7566683afc157cb3a6fd78 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,6 +778,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0939-Item-Mutation-Fixes.patch b/patches/server/0938-Item-Mutation-Fixes.patch
index f7242e591f..f7242e591f 100644
--- a/patches/server/0939-Item-Mutation-Fixes.patch
+++ b/patches/server/0938-Item-Mutation-Fixes.patch
diff --git a/patches/server/0940-Per-world-ticks-per-spawn-settings.patch b/patches/server/0939-Per-world-ticks-per-spawn-settings.patch
index a028a8c234..a028a8c234 100644
--- a/patches/server/0940-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0939-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0941-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0940-Properly-track-the-changed-item-from-dispense-events.patch
index 3885b9f8a2..3885b9f8a2 100644
--- a/patches/server/0941-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0940-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0942-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0941-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index e76c0c9c87..e76c0c9c87 100644
--- a/patches/server/0942-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0941-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0943-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0942-Add-config-for-mobs-immune-to-default-effects.patch
index c3b01a16ed..c3b01a16ed 100644
--- a/patches/server/0943-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0942-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0944-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0943-Deep-clone-nbt-tags-in-PDC.patch
index 559c6cddea..559c6cddea 100644
--- a/patches/server/0944-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0943-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0945-Support-old-UUID-format-for-NBT.patch b/patches/server/0944-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0945-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0944-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0946-Fix-shield-disable-inconsistency.patch b/patches/server/0945-Fix-shield-disable-inconsistency.patch
index 8d372bca9d..8d372bca9d 100644
--- a/patches/server/0946-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0945-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0947-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0946-Handle-Large-Packets-disconnecting-client.patch
index 32e463a242..32e463a242 100644
--- a/patches/server/0947-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0946-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0948-Fix-ItemFlags.patch b/patches/server/0947-Fix-ItemFlags.patch
index e045394f3c..e045394f3c 100644
--- a/patches/server/0948-Fix-ItemFlags.patch
+++ b/patches/server/0947-Fix-ItemFlags.patch
diff --git a/patches/server/0949-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
index 186441aa4d..186441aa4d 100644
--- a/patches/server/0949-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0950-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0949-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index e31dca1bf5..e31dca1bf5 100644
--- a/patches/server/0950-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0949-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0951-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0950-improve-checking-handled-tags-in-itemmeta.patch
index 8d257c881d..8d257c881d 100644
--- a/patches/server/0951-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0950-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0952-Expose-hasColor-to-leather-armor.patch b/patches/server/0951-Expose-hasColor-to-leather-armor.patch
index 9166ad6261..9166ad6261 100644
--- a/patches/server/0952-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0951-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0953-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0952-Added-API-to-get-player-ha-proxy-address.patch
index c194f40ac8..5fa97c5b54 100644
--- a/patches/server/0953-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0952-Added-API-to-get-player-ha-proxy-address.patch
@@ -35,7 +35,7 @@ index c62df32af11636ad408b584fcc590590ce4fb0d0..baed0bb80d44973f9323bbe536551182
                                  } else {
                                      super.channelRead(ctx, msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a807f37a4b937fc3a1d89cb5d116224c9b3c5f49..cd8c2a9bff2d207c385b7d4ffb889c1f560a5227 100644
+index a6b26d33de210e8c5351f3246b9ac391eb688689..7d8465ec67d4b2551c8fbe01964dd0cb2c94cbe8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -270,7 +270,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0954-General-ItemMeta-fixes.patch b/patches/server/0953-General-ItemMeta-fixes.patch
index 70bbb2f9d4..9b0956d39b 100644
--- a/patches/server/0954-General-ItemMeta-fixes.patch
+++ b/patches/server/0953-General-ItemMeta-fixes.patch
@@ -12,10 +12,10 @@ public net/minecraft/world/level/block/entity/BlockEntity saveId(Lnet/minecraft/
 Co-authored-by: GhastCraftHD <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index bba4fbde31ef25bc086fefaa86f9a479ef6ccf26..62529e61c8751433a8b6abe6cfb2cc414c8c3cf2 100644
+index 98b5208baeaa12a5ff2788e457c542000d6ea48b..babd89f39c43b0c64709d99bf8aca6cdc6ca1b24 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1356,6 +1356,11 @@ public final class ItemStack implements DataComponentHolder {
+@@ -1361,6 +1361,11 @@ public final class ItemStack implements DataComponentHolder {
      public void setItem(Item item) {
          this.bukkitStack = null; // Paper
          this.item = item;
diff --git a/patches/server/0955-More-Chest-Block-API.patch b/patches/server/0954-More-Chest-Block-API.patch
index d7c00f61e1..d7c00f61e1 100644
--- a/patches/server/0955-More-Chest-Block-API.patch
+++ b/patches/server/0954-More-Chest-Block-API.patch
diff --git a/patches/server/0956-Print-data-component-type-on-encoding-error.patch b/patches/server/0955-Print-data-component-type-on-encoding-error.patch
index f003f33b92..f003f33b92 100644
--- a/patches/server/0956-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0955-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0957-Brigadier-based-command-API.patch b/patches/server/0956-Brigadier-based-command-API.patch
index 8d3628ec6d..6e0484371e 100644
--- a/patches/server/0957-Brigadier-based-command-API.patch
+++ b/patches/server/0956-Brigadier-based-command-API.patch
@@ -2338,7 +2338,7 @@ index eb9dab7be7da11ab1c4046a7fc4a29d5bddf31d2..39c9c0dad159744da8322c3dfa3bfae4
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ac2a2722e154bdee0c4bbea22f3fb032c3ba39c9..4ac4ab815edf34e8037e9f16ec2f8d29b1f2cabd 100644
+index 2cef6390ce8cdc43ae7566683afc157cb3a6fd78..af3e0049beb5590520ed84b52d6df85ad22a8f23 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2429,33 +2429,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0958-Fix-issues-with-Recipe-API.patch b/patches/server/0957-Fix-issues-with-Recipe-API.patch
index ab2b6a47ef..ab2b6a47ef 100644
--- a/patches/server/0958-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0957-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0959-Fix-equipment-slot-and-group-API.patch b/patches/server/0958-Fix-equipment-slot-and-group-API.patch
index 962f6d77b2..962f6d77b2 100644
--- a/patches/server/0959-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0958-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0960-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0959-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0960-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0959-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0961-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0960-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 2453902d30..6f1042e767 100644
--- a/patches/server/0961-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0960-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -209,7 +209,7 @@ index f3456aeeab7eee5b6d0383a4bf1338dd8cc95bb3..b2fd3e936559c8fcb8b02ae3ef63c4f3
              ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4ac4ab815edf34e8037e9f16ec2f8d29b1f2cabd..93451a4cfc71ba00610c13011b73905e613b0b10 100644
+index af3e0049beb5590520ed84b52d6df85ad22a8f23..b7ff8607cd33d8e6bdab9533792cf43a434210bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2751,7 +2751,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0962-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0961-Prevent-NPE-if-hooked-entity-was-cleared.patch
index f51092a291..f51092a291 100644
--- a/patches/server/0962-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0961-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0963-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0962-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index a7fee3a0b4..6043bb02b6 100644
--- a/patches/server/0963-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0962-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cancelling BlockPlaceEvent calling onRemove
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 62529e61c8751433a8b6abe6cfb2cc414c8c3cf2..4f20e5bb143e152e19e5fb57f66d0344001ffbd9 100644
+index babd89f39c43b0c64709d99bf8aca6cdc6ca1b24..947e2a3620d73569552c5185664b7564e908007e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -500,9 +500,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0964-Add-missing-fishing-event-state.patch b/patches/server/0963-Add-missing-fishing-event-state.patch
index 5bc1574135..5bc1574135 100644
--- a/patches/server/0964-Add-missing-fishing-event-state.patch
+++ b/patches/server/0963-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0965-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0964-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 642be4bf78..3fc9866acf 100644
--- a/patches/server/0965-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0964-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93451a4cfc71ba00610c13011b73905e613b0b10..46f4d7a05d4febd1f8fd3cc2cae635a9e3da0e9e 100644
+index b7ff8607cd33d8e6bdab9533792cf43a434210bd..52eafd99ed63f5fc9596225cf45175b1287f20a1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3022,14 +3022,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0966-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0965-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0966-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0965-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0967-Adopt-MaterialRerouting.patch b/patches/server/0966-Adopt-MaterialRerouting.patch
index 648057e1dd..648057e1dd 100644
--- a/patches/server/0967-Adopt-MaterialRerouting.patch
+++ b/patches/server/0966-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0968-Suspicious-Effect-Entry-API.patch b/patches/server/0967-Suspicious-Effect-Entry-API.patch
index d2599dfa85..d2599dfa85 100644
--- a/patches/server/0968-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0967-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0969-check-if-itemstack-is-stackable-first.patch b/patches/server/0968-check-if-itemstack-is-stackable-first.patch
index a7ddd8df5b..a7ddd8df5b 100644
--- a/patches/server/0969-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0968-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0970-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
index 636f3d2440..636f3d2440 100644
--- a/patches/server/0970-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0971-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
index 33e21b4cb1..33e21b4cb1 100644
--- a/patches/server/0971-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0973-disable-forced-empty-world-ticks.patch b/patches/server/0972-disable-forced-empty-world-ticks.patch
index cf5993dc22..cf5993dc22 100644
--- a/patches/server/0973-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0972-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0974-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0973-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index f7d697b689..f7d697b689 100644
--- a/patches/server/0974-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0973-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0975-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0974-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 009447d681..009447d681 100644
--- a/patches/server/0975-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0974-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0976-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0975-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index e601a7c5a2..e601a7c5a2 100644
--- a/patches/server/0976-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0975-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0977-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0976-Allow-Saving-of-Oversized-Chunks.patch
index 7d1ee992f1..7d1ee992f1 100644
--- a/patches/server/0977-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0976-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0978-Flat-bedrock-generator-settings.patch b/patches/server/0977-Flat-bedrock-generator-settings.patch
index 1e4bccf2db..1e4bccf2db 100644
--- a/patches/server/0978-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0977-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0979-Entity-Activation-Range-2.0.patch b/patches/server/0978-Entity-Activation-Range-2.0.patch
index f340e669a8..f340e669a8 100644
--- a/patches/server/0979-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0978-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0980-Anti-Xray.patch b/patches/server/0979-Anti-Xray.patch
index 44c50f4632..f19373b3ed 100644
--- a/patches/server/0980-Anti-Xray.patch
+++ b/patches/server/0979-Anti-Xray.patch
@@ -1157,11 +1157,11 @@ index cdd66e6ce96e2613afe7f06ca8da3cfaa6704b2d..dafa2cf7d3c49fc5bdcd68d2a9528127
          if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
              new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a4937d11b79cef41f3fbf79282c0c435e794dbfe..cde19fddfc9b1c8edbc565bec4f043803651313e 100644
+index 218e18b9c7836bc4c9d3eba78e0717cabb9d6b61..d12ac1b045c6721255780c5afbbad6e7103629eb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -427,7 +427,7 @@ public abstract class PlayerList {
-                     .getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
+                     .getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
              player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
                      new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
 -                    worldserver1.getLightEngine(), (java.util.BitSet)null, (java.util.BitSet) null)
diff --git a/patches/server/0981-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0980-Use-Velocity-compression-and-cipher-natives.patch
index a57ddf2e84..a57ddf2e84 100644
--- a/patches/server/0981-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0980-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0982-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0981-Optimize-Collision-to-not-load-chunks.patch
index 0b3dc78934..0f89ea94ca 100644
--- a/patches/server/0982-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0981-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cde19fddfc9b1c8edbc565bec4f043803651313e..4b9761e58f404eedf9db835fc923a88fc1896e96 100644
+index d12ac1b045c6721255780c5afbbad6e7103629eb..59cc1702079f1d182bdbe8068aa37b5b979aa64d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -827,6 +827,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0983-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0982-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index c4c7e7fd35..c4c7e7fd35 100644
--- a/patches/server/0983-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0982-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0984-Optimize-Hoppers.patch b/patches/server/0983-Optimize-Hoppers.patch
index 7567e0fc09..0d9bca0049 100644
--- a/patches/server/0984-Optimize-Hoppers.patch
+++ b/patches/server/0983-Optimize-Hoppers.patch
@@ -62,10 +62,10 @@ index 510087723ce7497dbd9ecd42385acb31e36cf458..b37e49bd25ed327e03250415799c0777
              gameprofilerfiller.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4f20e5bb143e152e19e5fb57f66d0344001ffbd9..888454ff588927e8accc215e7429f72bb286f5aa 100644
+index 947e2a3620d73569552c5185664b7564e908007e..33e7d2884195677c4d6340d8b84c1dd85c636ec1 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -876,10 +876,16 @@ public final class ItemStack implements DataComponentHolder {
+@@ -881,10 +881,16 @@ public final class ItemStack implements DataComponentHolder {
      }
  
      public ItemStack copy() {
diff --git a/patches/server/0985-Optimize-Voxel-Shape-Merging.patch b/patches/server/0984-Optimize-Voxel-Shape-Merging.patch
index 52246713b3..52246713b3 100644
--- a/patches/server/0985-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0984-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0986-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0985-Optimize-Bit-Operations-by-inlining.patch
index b9547eb68c..b9547eb68c 100644
--- a/patches/server/0986-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0985-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0987-Remove-streams-from-hot-code.patch b/patches/server/0986-Remove-streams-from-hot-code.patch
index 37416513dc..37416513dc 100644
--- a/patches/server/0987-Remove-streams-from-hot-code.patch
+++ b/patches/server/0986-Remove-streams-from-hot-code.patch
diff --git a/patches/server/0988-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0987-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index b32ebf6b4e..b32ebf6b4e 100644
--- a/patches/server/0988-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0987-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0989-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0988-Fix-entity-type-tags-suggestions-in-selectors.patch
index 7fdb68ae3b..7fdb68ae3b 100644
--- a/patches/server/0989-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0988-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0990-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/0989-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/0990-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/0989-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/0991-Check-distance-in-entity-interactions.patch b/patches/server/0990-Check-distance-in-entity-interactions.patch
index d142b760dd..d142b760dd 100644
--- a/patches/server/0991-Check-distance-in-entity-interactions.patch
+++ b/patches/server/0990-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/0992-Configurable-Sand-Duping.patch b/patches/server/0991-Configurable-Sand-Duping.patch
index d209e03e1e..d209e03e1e 100644
--- a/patches/server/0992-Configurable-Sand-Duping.patch
+++ b/patches/server/0991-Configurable-Sand-Duping.patch
diff --git a/patches/server/0993-Properly-resend-entities.patch b/patches/server/0992-Properly-resend-entities.patch
index 82b6444c65..6acf6d708b 100644
--- a/patches/server/0993-Properly-resend-entities.patch
+++ b/patches/server/0992-Properly-resend-entities.patch
@@ -81,7 +81,7 @@ index f2dd272a01b4e946a6746865d55ebc9861f8361b..5d189ba60d40f5c42b2dacc339594ed0
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 46f4d7a05d4febd1f8fd3cc2cae635a9e3da0e9e..14a8e05420ae4ca2f1d9028e19379d162a3e6971 100644
+index 52eafd99ed63f5fc9596225cf45175b1287f20a1..e5db85f858ab376b225172e22b92b841f1f9546a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1966,6 +1966,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -102,7 +102,7 @@ index 46f4d7a05d4febd1f8fd3cc2cae635a9e3da0e9e..14a8e05420ae4ca2f1d9028e19379d16
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4b9761e58f404eedf9db835fc923a88fc1896e96..682b8926027945066921086b6773b31e626cc941 100644
+index 59cc1702079f1d182bdbe8068aa37b5b979aa64d..90c469193ecf9d04dd9e3f1a38157d47c5094985 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -397,7 +397,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0994-Registry-Modification-API.patch b/patches/server/0993-Registry-Modification-API.patch
index ac28f625c7..ac28f625c7 100644
--- a/patches/server/0994-Registry-Modification-API.patch
+++ b/patches/server/0993-Registry-Modification-API.patch
diff --git a/patches/server/0995-Add-registry-entry-and-builders.patch b/patches/server/0994-Add-registry-entry-and-builders.patch
index 8f2663ac94..8f2663ac94 100644
--- a/patches/server/0995-Add-registry-entry-and-builders.patch
+++ b/patches/server/0994-Add-registry-entry-and-builders.patch
diff --git a/patches/server/0996-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/0995-Proxy-ItemStack-to-CraftItemStack.patch
index 684b037d30..684b037d30 100644
--- a/patches/server/0996-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/0995-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/0997-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/0996-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index f0bd1ac5eb..f0bd1ac5eb 100644
--- a/patches/server/0997-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/0996-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/0998-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/0997-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index c22d5f09be..c22d5f09be 100644
--- a/patches/server/0998-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/0997-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/0999-optimize-dirt-and-snow-spreading.patch b/patches/server/0998-optimize-dirt-and-snow-spreading.patch
index e89393b028..e89393b028 100644
--- a/patches/server/0999-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/0998-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1000-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/0999-Fix-NPE-for-Jukebox-setRecord.patch
index c673e4f8c7..c673e4f8c7 100644
--- a/patches/server/1000-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/0999-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1001-fix-horse-inventories.patch b/patches/server/1000-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1001-fix-horse-inventories.patch
+++ b/patches/server/1000-fix-horse-inventories.patch
diff --git a/patches/server/1002-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index fb40d00f9a..fb40d00f9a 100644
--- a/patches/server/1002-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1003-Add-ItemType-getItemRarity.patch b/patches/server/1002-Add-ItemType-getItemRarity.patch
index 0863f02f5c..0863f02f5c 100644
--- a/patches/server/1003-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1002-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1004-Add-plugin-info-at-startup.patch b/patches/server/1003-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1004-Add-plugin-info-at-startup.patch
+++ b/patches/server/1003-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1005-Make-interaction-leniency-distance-configurable.patch b/patches/server/1004-Make-interaction-leniency-distance-configurable.patch
index 98eb372c1e..ae6223c783 100644
--- a/patches/server/1005-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1004-Make-interaction-leniency-distance-configurable.patch
@@ -12,7 +12,7 @@ This value however may be too low in high latency environments.
 The patch exposes a new configuration option to configure said value.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 14a8e05420ae4ca2f1d9028e19379d162a3e6971..c9fd2b8cc5a14d4ef4072765d5274d0c470bcfe6 100644
+index e5db85f858ab376b225172e22b92b841f1f9546a..293f83f5513d3ab6492f93834229903570009fdb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2722,7 +2722,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1006-Fix-PickupStatus-getting-reset.patch b/patches/server/1005-Fix-PickupStatus-getting-reset.patch
index c731057978..c731057978 100644
--- a/patches/server/1006-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1005-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1007-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1006-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index b06a0b6c33..b06a0b6c33 100644
--- a/patches/server/1007-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1006-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1008-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1007-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 61b8983112..e1242464dd 100644
--- a/patches/server/1008-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1007-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 450c5aa14b4195eb7123492c7a111ec6f40ce412..7d9f75e680e243ac8c7defdd150e431b47225945 100644
+index 450c5aa14b4195eb7123492c7a111ec6f40ce412..3b3c15c8bd8591aa173343251d7a504c6004e9d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -2498,4 +2498,117 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -2498,4 +2498,119 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      }
      // Paper end
  
@@ -36,8 +36,9 @@ index 450c5aa14b4195eb7123492c7a111ec6f40ce412..7d9f75e680e243ac8c7defdd150e431b
 +    }
 +
 +    private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyMaterial(final Collection<Material> materials) {
++        final net.minecraft.core.Registry<net.minecraft.world.level.block.Block> blockRegistry = net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BLOCK);
 +        return materials.stream().map(m -> {
-+            return net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(m)).build();
++            return net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(blockRegistry, CraftBlockType.bukkitToMinecraft(m)).build();
 +        }).toList();
 +    }
 +
@@ -74,11 +75,12 @@ index 450c5aa14b4195eb7123492c7a111ec6f40ce412..7d9f75e680e243ac8c7defdd150e431b
 +
 +    private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyNamespaced(final Collection<com.destroystokyo.paper.Namespaced> namespaceds) {
 +        final List<net.minecraft.advancements.critereon.BlockPredicate> predicates = new ArrayList<>();
++        final net.minecraft.core.Registry<net.minecraft.world.level.block.Block> blockRegistry = net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BLOCK);
 +        for (final com.destroystokyo.paper.Namespaced namespaced : namespaceds) {
 +            if (namespaced instanceof final org.bukkit.NamespacedKey key) {
-+                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(Objects.requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
++                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(blockRegistry, CraftBlockType.bukkitToMinecraft(Objects.requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
 +            } else if (namespaced instanceof final com.destroystokyo.paper.NamespacedTag tag) {
-+                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(net.minecraft.tags.TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(tag.getNamespace(), tag.getKey()))).build());
++                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(blockRegistry, net.minecraft.tags.TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(tag.getNamespace(), tag.getKey()))).build());
 +            }
 +        }
 +        return predicates;
diff --git a/patches/server/1009-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1008-Configuration-for-horizontal-only-item-merging.patch
index 4b16b244dd..4b16b244dd 100644
--- a/patches/server/1009-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1008-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1010-Add-skipping-world-symlink-scan.patch b/patches/server/1009-Add-skipping-world-symlink-scan.patch
index f3221508c6..f3221508c6 100644
--- a/patches/server/1010-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1009-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1011-Add-even-more-Enchantment-API.patch b/patches/server/1010-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1011-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1010-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1012-Leashable-API.patch b/patches/server/1011-Leashable-API.patch
index d54784d18c..d54784d18c 100644
--- a/patches/server/1012-Leashable-API.patch
+++ b/patches/server/1011-Leashable-API.patch
diff --git a/patches/server/1013-Fix-CraftBukkit-drag-system.patch b/patches/server/1012-Fix-CraftBukkit-drag-system.patch
index 09f889a5eb..afd7345911 100644
--- a/patches/server/1013-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1012-Fix-CraftBukkit-drag-system.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
 public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9fd2b8cc5a14d4ef4072765d5274d0c470bcfe6..1ab3f730301e8ac22702601a04ad8f1521585daa 100644
+index 293f83f5513d3ab6492f93834229903570009fdb..654531ada32d3adacca71546480abeebfdad40d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3080,6 +3080,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1014-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1013-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index c2857c2245..c2857c2245 100644
--- a/patches/server/1014-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1013-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1015-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1014-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1015-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1014-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1016-Add-enchantment-seed-update-API.patch b/patches/server/1015-Add-enchantment-seed-update-API.patch
index 3725102979..3725102979 100644
--- a/patches/server/1016-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1015-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1017-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1016-Fix-synchronise-sending-chat-to-client-with-updating.patch
index e7bfb50658..63f9be4942 100644
--- a/patches/server/1017-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1016-Fix-synchronise-sending-chat-to-client-with-updating.patch
@@ -9,7 +9,7 @@ In the case where multiple messages from different players are being processed i
 This also applies to the last seen state of the server, which becomes inconsistent in the same way as the message signature cache and would cause any messages sent to be rejected by the server too.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ab3f730301e8ac22702601a04ad8f1521585daa..1722f11ad070715077f5dcaff008b98f7ee104ab 100644
+index 654531ada32d3adacca71546480abeebfdad40d3..b57f9e048581f67ab031731553e82829d7eb7c1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2663,8 +2663,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1018-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1017-Fix-InventoryOpenEvent-cancellation.patch
index 6f31e5f363..6f31e5f363 100644
--- a/patches/server/1018-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/server/1017-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1019-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1018-Fire-BlockExpEvent-on-grindstone-use.patch
index e5944fabfe..e5944fabfe 100644
--- a/patches/server/1019-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/server/1018-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1020-Check-dead-flag-in-isAlive.patch b/patches/server/1019-Check-dead-flag-in-isAlive.patch
index 2136c68a7a..2136c68a7a 100644
--- a/patches/server/1020-Check-dead-flag-in-isAlive.patch
+++ b/patches/server/1019-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1021-Add-FeatureFlag-API.patch b/patches/server/1020-Add-FeatureFlag-API.patch
index c8da36ae78..c8da36ae78 100644
--- a/patches/server/1021-Add-FeatureFlag-API.patch
+++ b/patches/server/1020-Add-FeatureFlag-API.patch
diff --git a/patches/server/1022-Tag-Lifecycle-Events.patch b/patches/server/1021-Tag-Lifecycle-Events.patch
index dcd0a5334a..dcd0a5334a 100644
--- a/patches/server/1022-Tag-Lifecycle-Events.patch
+++ b/patches/server/1021-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1023-Item-serialization-as-json.patch b/patches/server/1022-Item-serialization-as-json.patch
index 51d1f7f808..51d1f7f808 100644
--- a/patches/server/1023-Item-serialization-as-json.patch
+++ b/patches/server/1022-Item-serialization-as-json.patch
diff --git a/patches/server/1024-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1023-Validate-slot-in-PlayerInventory-setSlot.patch
index 3c402b2284..3c402b2284 100644
--- a/patches/server/1024-Validate-slot-in-PlayerInventory-setSlot.patch
+++ b/patches/server/1023-Validate-slot-in-PlayerInventory-setSlot.patch
diff --git a/patches/server/1025-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch
index da0d05dd0d..da0d05dd0d 100644
--- a/patches/server/1025-Remove-wall-time-unused-skip-tick-protection.patch
+++ b/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch
diff --git a/patches/server/1026-Disable-pretty-printing-for-advancement-saving.patch b/patches/server/1025-Disable-pretty-printing-for-advancement-saving.patch
index c6ad9249f5..c6ad9249f5 100644
--- a/patches/server/1026-Disable-pretty-printing-for-advancement-saving.patch
+++ b/patches/server/1025-Disable-pretty-printing-for-advancement-saving.patch
diff --git a/patches/server/1027-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/server/1026-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
index baad9efd24..88334f2709 100644
--- a/patches/server/1027-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
+++ b/patches/server/1026-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerCommandPreprocessEvent on signed commands
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1722f11ad070715077f5dcaff008b98f7ee104ab..cae9682df8795c5f73e86c27d717b6f72e7e8592 100644
+index b57f9e048581f67ab031731553e82829d7eb7c1d..bcf6c5ec1cb4be806d49f30f3404498018760f91 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2195,24 +2195,32 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1028-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/server/1027-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 115ef56bd3..61f5aced36 100644
--- a/patches/server/1028-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/server/1027-Add-enchantWithLevels-with-enchantment-registry-set.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enchantWithLevels with enchantment registry set
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 944dcc1126c947b4c8c3b4fdd174eb57320abbba..260fb93e71812698beb475bab7a05b9b860c6cbd 100644
+index d9eec6cff3c7c6515f4d61bf1063e7d609d4bcb3..2f11d324ee5e8df66b65c1426e7d1a6d82990ea7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -322,6 +322,22 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/patches/server/1029-Improve-entity-effect-API.patch b/patches/server/1028-Improve-entity-effect-API.patch
index 3accb2cf6d..2b11b7ac1c 100644
--- a/patches/server/1029-Improve-entity-effect-API.patch
+++ b/patches/server/1028-Improve-entity-effect-API.patch
@@ -25,7 +25,7 @@ index ca95a36b0149d4b8a67c3b42316c5d9d0415f5dd..64c6f54cc4d0c22bc972b808cb92925c
 +    // Paper end - broadcast hurt animation
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd8c2a9bff2d207c385b7d4ffb889c1f560a5227..d6c3c497a43694988c5e05c0ef04efa5a3c1630c 100644
+index 7d8465ec67d4b2551c8fbe01964dd0cb2c94cbe8..40a9f02091e9ae06fae28508c967fe1298419eda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1294,6 +1294,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1030-Add-recipeBrewTime.patch b/patches/server/1029-Add-recipeBrewTime.patch
index 39d7149206..39d7149206 100644
--- a/patches/server/1030-Add-recipeBrewTime.patch
+++ b/patches/server/1029-Add-recipeBrewTime.patch
diff --git a/patches/server/1031-Call-bucket-events-for-cauldrons.patch b/patches/server/1030-Call-bucket-events-for-cauldrons.patch
index ab192b82a4..ab192b82a4 100644
--- a/patches/server/1031-Call-bucket-events-for-cauldrons.patch
+++ b/patches/server/1030-Call-bucket-events-for-cauldrons.patch
diff --git a/patches/server/1032-Add-PlayerInsertLecternBookEvent.patch b/patches/server/1031-Add-PlayerInsertLecternBookEvent.patch
index e410ce7bc2..e410ce7bc2 100644
--- a/patches/server/1032-Add-PlayerInsertLecternBookEvent.patch
+++ b/patches/server/1031-Add-PlayerInsertLecternBookEvent.patch
diff --git a/patches/server/1033-Void-damage-configuration-API.patch b/patches/server/1032-Void-damage-configuration-API.patch
index b71b4b8314..b71b4b8314 100644
--- a/patches/server/1033-Void-damage-configuration-API.patch
+++ b/patches/server/1032-Void-damage-configuration-API.patch
diff --git a/patches/server/1034-Add-Offline-PDC-API.patch b/patches/server/1033-Add-Offline-PDC-API.patch
index f1513955cb..f1513955cb 100644
--- a/patches/server/1034-Add-Offline-PDC-API.patch
+++ b/patches/server/1033-Add-Offline-PDC-API.patch
diff --git a/patches/server/1035-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/server/1034-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
index f8c089a57c..f8c089a57c 100644
--- a/patches/server/1035-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
+++ b/patches/server/1034-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
diff --git a/patches/server/1036-Add-proper-async-player-disconnections.patch b/patches/server/1035-Add-proper-async-player-disconnections.patch
index 9522b5a4cb..6369e9271b 100644
--- a/patches/server/1036-Add-proper-async-player-disconnections.patch
+++ b/patches/server/1035-Add-proper-async-player-disconnections.patch
@@ -74,7 +74,7 @@ index fc242acade3ff06c9213428cde103cf078216382..b0bc66dc7248aae691dcab68b925b52a
          return this.server.isSingleplayerOwner(this.playerProfile());
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cae9682df8795c5f73e86c27d717b6f72e7e8592..bffbf87a546cf8b5ffc0a58d853bacd5d7759abf 100644
+index bcf6c5ec1cb4be806d49f30f3404498018760f91..eef96e946b80064fe211039a65db4192ea7a52d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -769,7 +769,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -132,7 +132,7 @@ index cae9682df8795c5f73e86c27d717b6f72e7e8592..bffbf87a546cf8b5ffc0a58d853bacd5
              return optional;
 @@ -2498,7 +2498,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // this.chatSpamThrottler.increment();
-         if (counted && !this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { // Paper - exclude from SpigotConfig.spamExclusions
+         if (!this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) {
              // CraftBukkit end
 -            this.disconnect((Component) Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
 +            this.disconnectAsync((Component) Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause // Paper - add proper async disconnect
diff --git a/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch
index a5951afc90..a5951afc90 100644
--- a/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch