264 files changed, 134 insertions, 107 deletions

diff --git a/patches/api/0165-Entity-getEntitySpawnReason.patch b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
index 3b9f0bedd1..703394db19 100644
--- a/patches/api/0165-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
@@ -1,15 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
-Subject: [PATCH] Entity#getEntitySpawnReason
-
-Allows you to return the SpawnReason for why an Entity Spawned
+Subject: [PATCH] Fixes and additions to the spawn reason API
 
+Expose an entities spawn reason on the entity.
 Pre existing entities will return NATURAL if it was a non
 persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
+Additionally, add missing spawn reasons.
+
 Co-authored-by: Aurora <[email protected]>
+Co-authored-by: Jakub Zacek <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
 index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae2540a97288 100644
@@ -27,3 +29,20 @@ index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae25
 +    org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
      // Paper end
  }
+diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+index 15cb5ea4b68eca070f73d2b899543274415ad240..2de81ee445824562aec7b52b7369b75280aab959 100644
+--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+@@ -206,6 +206,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
+          * When a creature is spawned by an enchantment
+          */
+         ENCHANTMENT,
++        // Paper start - Fixes and additions to the SpawnReason API
++        /**
++         * When an entity spawns from an ominous item spawner
++         */
++        OMINOUS_ITEM_SPAWNER,
++        // Paper end - Fixes and additions to the SpawnReason API
+         /**
+          * When a creature is spawned by plugins
+          */
diff --git a/patches/server/0282-Entity-getEntitySpawnReason.patch b/patches/server/0282-Fixes-and-additions-to-the-spawn-reason-API.patch
index 52983d8beb..0ef27fbf20 100644
--- a/patches/server/0282-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0282-Fixes-and-additions-to-the-spawn-reason-API.patch
@@ -1,14 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
-Subject: [PATCH] Entity#getEntitySpawnReason
-
-Allows you to return the SpawnReason for why an Entity Spawned
+Subject: [PATCH] Fixes and additions to the spawn reason API
 
+Expose an entities spawn reason on the entity.
 Pre existing entities will return NATURAL if it was a non
 persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
+Additionally, add missing spawn reasons.
+
+Co-authored-by: Jake Potrebic <[email protected]>
+Co-authored-by: Doc <[email protected]>
+
 diff --git a/src/main/java/net/minecraft/server/commands/SummonCommand.java b/src/main/java/net/minecraft/server/commands/SummonCommand.java
 index bf72cf288ade52ee8cc41ca978f368b3ad575951..798999be50d26be357ef3c6d5b9383ce4d1048c1 100644
 --- a/src/main/java/net/minecraft/server/commands/SummonCommand.java
@@ -107,6 +111,45 @@ index 2e376b0b2bf2d49ad0669b6e6fd287628a72ea64..869cd3723c6704e7512f4637682476b8
              // Paper end
  
          } catch (Throwable throwable) {
+diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+index 69a661f01e43d17262fd2845dde5528416bbe456..c0062c8f83641ff30e79a309c0bb9930ba4b422a 100644
+--- a/src/main/java/net/minecraft/world/entity/EntityType.java
++++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+@@ -366,7 +366,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+     @Nullable
+     public T spawn(ServerLevel world, @Nullable ItemStack stack, @Nullable Player player, BlockPos pos, MobSpawnType spawnReason, boolean alignPosition, boolean invertY) {
+         // CraftBukkit start
+-        return this.spawn(world, stack, player, pos, spawnReason, alignPosition, invertY, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
++        return this.spawn(world, stack, player, pos, spawnReason, alignPosition, invertY, spawnReason == MobSpawnType.DISPENSER ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DISPENSE_EGG : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Paper - use correct spawn reason for dispenser spawn eggs
+     }
+ 
+     @Nullable
+diff --git a/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java b/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java
+index 146cbec9e64b6c77759aadd0d0c4e989018e9aef..4c4545b3732d4c08afdb7bc1913169a96e82825c 100644
+--- a/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java
++++ b/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java
+@@ -89,7 +89,7 @@ public class OminousItemSpawner extends Entity {
+                 entity = new ItemEntity(level, this.getX(), this.getY(), this.getZ(), itemStack);
+             }
+ 
+-            level.addFreshEntity(entity);
++            level.addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.OMINOUS_ITEM_SPAWNER); // Paper - Fixes and additions to the SpawnReason API
+             level.levelEvent(3021, this.blockPosition(), 1);
+             level.gameEvent(entity, GameEvent.ENTITY_PLACE, this.position());
+             this.setItem(ItemStack.EMPTY);
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
+index 1dade7a4fbdf190661e4431496349444467509cc..3e869620db35d38db39fbeed715b898ef9d2743c 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
+@@ -65,7 +65,7 @@ public class DragonFireball extends AbstractHurtingProjectile {
+ 
+                 if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) entityareaeffectcloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
+                 this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
+-                this.level().addFreshEntity(entityareaeffectcloud);
++                this.level().addFreshEntity(entityareaeffectcloud, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EXPLOSION); // Paper - use correct spawn reason
+                 } else entityareaeffectcloud.discard(null); // Paper - EnderDragon Events
+                 this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             }
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 index ee897b8c9462dbb3d7be9a2994753155065ce205..1d0964a7f544735a0213d5c7832c71f53db139a9 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
@@ -119,6 +162,32 @@ index ee897b8c9462dbb3d7be9a2994753155065ce205..1d0964a7f544735a0213d5c7832c71f5
                          flag = true; // Paper
                          // CraftBukkit start
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
+diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
+index 211b7809f099678bc3bd64bd29fd9c4d19e3ab0d..b968129b9a93fdf771caba5f768456070543ba6a 100644
+--- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
+@@ -111,7 +111,7 @@ public class FrogspawnBlock extends Block {
+                 int k = random.nextInt(1, 361);
+                 tadpole.moveTo(d, (double)pos.getY() - 0.5, e, (float)k, 0.0F);
+                 tadpole.setPersistenceRequired();
+-                world.addFreshEntity(tadpole);
++                world.addFreshEntity(tadpole, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // Paper - use correct spawn reason
+             }
+         }
+     }
+diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
+index 1eda49c9ce8ee009cb08b18f02f59b37c2118628..14a5cd54820243f4ca59857b0d67c1e86457d590 100644
+--- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
+@@ -73,7 +73,7 @@ public class SnifferEggBlock extends Block {
+                 Vec3 vec3 = pos.getCenter();
+                 sniffer.setBaby(true);
+                 sniffer.moveTo(vec3.x(), vec3.y(), vec3.z(), Mth.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F);
+-                world.addFreshEntity(sniffer);
++                world.addFreshEntity(sniffer, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // Paper - use correct spawn reason
+             }
+         }
+     }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 index dbc0b69603dcffbf3d41d79719aa0f2b7da4a131..dd86f5ec5b2051aeea4e19ff97146362b1e8d019 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
diff --git a/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch
deleted file mode 100644
index e66bfd2b7d..0000000000
--- a/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sun, 25 Sep 2022 11:21:01 -0700
-Subject: [PATCH] Fixes and additions to the SpawnReason API
-
-Fixes some wrong reasons, and adds missing spawn reasons for entities.
-
-Co-authored-by: Doc <[email protected]>
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 69a661f01e43d17262fd2845dde5528416bbe456..c0062c8f83641ff30e79a309c0bb9930ba4b422a 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -366,7 +366,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-     @Nullable
-     public T spawn(ServerLevel world, @Nullable ItemStack stack, @Nullable Player player, BlockPos pos, MobSpawnType spawnReason, boolean alignPosition, boolean invertY) {
-         // CraftBukkit start
--        return this.spawn(world, stack, player, pos, spawnReason, alignPosition, invertY, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
-+        return this.spawn(world, stack, player, pos, spawnReason, alignPosition, invertY, spawnReason == MobSpawnType.DISPENSER ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DISPENSE_EGG : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Paper - use correct spawn reason for dispenser spawn eggs
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-index 1dade7a4fbdf190661e4431496349444467509cc..3e869620db35d38db39fbeed715b898ef9d2743c 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-@@ -65,7 +65,7 @@ public class DragonFireball extends AbstractHurtingProjectile {
- 
-                 if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) entityareaeffectcloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
-                 this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
--                this.level().addFreshEntity(entityareaeffectcloud);
-+                this.level().addFreshEntity(entityareaeffectcloud, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EXPLOSION); // Paper - use correct spawn reason
-                 } else entityareaeffectcloud.discard(null); // Paper - EnderDragon Events
-                 this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
-             }
-diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-index 3c4949965c0fad3c6200d0fd1e31ebe844ba6e0e..f2d4264743b6070f36adb66d00a3de0a72b86846 100644
---- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-@@ -117,7 +117,7 @@ public class FrogspawnBlock extends Block {
-                 int k = random.nextInt(1, 361);
-                 tadpole.moveTo(d, (double)pos.getY() - 0.5, e, (float)k, 0.0F);
-                 tadpole.setPersistenceRequired();
--                world.addFreshEntity(tadpole);
-+                world.addFreshEntity(tadpole, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // Paper - use correct spawn reason
-             }
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-index 38288f20306632e6546c95b4cb1a42806be49975..f53808e200bd83ab80954ec5c1e9c14250302be8 100644
---- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-@@ -87,7 +87,7 @@ public class SnifferEggBlock extends Block {
-                 Vec3 vec3 = pos.getCenter();
-                 sniffer.setBaby(true);
-                 sniffer.moveTo(vec3.x(), vec3.y(), vec3.z(), Mth.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F);
--                world.addFreshEntity(sniffer);
-+                world.addFreshEntity(sniffer, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // Paper - use correct spawn reason
-             }
-         }
-     }
diff --git a/patches/server/0783-fix-Instruments.patch b/patches/server/0782-fix-Instruments.patch
index a77e5ed5f6..44204573e7 100644
--- a/patches/server/0783-fix-Instruments.patch
+++ b/patches/server/0782-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 90ce5c386d46f10e14df67953938168c29d24c6a..6503bce4c0281619489adc01fa1da0c59b433875 100644
+index 02b9233ecf929ac9ec7d304231d8bc66fc00dad4..682c5e9328d965bf335bb06ac7aedf6d49b1c6cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -768,7 +768,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0784-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0783-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 3a64891f6a..3a64891f6a 100644
--- a/patches/server/0784-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0783-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0785-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0784-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0785-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0784-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0786-Add-BlockLockCheckEvent.patch b/patches/server/0785-Add-BlockLockCheckEvent.patch
index deeeae6839..deeeae6839 100644
--- a/patches/server/0786-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0785-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0787-Add-Sneaking-API-for-Entities.patch b/patches/server/0786-Add-Sneaking-API-for-Entities.patch
index a8db30ee3c..a8db30ee3c 100644
--- a/patches/server/0787-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0786-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0788-Improve-logging-and-errors.patch b/patches/server/0787-Improve-logging-and-errors.patch
index 243a962373..243a962373 100644
--- a/patches/server/0788-Improve-logging-and-errors.patch
+++ b/patches/server/0787-Improve-logging-and-errors.patch
diff --git a/patches/server/0789-Improve-PortalEvents.patch b/patches/server/0788-Improve-PortalEvents.patch
index d9ad0225b3..d9ad0225b3 100644
--- a/patches/server/0789-Improve-PortalEvents.patch
+++ b/patches/server/0788-Improve-PortalEvents.patch
diff --git a/patches/server/0790-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0789-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0790-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0789-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0790-Add-missing-SpigotConfig-logCommands-check.patch
index a7d5349548..a7d5349548 100644
--- a/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0790-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0792-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0791-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0792-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0791-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0793-Flying-Fall-Damage.patch b/patches/server/0792-Flying-Fall-Damage.patch
index 4132811a77..4132811a77 100644
--- a/patches/server/0793-Flying-Fall-Damage.patch
+++ b/patches/server/0792-Flying-Fall-Damage.patch
diff --git a/patches/server/0794-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0793-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 1748503da4..1748503da4 100644
--- a/patches/server/0794-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0793-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0795-config-for-disabling-entity-tag-tags.patch b/patches/server/0794-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0795-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0794-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0796-Use-single-player-info-update-packet-on-join.patch b/patches/server/0795-Use-single-player-info-update-packet-on-join.patch
index 4552daec45..4552daec45 100644
--- a/patches/server/0796-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0795-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0797-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0796-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 8f9bf2cb24..8f9bf2cb24 100644
--- a/patches/server/0797-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0796-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0798-Win-Screen-API.patch b/patches/server/0797-Win-Screen-API.patch
index 6fb9c91a90..6c72c065c2 100644
--- a/patches/server/0798-Win-Screen-API.patch
+++ b/patches/server/0797-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 207e72cad59a07c0750e9303dd21519c83ab2358..ee5d93cd0c7ea7376e8488265d4e21610edeedc2 100644
+index 4bcceef859099405a3d78bc7e6b12c778e906d72..d0cd2a8c99d607e36d37718b9e2c439f4a939535 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1305,6 +1305,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0799-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0798-Remove-CraftItemStack-setAmount-null-assignment.patch
index 80397182f2..ce34d80c3f 100644
--- a/patches/server/0799-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0798-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index a147b54668854668b02bbe39c9eae22bb98dc217..8d7e7e831792422d6e9f3210496c577fb64d597f 100644
+index 8468bf6676b7ade3508085f44fac8980a8c6081e..c57051b35cb42d986833030655a63b9dff3c29bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -163,7 +163,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0800-Fix-force-opening-enchantment-tables.patch b/patches/server/0799-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..db009af8c8 100644
--- a/patches/server/0800-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0799-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 79faf3c64891899bf5d6d119154aba02d4665b3b..e1150d36de56466ad9fdd5f2cdb4c30855d4af70 100644
+index 0213898b4d029ea9260a755d6411d909a1b6885c..9ab3fc287480aedcb4033801d4f092719e933454 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -403,7 +403,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0801-Add-Entity-Body-Yaw-API.patch b/patches/server/0800-Add-Entity-Body-Yaw-API.patch
index ec4ca323aa..ec4ca323aa 100644
--- a/patches/server/0801-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0800-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0802-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0801-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0802-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0801-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0803-Add-EntityFertilizeEggEvent.patch b/patches/server/0802-Add-EntityFertilizeEggEvent.patch
index f8723b10b0..f8723b10b0 100644
--- a/patches/server/0803-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0802-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0804-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0803-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 99130d8f1a..99130d8f1a 100644
--- a/patches/server/0804-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0803-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0805-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0804-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0805-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0804-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0806-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0805-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0806-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0805-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0806-Fix-advancement-triggers-for-entity-damage.patch
index 4ebe570740..4ebe570740 100644
--- a/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0806-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0808-Fix-text-display-error-on-spawn.patch b/patches/server/0807-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0808-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0807-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0809-Fix-inventories-returning-null-Locations.patch b/patches/server/0808-Fix-inventories-returning-null-Locations.patch
index eabfae28c5..eabfae28c5 100644
--- a/patches/server/0809-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0808-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0810-Add-Shearable-API.patch b/patches/server/0809-Add-Shearable-API.patch
index 675a1bf358..675a1bf358 100644
--- a/patches/server/0810-Add-Shearable-API.patch
+++ b/patches/server/0809-Add-Shearable-API.patch
diff --git a/patches/server/0811-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0810-Fix-SpawnEggMeta-get-setSpawnedType.patch
index f3afed07e4..f3afed07e4 100644
--- a/patches/server/0811-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0810-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0812-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0811-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0812-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0811-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0812-Treat-sequence-violations-like-they-should-be.patch
index 0a8d25783a..0a8d25783a 100644
--- a/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0812-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0813-Prevent-causing-expired-keys-from-impacting-new-join.patch
index d08f848c6e..d08f848c6e 100644
--- a/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0813-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0815-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0814-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 9f9f6c26b3..9f9f6c26b3 100644
--- a/patches/server/0815-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0814-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0816-Use-array-for-gamerule-storage.patch b/patches/server/0815-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0816-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0815-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0817-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0816-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0817-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0816-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0818-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0817-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0818-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0817-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0819-Add-Mob-Experience-reward-API.patch b/patches/server/0818-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0819-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0818-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0820-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0819-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0820-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0819-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0821-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0820-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0821-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0820-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0822-More-accurate-isInOpenWater-impl.patch b/patches/server/0821-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0822-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0821-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0823-Expand-PlayerItemMendEvent.patch b/patches/server/0822-Expand-PlayerItemMendEvent.patch
index 5cc04e3321..5cc04e3321 100644
--- a/patches/server/0823-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0822-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0824-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0823-Refresh-ProjectileSource-for-projectiles.patch
index 7388f355f9..7388f355f9 100644
--- a/patches/server/0824-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0823-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0825-Add-transient-modifier-API.patch b/patches/server/0824-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0825-Add-transient-modifier-API.patch
+++ b/patches/server/0824-Add-transient-modifier-API.patch
diff --git a/patches/server/0826-Fix-block-place-logic.patch b/patches/server/0825-Fix-block-place-logic.patch
index 3796cc773d..3796cc773d 100644
--- a/patches/server/0826-Fix-block-place-logic.patch
+++ b/patches/server/0825-Fix-block-place-logic.patch
diff --git a/patches/server/0827-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0826-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index ba85bd867f..89ec0d95ff 100644
--- a/patches/server/0827-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0826-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 96a7e80e3efab1bf626fb7aff61e095ca09789d4..f0b166a7fbeb222b97b5f2770c20d98df5d9bcc8 100644
+index 57510b85caf8914290ab0afb89cfb773158715b8..8777e634a69825302da7ed5031a344b80724783e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -571,7 +571,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0828-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0827-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0828-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0827-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0829-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0828-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 5c55e8560a..5c55e8560a 100644
--- a/patches/server/0829-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0828-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0830-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0829-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0830-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0829-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0831-Fix-sniffer-removeExploredLocation.patch b/patches/server/0830-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0831-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0830-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0831-Add-method-to-remove-all-active-potion-effects.patch
index eb810dfef5..eb810dfef5 100644
--- a/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0831-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0833-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0832-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0833-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0832-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0834-Add-event-for-player-editing-sign.patch b/patches/server/0833-Add-event-for-player-editing-sign.patch
index a7fbf6addc..231c6c0fc3 100644
--- a/patches/server/0834-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0833-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 f0b166a7fbeb222b97b5f2770c20d98df5d9bcc8..92be749721f26e9385e592a985db58cf05c67801 100644
+index 8777e634a69825302da7ed5031a344b80724783e..a6ca820adf6e86f8358967d8d3b2e45cd1135b2c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -550,7 +550,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0835-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0834-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0835-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0834-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0836-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0835-Fix-cmd-permission-levels-for-command-blocks.patch
index 5167eee08c..5167eee08c 100644
--- a/patches/server/0836-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0835-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0837-Add-option-to-disable-block-updates.patch b/patches/server/0836-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0837-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0836-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0838-Call-missing-BlockDispenseEvent.patch b/patches/server/0837-Call-missing-BlockDispenseEvent.patch
index e4be646fe3..e4be646fe3 100644
--- a/patches/server/0838-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0837-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0838-Don-t-load-chunks-for-supporting-block-checks.patch
index 4d234a8fb3..4d234a8fb3 100644
--- a/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0838-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0840-Optimize-player-lookups-for-beacons.patch b/patches/server/0839-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0840-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0839-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0841-Add-Sign-getInteractableSideFor.patch b/patches/server/0840-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0841-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0840-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0842-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0841-fix-item-meta-for-tadpole-buckets.patch
index 0fc39b3ea1..0fc39b3ea1 100644
--- a/patches/server/0842-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0841-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0843-Fix-BanList-API.patch b/patches/server/0842-Fix-BanList-API.patch
index 995aa9c90a..995aa9c90a 100644
--- a/patches/server/0843-Fix-BanList-API.patch
+++ b/patches/server/0842-Fix-BanList-API.patch
diff --git a/patches/server/0844-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0843-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0844-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0843-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0845-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0844-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0845-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0844-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0846-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0845-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0846-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0845-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0847-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0846-ExperienceOrb-should-call-EntitySpawnEvent.patch
index e3ebc75918..e3ebc75918 100644
--- a/patches/server/0847-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0846-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0848-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0847-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0848-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0847-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0849-Add-whitelist-events.patch b/patches/server/0848-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0849-Add-whitelist-events.patch
+++ b/patches/server/0848-Add-whitelist-events.patch
diff --git a/patches/server/0850-Implement-PlayerFailMoveEvent.patch b/patches/server/0849-Implement-PlayerFailMoveEvent.patch
index e222dfa6e2..e222dfa6e2 100644
--- a/patches/server/0850-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0849-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0851-Folia-scheduler-and-owned-region-API.patch b/patches/server/0850-Folia-scheduler-and-owned-region-API.patch
index 02f361a409..02f361a409 100644
--- a/patches/server/0851-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0850-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0852-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0851-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0852-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0851-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0853-API-for-updating-recipes-on-clients.patch b/patches/server/0852-API-for-updating-recipes-on-clients.patch
index 5c29dfb157..5c29dfb157 100644
--- a/patches/server/0853-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0852-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0854-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0853-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0854-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0853-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0855-Only-capture-actual-tree-growth.patch b/patches/server/0854-Only-capture-actual-tree-growth.patch
index 2ca8f263b7..74ca9ab6b6 100644
--- a/patches/server/0855-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0854-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 78951f50188528718cdb3dbbaabe3f9f2760ffe3..7826e2a52da47914aca39fef958b8f39
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 92be749721f26e9385e592a985db58cf05c67801..1f2e6f57ffb827ef9bf3623bfdde07db21edf6ee 100644
+index a6ca820adf6e86f8358967d8d3b2e45cd1135b2c..780b2fada591fb1b504fbf4828c31ec0dd1c25db 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -466,6 +466,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0856-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0855-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0856-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0855-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0857-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0856-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0857-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0856-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0858-Use-correct-seed-on-api-world-load.patch b/patches/server/0857-Use-correct-seed-on-api-world-load.patch
index f29dbe4467..f29dbe4467 100644
--- a/patches/server/0858-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0857-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0859-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0858-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0859-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0858-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0860-Cache-map-ids-on-item-frames.patch b/patches/server/0859-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0860-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0859-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0861-Fix-custom-statistic-criteria-creation.patch b/patches/server/0860-Fix-custom-statistic-criteria-creation.patch
index 23faf0bb9f..23faf0bb9f 100644
--- a/patches/server/0861-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0860-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0862-Bandaid-fix-for-Effect.patch b/patches/server/0861-Bandaid-fix-for-Effect.patch
index 2a382dcc25..bc688c91d4 100644
--- a/patches/server/0862-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0861-Bandaid-fix-for-Effect.patch
@@ -81,7 +81,7 @@ index 1ef380cbd77132b743520f952afa8321042bec6d..7fe43ac849d3ee80c447e8c024ea39fd
              // 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 85f403c07ff146a0da232ac7bfc0551a2fa2601b..296bb88ed34f499535ef0b9fdffa67b7de81c60b 100644
+index 49e22acbcdcdb2108b360c2a6e40c752c12ab9f6..4c5249eab8e59b46c902f2cb65f90aa2a66a33d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -917,7 +917,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0863-SculkCatalyst-bloom-API.patch b/patches/server/0862-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0863-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0862-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0864-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0863-API-for-an-entity-s-scoreboard-name.patch
index a7d3664dd4..a7d3664dd4 100644
--- a/patches/server/0864-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0863-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0865-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0864-Deprecate-and-replace-methods-with-old-StructureType.patch
index 7eeb4db8f2..7eeb4db8f2 100644
--- a/patches/server/0865-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0864-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0865-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 200d3d6a57..200d3d6a57 100644
--- a/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0865-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0867-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0866-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0867-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0866-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0868-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0867-Fire-entity-death-event-for-ender-dragon.patch
index 7f6054281d..7f6054281d 100644
--- a/patches/server/0868-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0867-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0869-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0868-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 8cb5db78e2..8cb5db78e2 100644
--- a/patches/server/0869-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0868-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0870-Add-Listing-API-for-Player.patch b/patches/server/0869-Add-Listing-API-for-Player.patch
index 8f4e9c9d40..8f4e9c9d40 100644
--- a/patches/server/0870-Add-Listing-API-for-Player.patch
+++ b/patches/server/0869-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0871-Configurable-Region-Compression-Format.patch b/patches/server/0870-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0871-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0870-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0872-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0871-Add-BlockFace-to-BlockDamageEvent.patch
index 7721e78d75..7721e78d75 100644
--- a/patches/server/0872-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0871-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0873-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0872-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0873-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0872-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0874-Expand-Pose-API.patch b/patches/server/0873-Expand-Pose-API.patch
index b1ad16fc18..b1ad16fc18 100644
--- a/patches/server/0874-Expand-Pose-API.patch
+++ b/patches/server/0873-Expand-Pose-API.patch
diff --git a/patches/server/0875-More-DragonBattle-API.patch b/patches/server/0874-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0875-More-DragonBattle-API.patch
+++ b/patches/server/0874-More-DragonBattle-API.patch
diff --git a/patches/server/0876-Add-PlayerPickItemEvent.patch b/patches/server/0875-Add-PlayerPickItemEvent.patch
index b9ddd8ed60..b9ddd8ed60 100644
--- a/patches/server/0876-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0875-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0877-Allow-trident-custom-damage.patch b/patches/server/0876-Allow-trident-custom-damage.patch
index 95137bd7d5..95137bd7d5 100644
--- a/patches/server/0877-Allow-trident-custom-damage.patch
+++ b/patches/server/0876-Allow-trident-custom-damage.patch
diff --git a/patches/server/0878-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0877-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0878-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0877-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0879-Optimize-nearest-structure-border-iteration.patch b/patches/server/0878-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0879-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0878-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0880-Implement-OfflinePlayer-isConnected.patch b/patches/server/0879-Implement-OfflinePlayer-isConnected.patch
index f0ac88e8c8..b56ab203ed 100644
--- a/patches/server/0880-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0879-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef
      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 e4de4ed09b20ed224eadcbc6d650192897c4def5..d5757fa3d4254535448eb040593c8c23995b7bc9 100644
+index 204e4e4dd197088457cd6d2a18f86287ca3324b2..ea742de14280c64f94461ebfb4647536a1dddb4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -256,6 +256,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0881-Fix-inventory-desync.patch b/patches/server/0880-Fix-inventory-desync.patch
index d02feb84be..faa218a853 100644
--- a/patches/server/0881-Fix-inventory-desync.patch
+++ b/patches/server/0880-Fix-inventory-desync.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix inventory desync
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9d6c6a979fb1751ca90c9c1210ec52bbf12495f4..46d6fb2591f47c245446db210a00cbaa1e2bd99b 100644
+index ccb4cbb28fc9c565571e1f9da2bf459cec25d36c..b5035cc4b5cfa246487dc5091cc5d43e04253d6d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -402,6 +402,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0882-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0881-Add-titleOverride-to-InventoryOpenEvent.patch
index c8738e3bfc..c8738e3bfc 100644
--- a/patches/server/0882-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0881-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0883-Configure-sniffer-egg-hatch-time.patch b/patches/server/0882-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0883-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0882-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0884-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0883-Do-crystal-portal-proximity-check-before-entity-look.patch
index 67d506a715..67d506a715 100644
--- a/patches/server/0884-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0883-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0885-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0884-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0885-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0884-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0885-Add-slot-sanity-checks-in-container-clicks.patch
index 00c27f3999..00c27f3999 100644
--- a/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0885-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0887-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0886-Call-BlockRedstoneEvents-for-lecterns.patch
index b2cf0ce209..b2cf0ce209 100644
--- a/patches/server/0887-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0886-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0887-Allow-proper-checking-of-empty-item-stacks.patch
index 4e10b7651f..f6dbcfa46d 100644
--- a/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0887-Allow-proper-checking-of-empty-item-stacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8d7e7e831792422d6e9f3210496c577fb64d597f..41c0cfc88f2ec48c1bb8ac10a78f89bf1f2f2319 100644
+index c57051b35cb42d986833030655a63b9dff3c29bb..631076ebbf90d0d597ee2fc49f036d1fba34ab51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -39,12 +39,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0889-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0888-Fix-silent-equipment-change-for-mobs.patch
index edc3ea39f0..edc3ea39f0 100644
--- a/patches/server/0889-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0888-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0890-Fix-spigot-s-Forced-Stats.patch b/patches/server/0889-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0890-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0889-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0890-Add-missing-InventoryHolders-to-inventories.patch
index ae956d4693..ae956d4693 100644
--- a/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0890-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0892-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0891-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0892-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0891-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0893-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0892-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0893-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0892-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0894-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0893-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0894-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0893-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0895-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0895-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0896-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0895-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0896-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0895-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0897-Fix-missing-map-initialize-event-call.patch b/patches/server/0896-Fix-missing-map-initialize-event-call.patch
index 214c9bce18..214c9bce18 100644
--- a/patches/server/0897-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0896-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0898-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0897-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0898-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0897-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0899-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0898-Fix-UnsafeValues-loadAdvancement.patch
index ff17036140..ff17036140 100644
--- a/patches/server/0899-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0898-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0900-Add-player-idle-duration-API.patch b/patches/server/0899-Add-player-idle-duration-API.patch
index eac8276c5d..eac8276c5d 100644
--- a/patches/server/0900-Add-player-idle-duration-API.patch
+++ b/patches/server/0899-Add-player-idle-duration-API.patch
diff --git a/patches/server/0901-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0900-Don-t-check-if-we-can-see-non-visible-entities.patch
index 246f9bf864..246f9bf864 100644
--- a/patches/server/0901-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0900-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0902-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0901-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0902-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0901-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0903-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0902-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 10e1013d26..ef0d009597 100644
--- a/patches/server/0903-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0902-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 141b79346d6826a5fcea04f2d65506448cbed254..c24f27206dea30b99f2c5b80d8e011b7bc2233e8 100644
+index bababc918704a671ee4635ba0c79219d94474821..cb2cda2cb472b6ca0dd9b4fd1aea74ec3d215bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1127,7 +1127,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0904-Optimize-VarInts.patch b/patches/server/0903-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0904-Optimize-VarInts.patch
+++ b/patches/server/0903-Optimize-VarInts.patch
diff --git a/patches/server/0905-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0904-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0905-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0904-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0906-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0905-Add-predicate-for-blocks-when-raytracing.patch
index 96bceb6bfa..96bceb6bfa 100644
--- a/patches/server/0906-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0905-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0907-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0906-Broadcast-take-item-packets-with-collector-as-source.patch
index 25d46b180a..25d46b180a 100644
--- a/patches/server/0907-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0906-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0908-Expand-LingeringPotion-API.patch b/patches/server/0907-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0908-Expand-LingeringPotion-API.patch
+++ b/patches/server/0907-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0909-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0908-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 00e51b071b..00e51b071b 100644
--- a/patches/server/0909-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0908-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0910-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0909-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0910-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0909-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0911-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0910-Fix-several-issues-with-EntityBreedEvent.patch
index 6a97d9fb9e..6a97d9fb9e 100644
--- a/patches/server/0911-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0910-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0912-Add-UUID-attribute-modifier-API.patch b/patches/server/0911-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0912-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0911-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0913-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0912-Fix-missing-event-call-for-entity-teleport-API.patch
index 79cebb8989..79cebb8989 100644
--- a/patches/server/0913-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0912-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0914-Lazily-create-LootContext-for-criterions.patch b/patches/server/0913-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0914-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0913-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0915-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0914-Don-t-fire-sync-events-during-worldgen.patch
index 01cd11852f..01cd11852f 100644
--- a/patches/server/0915-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0914-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0916-Add-Structure-check-API.patch b/patches/server/0915-Add-Structure-check-API.patch
index 93eeb5ef48..93eeb5ef48 100644
--- a/patches/server/0916-Add-Structure-check-API.patch
+++ b/patches/server/0915-Add-Structure-check-API.patch
diff --git a/patches/server/0917-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0916-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 909bf807a5..ad38c13cd7 100644
--- a/patches/server/0917-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0916-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 24ebc5841ed16129c0e9305da6cf1d8fb67d42ec..995ef97b833a0b6e83a27620b1291e984527f09d 100644
+index 0b87cfbdf039ee5bc017d2b1783c7c4853047952..5a455354561389194b0e61c03f4b2e9285b17a3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1405,7 +1405,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0918-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0917-Restore-vanilla-entity-drops-behavior.patch
index 7aa60b4674..7aa60b4674 100644
--- a/patches/server/0918-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0917-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0919-Dont-resend-blocks-on-interactions.patch b/patches/server/0918-Dont-resend-blocks-on-interactions.patch
index f522a08097..3e498be31c 100644
--- a/patches/server/0919-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0918-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 6caed156ed0cfe0017d578f58cb963ee68272d78..321188173918d0d60858a258400dfd68
                      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 1f2e6f57ffb827ef9bf3623bfdde07db21edf6ee..486c3769a0e6a1ecb5530a35e2591f78776619b9 100644
+index 780b2fada591fb1b504fbf4828c31ec0dd1c25db..fa4bdf8bdbd6eaeb854e62a2acb45d7998e4aa2b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -500,10 +500,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0920-add-more-scoreboard-API.patch b/patches/server/0919-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0920-add-more-scoreboard-API.patch
+++ b/patches/server/0919-add-more-scoreboard-API.patch
diff --git a/patches/server/0921-Improve-Registry.patch b/patches/server/0920-Improve-Registry.patch
index 14131191a6..14131191a6 100644
--- a/patches/server/0921-Improve-Registry.patch
+++ b/patches/server/0920-Improve-Registry.patch
diff --git a/patches/server/0922-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0921-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 72b2cc189a..72b2cc189a 100644
--- a/patches/server/0922-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0921-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0923-Add-experience-points-API.patch b/patches/server/0922-Add-experience-points-API.patch
index e4e988cec2..e4e988cec2 100644
--- a/patches/server/0923-Add-experience-points-API.patch
+++ b/patches/server/0922-Add-experience-points-API.patch
diff --git a/patches/server/0924-Add-drops-to-shear-events.patch b/patches/server/0923-Add-drops-to-shear-events.patch
index 9a344bf8ac..354ac06ddc 100644
--- a/patches/server/0924-Add-drops-to-shear-events.patch
+++ b/patches/server/0923-Add-drops-to-shear-events.patch
@@ -348,7 +348,7 @@ index 1d958323eccd4cf5e369e99e32d2f1dec0959591..56869e0d001d984c6b73f5a92c60508e
  
      public static Cancellable handleStatisticsIncrease(net.minecraft.world.entity.player.Player entityHuman, net.minecraft.stats.Stat<?> statistic, int current, int newValue) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 41c0cfc88f2ec48c1bb8ac10a78f89bf1f2f2319..62b5ba0cafd3a09229648b1205679148b476edcc 100644
+index 631076ebbf90d0d597ee2fc49f036d1fba34ab51..206b5fcb259e0f40f35ae42fe8ebcc986c23ee52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -68,6 +68,16 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0925-Add-PlayerShieldDisableEvent.patch b/patches/server/0924-Add-PlayerShieldDisableEvent.patch
index 5bbd9b6ff6..5bbd9b6ff6 100644
--- a/patches/server/0925-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0924-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0926-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0925-Validate-ResourceLocation-in-NBT-reading.patch
index 5531d9ffc8..5531d9ffc8 100644
--- a/patches/server/0926-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0925-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0927-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0926-Properly-handle-experience-dropping-on-block-break.patch
index 63f20a9c63..63f20a9c63 100644
--- a/patches/server/0927-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0926-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0928-Fixup-NamespacedKey-handling.patch b/patches/server/0927-Fixup-NamespacedKey-handling.patch
index 2861dc5138..2861dc5138 100644
--- a/patches/server/0928-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0927-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0929-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0928-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0929-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0928-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0930-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0929-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 16af41429a..16af41429a 100644
--- a/patches/server/0930-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0929-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0931-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0930-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index a58beffec5..a58beffec5 100644
--- a/patches/server/0931-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0930-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0932-Add-ShulkerDuplicateEvent.patch b/patches/server/0931-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0932-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0931-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0933-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0932-Add-api-for-spawn-egg-texture-colors.patch
index 0652b1399e..0652b1399e 100644
--- a/patches/server/0933-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0932-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0934-Add-Lifecycle-Event-system.patch b/patches/server/0933-Add-Lifecycle-Event-system.patch
index 6c4f2f8644..6c4f2f8644 100644
--- a/patches/server/0934-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0933-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0935-ItemStack-Tooltip-API.patch b/patches/server/0934-ItemStack-Tooltip-API.patch
index 16bb22ce78..16bb22ce78 100644
--- a/patches/server/0935-ItemStack-Tooltip-API.patch
+++ b/patches/server/0934-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0936-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0935-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0936-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0935-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0937-Add-FluidState-API.patch b/patches/server/0936-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0937-Add-FluidState-API.patch
+++ b/patches/server/0936-Add-FluidState-API.patch
diff --git a/patches/server/0938-add-number-format-api.patch b/patches/server/0937-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0938-add-number-format-api.patch
+++ b/patches/server/0937-add-number-format-api.patch
diff --git a/patches/server/0939-improve-BanList-types.patch b/patches/server/0938-improve-BanList-types.patch
index c63e72309a..c63e72309a 100644
--- a/patches/server/0939-improve-BanList-types.patch
+++ b/patches/server/0938-improve-BanList-types.patch
diff --git a/patches/server/0940-Expanded-Hopper-API.patch b/patches/server/0939-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0940-Expanded-Hopper-API.patch
+++ b/patches/server/0939-Expanded-Hopper-API.patch
diff --git a/patches/server/0941-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0940-Add-BlockBreakProgressUpdateEvent.patch
index 125844c5b6..125844c5b6 100644
--- a/patches/server/0941-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0940-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0942-Deprecate-ItemStack-setType.patch b/patches/server/0941-Deprecate-ItemStack-setType.patch
index cb0f3585a3..7079056771 100644
--- a/patches/server/0942-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0941-Deprecate-ItemStack-setType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate ItemStack#setType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 62b5ba0cafd3a09229648b1205679148b476edcc..ef56ebc8060da1d416d91299b03ff0a8f6901ac1 100644
+index 206b5fcb259e0f40f35ae42fe8ebcc986c23ee52..19313d94dc89cf2cce6d0e241e4e4e16eccbd395 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -415,4 +415,24 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0943-Add-CartographyItemEvent.patch b/patches/server/0942-Add-CartographyItemEvent.patch
index 2d775d4172..2d775d4172 100644
--- a/patches/server/0943-Add-CartographyItemEvent.patch
+++ b/patches/server/0942-Add-CartographyItemEvent.patch
diff --git a/patches/server/0944-More-Raid-API.patch b/patches/server/0943-More-Raid-API.patch
index c98e63a452..c98e63a452 100644
--- a/patches/server/0944-More-Raid-API.patch
+++ b/patches/server/0943-More-Raid-API.patch
diff --git a/patches/server/0945-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0944-Add-onboarding-message-for-initial-server-start.patch
index e3249e5435..e3249e5435 100644
--- a/patches/server/0945-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0944-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0946-Configurable-max-block-fluid-ticks.patch b/patches/server/0945-Configurable-max-block-fluid-ticks.patch
index 02e6a701ce..02e6a701ce 100644
--- a/patches/server/0946-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0945-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0947-Fix-bees-aging-inside-hives.patch b/patches/server/0946-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..400ede1160 100644
--- a/patches/server/0947-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0946-Fix-bees-aging-inside-hives.patch
@@ -7,7 +7,7 @@ Fixes bees incorrectly being aged up due to upstream's
 resetting the ticks inside hive on a failed release
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 6fb7ec36f6f7a3021fac4b9e31fd333dfd5ea5e5..7b263fab4f0014400b3b8e7e33db32f9a125f6ba 100644
+index 1a3d8755c8f6a7cfe06069e2082d8147aaaff097..f933fa419a4b55b0096ff42caf1b071d027b8e7e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -314,7 +314,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0948-Disable-memory-reserve-allocating.patch b/patches/server/0947-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0948-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0947-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0949-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0948-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0949-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0948-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0950-Fix-DamageSource-API.patch b/patches/server/0949-Fix-DamageSource-API.patch
index f25d5187b0..2ab4af0ad8 100644
--- a/patches/server/0950-Fix-DamageSource-API.patch
+++ b/patches/server/0949-Fix-DamageSource-API.patch
@@ -123,7 +123,7 @@ index 7bc612890f941177da11da0ce047d5a74d8ebb33..270acce7411e5ada71eaa04c05efc888
                  if (damager != null) {
                      event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damager.getBukkitEntity(), source.is(DamageTypeTags.IS_EXPLOSION) ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 2c01fbea62812f795111060d260f871cdf85e8bf..cb1b19e2e0d8f0744b2355b8f4da0206b196b19c 100644
+index 9bf11a8b44e696b6587bc775904a836d390e437b..d1041f2a4f1b3ea29ad532006e18cdc30c5019fa 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -271,7 +271,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -220,7 +220,7 @@ index 4c6e15535fa40aad8cf1920f392589404f9ba79c..35eb95ef6fb6a0f7ea63351e90741c48
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1af662ca881d656b17697fce837f659349241234..37bd0b7a1bfb9d59efa803e453f39d4e3fc916a4 100644
+index 56869e0d001d984c6b73f5a92c60508e2366eb61..e9a5f06c405fb81609205b6b96cb0a7e49d5589c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1085,7 +1085,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0951-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0950-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index d810be487e..d810be487e 100644
--- a/patches/server/0951-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0950-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0952-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0951-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5351dde83c..5351dde83c 100644
--- a/patches/server/0952-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0951-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0953-Improve-tag-parser-handling.patch b/patches/server/0952-Improve-tag-parser-handling.patch
index e800ee95bf..e800ee95bf 100644
--- a/patches/server/0953-Improve-tag-parser-handling.patch
+++ b/patches/server/0952-Improve-tag-parser-handling.patch
diff --git a/patches/server/0954-Item-Mutation-Fixes.patch b/patches/server/0953-Item-Mutation-Fixes.patch
index 0e20a90a87..0e20a90a87 100644
--- a/patches/server/0954-Item-Mutation-Fixes.patch
+++ b/patches/server/0953-Item-Mutation-Fixes.patch
diff --git a/patches/server/0955-Per-world-ticks-per-spawn-settings.patch b/patches/server/0954-Per-world-ticks-per-spawn-settings.patch
index ea163724cf..ea163724cf 100644
--- a/patches/server/0955-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0954-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0956-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0955-Properly-track-the-changed-item-from-dispense-events.patch
index 2dc797fea7..2dc797fea7 100644
--- a/patches/server/0956-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0955-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0957-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0956-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 586f341b5f..586f341b5f 100644
--- a/patches/server/0957-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0956-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0958-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0957-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0958-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0957-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0959-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0958-Add-config-for-mobs-immune-to-default-effects.patch
index 5989f9bd5f..5989f9bd5f 100644
--- a/patches/server/0959-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0958-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0960-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0959-Deep-clone-nbt-tags-in-PDC.patch
index 437c378a2d..f833a51efa 100644
--- a/patches/server/0960-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0959-Deep-clone-nbt-tags-in-PDC.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone nbt tags in PDC
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 995ef97b833a0b6e83a27620b1291e984527f09d..9874406f42531699538ba46f261016394f1c4b04 100644
+index 5a455354561389194b0e61c03f4b2e9285b17a3b..2cf89147025066f34c12b9956d18451487fb2799 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -322,7 +322,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0961-Support-old-UUID-format-for-NBT.patch b/patches/server/0960-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/0961-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0960-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0962-Fix-shield-disable-inconsistency.patch b/patches/server/0961-Fix-shield-disable-inconsistency.patch
index 25f666c8ec..25f666c8ec 100644
--- a/patches/server/0962-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0961-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0963-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/0962-Don-t-lose-removed-data-components-in-ItemMeta.patch
index 016331af9b..04001583fc 100644
--- a/patches/server/0963-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/0962-Don-t-lose-removed-data-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lose removed data components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9874406f42531699538ba46f261016394f1c4b04..5dd726c50b0a174dfd2715683e56cd9744c7a28e 100644
+index 2cf89147025066f34c12b9956d18451487fb2799..bc5adcb7638d6672cad33ef4adf73e475bc16b7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -198,6 +198,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0964-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0963-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0964-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0963-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0965-Fix-ItemFlags.patch b/patches/server/0964-Fix-ItemFlags.patch
index 6e69d8f6fe..90a623a713 100644
--- a/patches/server/0965-Fix-ItemFlags.patch
+++ b/patches/server/0964-Fix-ItemFlags.patch
@@ -33,7 +33,7 @@ index 73fe41322e0349ad1d46a760f621b6c91112e90e..19af55ec2bf62b70bd3be44f499b32f5
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5dd726c50b0a174dfd2715683e56cd9744c7a28e..044713d5b2661405200590914f73b07e73aeb48f 100644
+index bc5adcb7638d6672cad33ef4adf73e475bc16b7d..d29b8c6851aad227eb8f12012903e0ddd5531755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -252,6 +252,12 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0966-Fix-Player-setBlockUpdate.patch b/patches/server/0965-Fix-Player-setBlockUpdate.patch
index fd8ab6bd92..17597398de 100644
--- a/patches/server/0966-Fix-Player-setBlockUpdate.patch
+++ b/patches/server/0965-Fix-Player-setBlockUpdate.patch
@@ -18,7 +18,7 @@ index 397eb1a101bd60f49dbb2fa8eddf28f6f233167f..e28bc898786542f695017ff0a0366768
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4a886f11b10395143879e1c1795afc269eed109d..8d697782fae536377ac29acf967c764ee8a7951a 100644
+index 3a1777539f378f1e41bbd6b972c12a726afe5feb..cd5bb089c336df3140cfd5d11a398d4aaf9c39b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1118,6 +1118,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0966-Fix-helmet-damage-reduction-inconsistencies.patch
index 68b0416c32..68b0416c32 100644
--- a/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0966-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0967-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 865466307d..865466307d 100644
--- a/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0967-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0968-improve-checking-handled-tags-in-itemmeta.patch
index 42263a75de..70c26309b4 100644
--- a/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0968-improve-checking-handled-tags-in-itemmeta.patch
@@ -154,7 +154,7 @@ index a6c78854c10362864c2297de903ab9594cdb1eb6..251aac8690f15be2ad0e3f6399676205
  
      // We use if instead of a set, since the result gets cached in CraftItemType,
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index ef56ebc8060da1d416d91299b03ff0a8f6901ac1..7672128ecca3052f2dc422349a863484c301310e 100644
+index 19313d94dc89cf2cce6d0e241e4e4e16eccbd395..25096ca7b30483fc9549502caf8b989506405457 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -159,10 +159,11 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0970-General-ItemMeta-fixes.patch b/patches/server/0969-General-ItemMeta-fixes.patch
index 56bcad0510..56bcad0510 100644
--- a/patches/server/0970-General-ItemMeta-fixes.patch
+++ b/patches/server/0969-General-ItemMeta-fixes.patch
diff --git a/patches/server/0971-Expose-hasColor-to-leather-armor.patch b/patches/server/0970-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0971-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0970-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0971-Added-API-to-get-player-ha-proxy-address.patch
index 92a6eda95f..f12e7f6ec8 100644
--- a/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0971-Added-API-to-get-player-ha-proxy-address.patch
@@ -35,7 +35,7 @@ index 96355e1da8feb6687ea0069dda4a82fcd7e25e8a..1f696644b958538e9f5d568a2e4bba69
                                  } 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 8d697782fae536377ac29acf967c764ee8a7951a..33541edc8bb2d673342448046fa29767f171bbf3 100644
+index cd5bb089c336df3140cfd5d11a398d4aaf9c39b4..3480f06d4476c5c200246e6200e2eda2a5de1a5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -265,7 +265,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0973-More-Chest-Block-API.patch b/patches/server/0972-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0973-More-Chest-Block-API.patch
+++ b/patches/server/0972-More-Chest-Block-API.patch
diff --git a/patches/server/0974-Print-data-component-type-on-encoding-error.patch b/patches/server/0973-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0974-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0973-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0975-Brigadier-based-command-API.patch b/patches/server/0974-Brigadier-based-command-API.patch
index ab14bb6a9c..ab14bb6a9c 100644
--- a/patches/server/0975-Brigadier-based-command-API.patch
+++ b/patches/server/0974-Brigadier-based-command-API.patch
diff --git a/patches/server/0976-Fix-issues-with-Recipe-API.patch b/patches/server/0975-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0976-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0975-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0977-Fix-equipment-slot-and-group-API.patch b/patches/server/0976-Fix-equipment-slot-and-group-API.patch
index 12c1d026ea..12c1d026ea 100644
--- a/patches/server/0977-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0976-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0977-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 980c3dc8a0..980c3dc8a0 100644
--- a/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0977-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0978-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 8c27be5d12..077dab00a8 100644
--- a/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0978-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -214,7 +214,7 @@ index 60c65af218d533d53b765ba2175fed163c32c126..a0f5839719ca0ce6ed048229f074041b
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 651c965cb92a91af7b346416f9e4f2e407b3ba18..882e3b6a58951f33a71f862bfa49a5b32d8e8f98 100644
+index 7b019553d88a4294fad1107c5f28ba3fff985d63..b5994949028bc5cd30d893a1a6b296991d8d1570 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3353,7 +3353,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0979-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0979-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0980-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index dc3fddbc64..8af7943ca8 100644
--- a/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0980-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 b800b03ae034b276740c3b41555a52b778ad9aad..86197725f0f2ac1e650297ae7a79907578e0e8f1 100644
+index 8309d2f7872ccdbc9d76f0fbf481411f74080148..de32bf4947af8d2ec64e8799580a129b038dd35e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -494,9 +494,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0982-Add-missing-fishing-event-state.patch b/patches/server/0981-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0982-Add-missing-fishing-event-state.patch
+++ b/patches/server/0981-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0982-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 1af38ab7e6..1af38ab7e6 100644
--- a/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0982-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0983-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0983-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0985-Adopt-MaterialRerouting.patch b/patches/server/0984-Adopt-MaterialRerouting.patch
index c1057b6bc1..c1057b6bc1 100644
--- a/patches/server/0985-Adopt-MaterialRerouting.patch
+++ b/patches/server/0984-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0986-Suspicious-Effect-Entry-API.patch b/patches/server/0985-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0986-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0985-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0987-check-if-itemstack-is-stackable-first.patch b/patches/server/0986-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0987-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0986-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0988-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0987-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0988-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0987-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0989-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0988-Configurable-damage-tick-when-blocking-with-shield.patch
index 97b65a71cb..5854c4306d 100644
--- a/patches/server/0989-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0988-Configurable-damage-tick-when-blocking-with-shield.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage tick when blocking with shield
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 882e3b6a58951f33a71f862bfa49a5b32d8e8f98..4827998c3b5ad72578de1310ab1c67671c21c5a2 100644
+index b5994949028bc5cd30d893a1a6b296991d8d1570..9adaf1269e3eea6c0b62b5127317be7bfd651330 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2411,7 +2411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0990-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0989-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0990-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0989-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0991-Moonrise-optimisation-patches.patch b/patches/server/0990-Moonrise-optimisation-patches.patch
index ae4d0b2e53..ae4d0b2e53 100644
--- a/patches/server/0991-Moonrise-optimisation-patches.patch
+++ b/patches/server/0990-Moonrise-optimisation-patches.patch
diff --git a/patches/server/0992-Rewrite-dataconverter-system.patch b/patches/server/0991-Rewrite-dataconverter-system.patch
index ea19e60350..ea19e60350 100644
--- a/patches/server/0992-Rewrite-dataconverter-system.patch
+++ b/patches/server/0991-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0993-disable-forced-empty-world-ticks.patch b/patches/server/0992-disable-forced-empty-world-ticks.patch
index 048546178d..048546178d 100644
--- a/patches/server/0993-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0992-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 229e45202f..229e45202f 100644
--- a/patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 12aebd4994..12aebd4994 100644
--- a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 6f9e63f228..6f9e63f228 100644
--- a/patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0999-Flat-bedrock-generator-settings.patch b/patches/server/0998-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0999-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0998-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/1000-Entity-Activation-Range-2.0.patch b/patches/server/0999-Entity-Activation-Range-2.0.patch
index b3f299d484..b3f299d484 100644
--- a/patches/server/1000-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0999-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/1001-Optional-per-player-mob-spawns.patch b/patches/server/1000-Optional-per-player-mob-spawns.patch
index e5b527862c..c3c621be5a 100644
--- a/patches/server/1001-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1000-Optional-per-player-mob-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional per player mob spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1363dda031d1b541d76241812a957a12521cbc05..b24d5b0818abfc8b969ab715ca21959c235a9d70 100644
+index d843bc04ae93d11d7820cab5ed18617193568f0d..152cd6b1671785b495caeb7e535f58df864ce24c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -256,8 +256,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -62,7 +62,7 @@ index 67eb2fb32de3555b3afb4b4b7a3a47a164158ac8..bafeda818e02eb3de9dc78f62106a0d3
  
                  this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6b9354e3ac064daa3101e71d8e54e883f628f70c..c75812c195cc83dbe02eebc9ba67b2a9c29ca9a4 100644
+index ba64e42a58b4b760815f54228ebf7a46fd14734e..6277ec3353c6e552b898b525ce2af76a0c84943d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -275,6 +275,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
diff --git a/patches/server/1002-Anti-Xray.patch b/patches/server/1001-Anti-Xray.patch
index a49fa5300b..a49fa5300b 100644
--- a/patches/server/1002-Anti-Xray.patch
+++ b/patches/server/1001-Anti-Xray.patch
diff --git a/patches/server/1003-Eigencraft-redstone-implementation.patch b/patches/server/1002-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1003-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1002-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1004-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1003-Add-Alternate-Current-redstone-implementation.patch
index a0d7873535..a0d7873535 100644
--- a/patches/server/1004-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1003-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 61a3d0930c..26fab47a5b 100644
--- a/patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b24d5b0818abfc8b969ab715ca21959c235a9d70..c96740a82eac9101f74edeb44edf4b64d1d633e0 100644
+index 152cd6b1671785b495caeb7e535f58df864ce24c..344966d3deb640eb99bc9c9e318e6e6780421907 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -273,8 +273,25 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -60,7 +60,7 @@ index bafeda818e02eb3de9dc78f62106a0d3e95d476b..64ed296cfbe7e5d27286b8cee70454fd
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c75812c195cc83dbe02eebc9ba67b2a9c29ca9a4..89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5 100644
+index 6277ec3353c6e552b898b525ce2af76a0c84943d..9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -279,6 +279,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
diff --git a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch
index 276343645a..276343645a 100644
--- a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1007-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1006-Optimize-Collision-to-not-load-chunks.patch
index 9db6ef0fed..d48dec5878 100644
--- a/patches/server/1007-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/1006-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 0d0b07c9199be9ca0d5ac3feb1d44f149ba69283..1aa8b914e79c0d48094cc22df60ee975
          if (dimensiontransition.missingRespawnBlock()) {
              entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5d7bc6470ab3818b0a189aab18ff26c0180e3912..f1fb4e830c6720d09b22056e3d0b9a08fe2bd472 100644
+index abc217e9166bce12590f37aa0e21d6202596e786..1a3932aad22be42997c52ac91e19aad06a868526 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -250,6 +250,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1009-Optimize-Hoppers.patch b/patches/server/1008-Optimize-Hoppers.patch
index 7ac3c6b823..7203ad1a95 100644
--- a/patches/server/1009-Optimize-Hoppers.patch
+++ b/patches/server/1008-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index 91cc3eb6db2875710064f6b31413ccc84af56bb2..17b0e570016504d1b7704bbfa9ff2e32
              this.profiler.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 86197725f0f2ac1e650297ae7a79907578e0e8f1..312b57b4ef340935f4335989ce1d6a4b8b61532c 100644
+index de32bf4947af8d2ec64e8799580a129b038dd35e..0f2b3c5ca88478a541bf9e61ae61cc99a7d08836 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -809,10 +809,16 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/1010-Entity-load-save-limit-per-chunk.patch b/patches/server/1009-Entity-load-save-limit-per-chunk.patch
index 380beda077..380beda077 100644
--- a/patches/server/1010-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1009-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1011-Optimize-Voxel-Shape-Merging.patch b/patches/server/1010-Optimize-Voxel-Shape-Merging.patch
index 114ee7cb28..114ee7cb28 100644
--- a/patches/server/1011-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1010-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1012-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1011-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1012-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1011-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1013-Remove-streams-from-hot-code.patch b/patches/server/1012-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1013-Remove-streams-from-hot-code.patch
+++ b/patches/server/1012-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1014-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1015-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1015-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch
index a8e41e99e4..a8e41e99e4 100644
--- a/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1017-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1017-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1018-API-for-checking-sent-chunks.patch b/patches/server/1017-API-for-checking-sent-chunks.patch
index 5129c9a08a..5129c9a08a 100644
--- a/patches/server/1018-API-for-checking-sent-chunks.patch
+++ b/patches/server/1017-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1019-Check-distance-in-entity-interactions.patch b/patches/server/1018-Check-distance-in-entity-interactions.patch
index afcd6f38a8..64fd802e0e 100644
--- a/patches/server/1019-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1018-Check-distance-in-entity-interactions.patch
@@ -17,7 +17,7 @@ index 42d7ecfab6f72517904451d9df3f0404b176fdb2..0e38a641d8e537750166b56c57aca4a9
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 42ff2150543108c393f108767963cde49d08efa8..6e5af47f5d2775c1afc4914342c3d0ea6569c792 100644
+index 5deec2f7ab0f550b574b777f5a8eeb029f890dfd..8a876b2d964b70b9ddd2d90bf8fbb983566ef747 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1437,7 +1437,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1020-Configurable-Sand-Duping.patch b/patches/server/1019-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1020-Configurable-Sand-Duping.patch
+++ b/patches/server/1019-Configurable-Sand-Duping.patch
diff --git a/patches/server/1021-Optimise-general-POI-access.patch b/patches/server/1020-Optimise-general-POI-access.patch
index f8e4fb9c3d..f8e4fb9c3d 100644
--- a/patches/server/1021-Optimise-general-POI-access.patch
+++ b/patches/server/1020-Optimise-general-POI-access.patch
diff --git a/patches/server/1022-Improve-performance-of-mass-crafts.patch b/patches/server/1021-Improve-performance-of-mass-crafts.patch
index 15701b21e0..15701b21e0 100644
--- a/patches/server/1022-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1021-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1023-Properly-resend-entities.patch b/patches/server/1022-Properly-resend-entities.patch
index 02512d7402..6e61a43375 100644
--- a/patches/server/1023-Properly-resend-entities.patch
+++ b/patches/server/1022-Properly-resend-entities.patch
@@ -115,7 +115,7 @@ index 1aa8b914e79c0d48094cc22df60ee9750ec3ccd6..369b3485f452ac157b3ebf88b4f19706
          this.sendLevelInfo(player, worldserver1);
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d8a90d7c77536abac6fa5f505338b1b53ef986af..593f371c383d4310f4e8ed81200126b05f585ee6 100644
+index 1a3932aad22be42997c52ac91e19aad06a868526..5608576f461ce9dec9827f9f581adc5d5757baf1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -685,13 +685,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -166,7 +166,7 @@ index d8a90d7c77536abac6fa5f505338b1b53ef986af..593f371c383d4310f4e8ed81200126b0
      public boolean equals(Object object) {
          return object instanceof Entity ? ((Entity) object).id == this.id : false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c49f71ac5470e7b823af8339e5583e654bc907a0..945da6b82653f05625f054d64bbf605a4ec1cd05 100644
+index 8a876b2d964b70b9ddd2d90bf8fbb983566ef747..aff6cd6b717b8fdff373be1db32d26f1305e2be9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3879,6 +3879,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1024-Registry-Modification-API.patch b/patches/server/1023-Registry-Modification-API.patch
index dc555c750d..dc555c750d 100644
--- a/patches/server/1024-Registry-Modification-API.patch
+++ b/patches/server/1023-Registry-Modification-API.patch
diff --git a/patches/server/1025-Add-registry-entry-and-builders.patch b/patches/server/1024-Add-registry-entry-and-builders.patch
index 1b920c14d0..1b920c14d0 100644
--- a/patches/server/1025-Add-registry-entry-and-builders.patch
+++ b/patches/server/1024-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1026-Improved-Watchdog-Support.patch b/patches/server/1025-Improved-Watchdog-Support.patch
index 2e3fc383a2..2e3fc383a2 100644
--- a/patches/server/1026-Improved-Watchdog-Support.patch
+++ b/patches/server/1025-Improved-Watchdog-Support.patch
diff --git a/patches/server/1027-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1026-Proxy-ItemStack-to-CraftItemStack.patch
index ad3c75feb2..eb49cbe5f4 100644
--- a/patches/server/1027-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1026-Proxy-ItemStack-to-CraftItemStack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Proxy ItemStack to CraftItemStack
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index be36336a3c7d1ae88277f4ee1be70075001de7a7..814e8ece6821e359b504e8c4d140cc38700f2abe 100644
+index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff32ca8040c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -25,15 +25,57 @@ import org.bukkit.material.MaterialData;
diff --git a/patches/server/1028-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1027-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 95338b76bf..bb97ac9fc5 100644
--- a/patches/server/1028-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/1027-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
@@ -97,7 +97,7 @@ index 0000000000000000000000000000000000000000..fac401280d3f3689b00e16c19155ca75
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 814e8ece6821e359b504e8c4d140cc38700f2abe..32a41c8b324aad67b9dcf74387aef299e6478a64 100644
+index 22b0febba8fbfc9b2ab1a623932ffff32ca8040c..4a7daf90eaee1c1134c643ea3b227e56a849a0fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -480,4 +480,63 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/1029-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1028-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index 6e36d9a7b3..6e36d9a7b3 100644
--- a/patches/server/1029-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/1028-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1030-optimize-dirt-and-snow-spreading.patch b/patches/server/1029-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1030-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1029-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1031-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1030-Fix-NPE-for-Jukebox-setRecord.patch
index e15a77ee75..e15a77ee75 100644
--- a/patches/server/1031-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1030-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1032-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1031-Fix-CraftWorld-isChunkGenerated.patch
index f91e8b2bd0..f91e8b2bd0 100644
--- a/patches/server/1032-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1031-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1033-Add-debug-for-chunk-system-unload-crash.patch b/patches/server/1032-Add-debug-for-chunk-system-unload-crash.patch
index 401b927f05..401b927f05 100644
--- a/patches/server/1033-Add-debug-for-chunk-system-unload-crash.patch
+++ b/patches/server/1032-Add-debug-for-chunk-system-unload-crash.patch
diff --git a/patches/server/1034-fix-horse-inventories.patch b/patches/server/1033-fix-horse-inventories.patch
index e8388a0c72..e8388a0c72 100644
--- a/patches/server/1034-fix-horse-inventories.patch
+++ b/patches/server/1033-fix-horse-inventories.patch
diff --git a/patches/server/1035-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1034-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index f91219dbe1..1b7439c07a 100644
--- a/patches/server/1035-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1034-Only-call-EntityDamageEvents-before-actuallyHurt.patch
@@ -12,7 +12,7 @@ This patch moves the invocation directly before the #actuallyHurt calls,
 respective invulnerable timings.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 945da6b82653f05625f054d64bbf605a4ec1cd05..909accac7538e1c0c0c51deb2ee0605697c059d0 100644
+index aff6cd6b717b8fdff373be1db32d26f1305e2be9..d6699caad1909857793e34228cff78dd3b8b6f41 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1459,12 +1459,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1036-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1035-Fix-entity-tracker-desync-when-new-players-are-added.patch
index 024bf5125d..024bf5125d 100644
--- a/patches/server/1036-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1035-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1037-Lag-compensation-ticks.patch b/patches/server/1036-Lag-compensation-ticks.patch
index 34a7372bd6..34a7372bd6 100644
--- a/patches/server/1037-Lag-compensation-ticks.patch
+++ b/patches/server/1036-Lag-compensation-ticks.patch
diff --git a/patches/server/1038-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1037-Detail-more-information-in-watchdog-dumps.patch
index 3c88154417..3c88154417 100644
--- a/patches/server/1038-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1037-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1039-Write-SavedData-IO-async.patch b/patches/server/1038-Write-SavedData-IO-async.patch
index 66d62d3d94..66d62d3d94 100644
--- a/patches/server/1039-Write-SavedData-IO-async.patch
+++ b/patches/server/1038-Write-SavedData-IO-async.patch
diff --git a/patches/server/1040-Correctly-call-PlayerItemBreakEvent.patch b/patches/server/1039-Correctly-call-PlayerItemBreakEvent.patch
index 6637cd6cd0..6637cd6cd0 100644
--- a/patches/server/1040-Correctly-call-PlayerItemBreakEvent.patch
+++ b/patches/server/1039-Correctly-call-PlayerItemBreakEvent.patch
diff --git a/patches/server/1041-Add-ItemType-getItemRarity.patch b/patches/server/1040-Add-ItemType-getItemRarity.patch
index 35ebf5036b..35ebf5036b 100644
--- a/patches/server/1041-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1040-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1042-Incremental-chunk-and-player-saving.patch b/patches/server/1041-Incremental-chunk-and-player-saving.patch
index f6f0f055f9..f6f0f055f9 100644
--- a/patches/server/1042-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1041-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/1043-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1042-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 086d5b0db1..086d5b0db1 100644
--- a/patches/server/1043-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1042-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch