693 files changed, 318 insertions, 240 deletions

diff --git a/patches/api/0080-ExperienceOrbMergeEvent.patch b/patches/api/0080-ExperienceOrb-merging-stacking-API.patch
index db5f04c9dd..88367f383e 100644
--- a/patches/api/0080-ExperienceOrbMergeEvent.patch
+++ b/patches/api/0080-ExperienceOrb-merging-stacking-API.patch
@@ -1,12 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
-Subject: [PATCH] ExperienceOrbMergeEvent
+Subject: [PATCH] ExperienceOrb merging/stacking API
 
+Adds ExperienceOrbMergeEvent
 Fired when the server is about to merge 2 experience orbs
 Plugins can cancel this if they want to ensure experience orbs do not lose important
 metadata such as spawn reason, or conditionally move data from source to target.
 
+Co-authored-by: Jake Potrebic <[email protected]>
+
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..c520e5517861c4686806df233d1ef5e6bfb76ad3
@@ -104,3 +107,30 @@ index 0000000000000000000000000000000000000000..c520e5517861c4686806df233d1ef5e6
 +        return HANDLER_LIST;
 +    }
 +}
+diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
+index dec70bbfaf73a9d525b2c45682b804c684e1645b..0fe4a7f300287f38dbe15862787f387aba74397b 100644
+--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
++++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
+@@ -21,6 +21,22 @@ public interface ExperienceOrb extends Entity {
+      * @param value Amount of experience
+      */
+     public void setExperience(int value);
++    
++    // Paper start - expose count
++    /**
++     * Get the stacked count for this experience orb.
++     *
++     * @return the count
++     */
++    int getCount();
++
++    /**
++     * Sets the stacked count for this experience orb.
++     *
++     * @param count the new count
++     */
++    void setCount(int count);
++    // Paper end
+ 
+     // Paper start
+     /**
diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index d4497b804f..0cc89fc8b8 100644
--- a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -26,7 +26,7 @@ index 1f29ed95ef3d1904a014715028d9d591fe39231f..1a829f79e6f9e03ead745e13ece4d1b5
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -41,9 +41,63 @@ public class ExperienceOrb extends Entity {
      public int value;
-     private int count;
+     public int count;
      private Player followingPlayer;
 +    // Paper start
 +    @javax.annotation.Nullable
diff --git a/patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch
new file mode 100644
index 0000000000..70fb78d164
--- /dev/null
+++ b/patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch
@@ -0,0 +1,113 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Fri, 10 Nov 2017 23:03:12 -0500
+Subject: [PATCH] ExperienceOrb merging/stacking API and fixes
+
+Adds an option for maximum exp value when merging orbs
+
+Adds ExperienceOrbMergeEvent
+Fired when the server is about to merge 2 experience orbs
+as entities. Plugins can cancel it if they want to ensure experience orbs do not lose important
+metadata such as spawn reason, or conditionally move data from source to target.
+
+Fixes an issue where the stacked count was not taking into account
+for mending repairs and when merging with spigot's merge-on-spawn
+logic
+
+== AT ==
+public net.minecraft.world.entity.ExperienceOrb count
+
+Co-authored-by: Aikar <[email protected]>
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+index 8007d323023655052acd0cf1f3a753101e9ee74a..a933061d4f0c45a34b5678c2b317b670f20b8a45 100644
+--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
++++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+@@ -241,6 +241,7 @@ public class ExperienceOrb extends Entity {
+     }
+ 
+     private static boolean tryMergeToExisting(ServerLevel world, Vec3 pos, int amount) {
++        // Paper - TODO some other event for this kind of merge
+         AABB axisalignedbb = AABB.ofSize(pos, 1.0D, 1.0D, 1.0D);
+         int j = world.getRandom().nextInt(40);
+         List<ExperienceOrb> list = world.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), axisalignedbb, (entityexperienceorb) -> {
+@@ -267,6 +268,11 @@ public class ExperienceOrb extends Entity {
+     }
+ 
+     private void merge(ExperienceOrb other) {
++        // Paper start - call orb merge event
++        if (!new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) this.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) other.getBukkitEntity()).callEvent()) {
++            return;
++        }
++        // Paper end - call orb merge event
+         this.count += other.count;
+         this.age = Math.min(this.age, other.age);
+         other.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
+@@ -353,7 +359,7 @@ public class ExperienceOrb extends Entity {
+ 
+             itemstack.setDamageValue(itemstack.getDamageValue() - j);
+             int k = amount - this.durabilityToXp(j);
+-            this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls
++            // this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
+ 
+             return k > 0 ? this.repairPlayerItems(player, k) : 0;
+         } else {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
+index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c367084351f21 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
+@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
+         this.getHandle().value = value;
+     }
+ 
++    // Paper start - expose count
++    @Override
++    public int getCount() {
++        return this.getHandle().count;
++    }
++
++    @Override
++    public void setCount(final int count) {
++        this.getHandle().count = count;
++    }
++    // Paper end
++
+     // Paper start
+     public java.util.UUID getTriggerEntityId() {
+         return getHandle().triggerEntityId;
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab..53f5eb1682c88abf7b09e16f010ebbd8fe2ac059 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -703,15 +703,29 @@ public class CraftEventFactory {
+         if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
+             double radius = world.spigotConfig.expMerge;
+             if (radius > 0) {
++                // Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
++                final long maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
++                final boolean mergeUnconditionally = maxValue <= 0;
++                if (mergeUnconditionally || xp.value < maxValue) { // Paper - Skip iteration if unnecessary
++
+                 List<Entity> entities = world.getEntities(entity, entity.getBoundingBox().inflate(radius, radius, radius));
+                 for (Entity e : entities) {
+                     if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
+-                        if (!loopItem.isRemoved()) {
++                        // Paper start
++                        if (!loopItem.isRemoved() && xp.count == loopItem.count && (mergeUnconditionally || loopItem.value < maxValue) && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper - ExperienceOrbMergeEvent
++                            long newTotal = (long)xp.value + (long)loopItem.value;
++                            if ((int) newTotal < 0) continue; // Overflow
++                            if (!mergeUnconditionally && newTotal > maxValue) {
++                                loopItem.value = (int) (newTotal - maxValue);
++                                xp.value = (int) maxValue;
++                            } else {
+                             xp.value += loopItem.value;
+                             loopItem.discard(null); // Add Bukkit remove cause
++                            } // Paper end - Maximum exp value when merging
+                         }
+                     }
+                 }
++                } // Paper end - End iteration skip check - All tweaking ends here
+             }
+         }
+         // Spigot end
diff --git a/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch
deleted file mode 100644
index ce8ca08ee9..0000000000
--- a/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <[email protected]>
-Date: Fri, 10 Nov 2017 23:03:12 -0500
-Subject: [PATCH] Option for maximum exp value when merging orbs
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab..feffc6a539738e584dd6eda8c1f2f5b267f617f6 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -703,16 +703,30 @@ public class CraftEventFactory {
-         if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
-             double radius = world.spigotConfig.expMerge;
-             if (radius > 0) {
-+                // Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
-+                final int maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
-+                final boolean mergeUnconditionally = world.paperConfig().entities.behavior.experienceMergeMaxValue <= 0;
-+                if (mergeUnconditionally || xp.value < maxValue) { // Paper - Skip iteration if unnecessary
-+
-                 List<Entity> entities = world.getEntities(entity, entity.getBoundingBox().inflate(radius, radius, radius));
-                 for (Entity e : entities) {
-                     if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
--                        if (!loopItem.isRemoved()) {
-+                        // Paper start
-+                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue)) {
-+                            long newTotal = (long)xp.value + (long)loopItem.value;
-+                            if ((int) newTotal < 0) continue; // Overflow
-+                            if (maxValue > 0 && newTotal > (long)maxValue) {
-+                                loopItem.value = (int) (newTotal - maxValue);
-+                                xp.value = maxValue;
-+                            } else {
-                             xp.value += loopItem.value;
-                             loopItem.discard(null); // Add Bukkit remove cause
-+                            } // Paper end - Maximum exp value when merging
-                         }
-                     }
-                 }
-             }
-+            } // Paper end - End iteration skip check - All tweaking ends here
-         }
-         // Spigot end
- 
diff --git a/patches/server/0362-ExperienceOrbMergeEvent.patch b/patches/server/0362-ExperienceOrbMergeEvent.patch
deleted file mode 100644
index aad5f90997..0000000000
--- a/patches/server/0362-ExperienceOrbMergeEvent.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Tue, 19 Dec 2017 22:57:26 -0500
-Subject: [PATCH] ExperienceOrbMergeEvent
-
-Has to be reimplemented at one point maybe
-Fired when the server is about to merge 2 experience orbs
-Plugins can cancel this if they want to ensure experience orbs do not lose important
-metadata such as spawn reason, or conditionally move data from source to target.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index feffc6a539738e584dd6eda8c1f2f5b267f617f6..1e9835647a0f9eb1e1a264467a62af85af664594 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -712,7 +712,7 @@ public class CraftEventFactory {
-                 for (Entity e : entities) {
-                     if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
-                         // Paper start
--                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue)) {
-+                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue) && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper - ExperienceOrbMergeEvent
-                             long newTotal = (long)xp.value + (long)loopItem.value;
-                             if ((int) newTotal < 0) continue; // Overflow
-                             if (maxValue > 0 && newTotal > (long)maxValue) {
diff --git a/patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0362-Fix-PotionEffect-ignores-icon-flag.patch
index ecd472e97b..ecd472e97b 100644
--- a/patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0362-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0364-Potential-bed-API.patch b/patches/server/0363-Potential-bed-API.patch
index 34470bcfc1..34470bcfc1 100644
--- a/patches/server/0364-Potential-bed-API.patch
+++ b/patches/server/0363-Potential-bed-API.patch
diff --git a/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch
index 5b396410c9..5b396410c9 100644
--- a/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0366-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index a65b9bbbbc..a65b9bbbbc 100644
--- a/patches/server/0366-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0367-Ensure-safe-gateway-teleport.patch b/patches/server/0366-Ensure-safe-gateway-teleport.patch
index c1867dbc2c..c1867dbc2c 100644
--- a/patches/server/0367-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0366-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0368-Add-option-for-console-having-all-permissions.patch b/patches/server/0367-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0368-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0367-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0369-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0368-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0369-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0368-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0370-Maps-shouldn-t-load-chunks.patch b/patches/server/0369-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0370-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0369-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0371-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0371-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0372-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0372-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0373-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0373-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0374-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0374-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0375-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0374-Prevent-position-desync-causing-tp-exploit.patch
index 92eeabe500..92eeabe500 100644
--- a/patches/server/0375-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0374-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0376-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0375-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0376-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0375-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0377-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch
index 2f223b4810..2f223b4810 100644
--- a/patches/server/0377-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0378-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0377-Hide-sync-chunk-writes-behind-flag.patch
index 030a5a1365..030a5a1365 100644
--- a/patches/server/0378-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0377-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0379-Add-permission-for-command-blocks.patch b/patches/server/0378-Add-permission-for-command-blocks.patch
index d1ac75f76f..4a04a57ed7 100644
--- a/patches/server/0379-Add-permission-for-command-blocks.patch
+++ b/patches/server/0378-Add-permission-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index cd6f34ee326228036f8c025e4e6d04e0c15ba06f..2f0d56c78584abe27ef050258827103fb60d5785 100644
+index cbb17ce25cb6218bcf95c2f1c3d0288eeee13a46..84c31fe944fc39109d48b6dc68d0c2b15bef6cf2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -400,7 +400,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0380-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 84279fedca..84279fedca 100644
--- a/patches/server/0380-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index dea556a606..14e0b90a9e 100644
--- a/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,7 +76,7 @@ index 3d33504eac6af17c8833de11226968d52f96232f..4d7c2832a9cd9a88b99c837a02df7fa9
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dde6d567521a08b416ee50b1249b653b0bf6e87a..9750c0309a9dae50b62bfbe5f29a2a6f3c981e62 100644
+index bf6c81300d29c445a1012d1159866547c202d135..e6a24484ef11a1d815a85126aec221547479f7d3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1238,7 +1238,7 @@ public class ServerPlayer extends Player {
@@ -102,7 +102,7 @@ index 299a2e78f4a83d224038c80287636a5d6b9b7450..95d20facdc43a356fd2e82f5d597f52e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 01224af0835a00343923767186dceb53900c0832..e7535d4739f217a8fda2c15c74d44637825a0322 100644
+index 45799f96978a68a79b4c89e17e9b543dec99a8b1..72f64528092f92adf60dadb7d1b5dc38c7a8d4ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -962,8 +962,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0382-Paper-dumpitem-command.patch b/patches/server/0381-Paper-dumpitem-command.patch
index a752f44867..a752f44867 100644
--- a/patches/server/0382-Paper-dumpitem-command.patch
+++ b/patches/server/0381-Paper-dumpitem-command.patch
diff --git a/patches/server/0383-Improve-Legacy-Component-serialization-size.patch b/patches/server/0382-Improve-Legacy-Component-serialization-size.patch
index fe2249ef25..fe2249ef25 100644
--- a/patches/server/0383-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0382-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0384-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index e8c13b9e83..63bccd6aa9 100644
--- a/patches/server/0384-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e7535d4739f217a8fda2c15c74d44637825a0322..d996a0d5d14448e49a8b6730425dd5b50abc1e72 100644
+index 72f64528092f92adf60dadb7d1b5dc38c7a8d4ee..38da9a19546c979c4bfd4ab23a34b77266911a24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -375,7 +375,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0385-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0384-Add-BlockStateMeta-clearBlockState.patch
index 88d5b8fb28..88d5b8fb28 100644
--- a/patches/server/0385-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0384-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0386-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0385-Convert-legacy-attributes-in-Item-Meta.patch
index dd8c5ba601..dd8c5ba601 100644
--- a/patches/server/0386-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0385-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0387-Do-not-accept-invalid-client-settings.patch b/patches/server/0386-Do-not-accept-invalid-client-settings.patch
index 0cfa8d4f81..0cfa8d4f81 100644
--- a/patches/server/0387-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0386-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0388-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0388-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0389-Add-entity-liquid-API.patch b/patches/server/0388-Add-entity-liquid-API.patch
index ab34d7ab7a..ab34d7ab7a 100644
--- a/patches/server/0389-Add-entity-liquid-API.patch
+++ b/patches/server/0388-Add-entity-liquid-API.patch
diff --git a/patches/server/0390-Add-PrepareResultEvent.patch b/patches/server/0389-Add-PrepareResultEvent.patch
index aecbaf783c..e4a700c653 100644
--- a/patches/server/0390-Add-PrepareResultEvent.patch
+++ b/patches/server/0389-Add-PrepareResultEvent.patch
@@ -94,7 +94,7 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..e40d9dbdbe5359c38af6d764d01c9be4
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1e9835647a0f9eb1e1a264467a62af85af664594..461b25d3d0660f973e6db670899bce05010e7c49 100644
+index 54aa1a462bf4d9649f34d79aab1f59e14b7962a5..c3c7cfc33d07b87e034fb050b0a1ca1d8b971aa6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1650,6 +1650,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 248e9dd5ca..e9231e2c2b 100644
--- a/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c640d68c35b4454bfa0ae1764dee341041d9c31e..4bf48ce1824e404906a551ceec720c8e485adb44 100644
+index 5280bae3ad8f9c137e58add8a8d056df81de9928..33658a45d9f61640ab2b56be3fecb5b2552bca84 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3624,7 +3624,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0392-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0391-Fix-arrows-never-despawning-MC-125757.patch
index a08ff237f0..a08ff237f0 100644
--- a/patches/server/0392-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0391-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0393-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0393-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0394-Fix-SPIGOT-5989.patch b/patches/server/0393-Fix-SPIGOT-5989.patch
index 5b41e0742c..5b41e0742c 100644
--- a/patches/server/0394-Fix-SPIGOT-5989.patch
+++ b/patches/server/0393-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0395-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0395-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0396-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0396-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0397-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 817e925f2f..817e925f2f 100644
--- a/patches/server/0397-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0398-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0397-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0398-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0397-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0399-Fix-some-rails-connecting-improperly.patch b/patches/server/0398-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0399-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0398-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0400-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0400-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0401-Brand-support.patch b/patches/server/0400-Brand-support.patch
index 511e3bd37a..1630f396ac 100644
--- a/patches/server/0401-Brand-support.patch
+++ b/patches/server/0400-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9750c0309a9dae50b62bfbe5f29a2a6f3c981e62..38e62a9251b0b0cceb0a350a649897f357293428 100644
+index e6a24484ef11a1d815a85126aec221547479f7d3..ffd9ff7db5180cb351839a3ce331353d16b662d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -290,6 +290,7 @@ public class ServerPlayer extends Player {
@@ -57,7 +57,7 @@ index 289a74e35836717bd20c777e9fc8c17722e90411..a5dce1e83e63292054b21ec693ec3006
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4131b83117e399d7113442def85101d20c493d06..b614ee4e0e217f4adf45f45f53486376bee6533f 100644
+index 776532b4818d15a5f4cfd35d0c076d4774615681..9a9c6e43c96689171a2767f93aea8856db1b7287 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3112,6 +3112,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0402-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch
index 00d87adf6c..00d87adf6c 100644
--- a/patches/server/0402-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0403-Don-t-require-FACING-data.patch b/patches/server/0402-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0403-Don-t-require-FACING-data.patch
+++ b/patches/server/0402-Don-t-require-FACING-data.patch
diff --git a/patches/server/0404-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 47d790e9ed..47d790e9ed 100644
--- a/patches/server/0404-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0405-Add-moon-phase-API.patch b/patches/server/0404-Add-moon-phase-API.patch
index bcc15c76d0..bcc15c76d0 100644
--- a/patches/server/0405-Add-moon-phase-API.patch
+++ b/patches/server/0404-Add-moon-phase-API.patch
diff --git a/patches/server/0406-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 4c1742107a..4c1742107a 100644
--- a/patches/server/0406-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0407-Prevent-headless-pistons-from-being-created.patch b/patches/server/0406-Prevent-headless-pistons-from-being-created.patch
index 67afd12454..67afd12454 100644
--- a/patches/server/0407-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0406-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0408-Add-BellRingEvent.patch b/patches/server/0407-Add-BellRingEvent.patch
index df065143ce..e1fd6ce23f 100644
--- a/patches/server/0408-Add-BellRingEvent.patch
+++ b/patches/server/0407-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 461b25d3d0660f973e6db670899bce05010e7c49..737fbe02c630da0a95dbed49ff152fb5c7ec4d37 100644
+index c3c7cfc33d07b87e034fb050b0a1ca1d8b971aa6..c6408feaff6a5bd8529004e6c2e1aa76ddc8c861 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -367,10 +367,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0409-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0408-Add-zombie-targets-turtle-egg-config.patch
index 553e712827..553e712827 100644
--- a/patches/server/0409-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0408-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0410-Buffer-joins-to-world.patch b/patches/server/0409-Buffer-joins-to-world.patch
index 26675cacaf..26675cacaf 100644
--- a/patches/server/0410-Buffer-joins-to-world.patch
+++ b/patches/server/0409-Buffer-joins-to-world.patch
diff --git a/patches/server/0411-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 05d525bde0..05d525bde0 100644
--- a/patches/server/0411-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0412-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch
index f4c4bfc8bb..f4c4bfc8bb 100644
--- a/patches/server/0412-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0413-Add-more-Evoker-API.patch b/patches/server/0412-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0413-Add-more-Evoker-API.patch
+++ b/patches/server/0412-Add-more-Evoker-API.patch
diff --git a/patches/server/0414-Add-methods-to-get-translation-keys.patch b/patches/server/0413-Add-methods-to-get-translation-keys.patch
index aac872624f..aac872624f 100644
--- a/patches/server/0414-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0413-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0415-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch
index 4117c384be..4117c384be 100644
--- a/patches/server/0415-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0416-Cache-block-data-strings.patch b/patches/server/0415-Cache-block-data-strings.patch
index aa5d5797be..aa5d5797be 100644
--- a/patches/server/0416-Cache-block-data-strings.patch
+++ b/patches/server/0415-Cache-block-data-strings.patch
diff --git a/patches/server/0417-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0416-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index f2e3b93cb3..b84a902592 100644
--- a/patches/server/0417-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0416-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index bc9c68c4df11ece9a9cba9b8cff1182c1d21551f..5d8b1fb9ee96ca397b8f3a0629bc4273
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9012d34db1768189ac68b9348e609d77948488d3..77e672f6146e4a9b32bead526b7dfcbe54c1829e 100644
+index 184d8bdca8aa06b6a1f00bab03e8c2688a391663..0b98618cb0b0e9c4b13415ab0e535cdfbd55b224 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -165,6 +165,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0418-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0417-Add-additional-open-container-api-to-HumanEntity.patch
index 47aa453acf..47aa453acf 100644
--- a/patches/server/0418-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0417-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0419-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0418-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0419-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0418-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0419-Extend-block-drop-capture-to-capture-all-items-added.patch
index bf2c2519f2..d4e854a598 100644
--- a/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0419-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -23,7 +23,7 @@ index f079192644e3b366dc58c4a77c10cbbe65c25eca..17985c75deaa8d317ea4019f73eafe11
              if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2f0d56c78584abe27ef050258827103fb60d5785..486d9c4dbe3ee23198eba7f34ea8b5f4e9048c0b 100644
+index 84c31fe944fc39109d48b6dc68d0c2b15bef6cf2..de3ec353ea32d5d71e2f1b4b369b79b85d7ce5e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -432,10 +432,12 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0421-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0420-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index c5873be5b7..c5873be5b7 100644
--- a/patches/server/0421-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0420-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0422-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0421-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0422-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0421-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0423-Entity-isTicking.patch b/patches/server/0422-Entity-isTicking.patch
index 87cfc3f571..87cfc3f571 100644
--- a/patches/server/0423-Entity-isTicking.patch
+++ b/patches/server/0422-Entity-isTicking.patch
diff --git a/patches/server/0424-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0423-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 48cc71598a..48cc71598a 100644
--- a/patches/server/0424-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0423-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0425-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0424-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0425-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0424-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0426-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index f727c2200f..f727c2200f 100644
--- a/patches/server/0426-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0427-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0426-Fix-for-large-move-vectors-crashing-server.patch
index 5d5bf70211..5d5bf70211 100644
--- a/patches/server/0427-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0426-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0428-Optimise-getType-calls.patch b/patches/server/0427-Optimise-getType-calls.patch
index 1b14b0202b..1b14b0202b 100644
--- a/patches/server/0428-Optimise-getType-calls.patch
+++ b/patches/server/0427-Optimise-getType-calls.patch
diff --git a/patches/server/0429-Villager-resetOffers.patch b/patches/server/0428-Villager-resetOffers.patch
index e8e71e6b5c..e8e71e6b5c 100644
--- a/patches/server/0429-Villager-resetOffers.patch
+++ b/patches/server/0428-Villager-resetOffers.patch
diff --git a/patches/server/0430-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0429-Retain-block-place-order-when-capturing-blockstates.patch
index 9de684873f..9de684873f 100644
--- a/patches/server/0430-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0429-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0431-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch
index 65034de65e..65034de65e 100644
--- a/patches/server/0431-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0432-Fix-bell-block-entity-memory-leak.patch b/patches/server/0431-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0432-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0431-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0433-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0432-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 87d59f556c..87d59f556c 100644
--- a/patches/server/0433-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0432-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0434-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0433-Add-getOfflinePlayerIfCached-String.patch
index 33a9b57955..33a9b57955 100644
--- a/patches/server/0434-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0433-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0435-Add-ignore-discounts-API.patch b/patches/server/0434-Add-ignore-discounts-API.patch
index 2f9c40bb4c..2f9c40bb4c 100644
--- a/patches/server/0435-Add-ignore-discounts-API.patch
+++ b/patches/server/0434-Add-ignore-discounts-API.patch
diff --git a/patches/server/0436-Toggle-for-removing-existing-dragon.patch b/patches/server/0435-Toggle-for-removing-existing-dragon.patch
index 1bfa511969..1bfa511969 100644
--- a/patches/server/0436-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0435-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0437-Fix-client-lag-on-advancement-loading.patch b/patches/server/0436-Fix-client-lag-on-advancement-loading.patch
index 55f9d5cf55..55f9d5cf55 100644
--- a/patches/server/0437-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0436-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0438-Item-no-age-no-player-pickup.patch b/patches/server/0437-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0438-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0437-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0439-Beacon-API-custom-effect-ranges.patch b/patches/server/0438-Beacon-API-custom-effect-ranges.patch
index b8790eb9fa..b8790eb9fa 100644
--- a/patches/server/0439-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0438-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0440-Add-API-for-quit-reason.patch b/patches/server/0439-Add-API-for-quit-reason.patch
index 8c4d9380d6..16f5c58e27 100644
--- a/patches/server/0440-Add-API-for-quit-reason.patch
+++ b/patches/server/0439-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index 68d5be903a0d13e59c9e4bd6d85baaf0773547a0..fe89e8f509f3972ceb71c9aa6277524b
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 38e62a9251b0b0cceb0a350a649897f357293428..89aa23a4443311771775adc2e98cb78c4bb369a5 100644
+index ffd9ff7db5180cb351839a3ce331353d16b662d2..d262946f729a5621f311e266b6b316d445b9e02a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -291,6 +291,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0441-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0440-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0441-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0440-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0442-Expose-world-spawn-angle.patch b/patches/server/0441-Expose-world-spawn-angle.patch
index 8a6e41905d..8a6e41905d 100644
--- a/patches/server/0442-Expose-world-spawn-angle.patch
+++ b/patches/server/0441-Expose-world-spawn-angle.patch
diff --git a/patches/server/0443-Add-Destroy-Speed-API.patch b/patches/server/0442-Add-Destroy-Speed-API.patch
index 3073fd31e7..3073fd31e7 100644
--- a/patches/server/0443-Add-Destroy-Speed-API.patch
+++ b/patches/server/0442-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0443-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 204e3a83dd..ee8b026fe0 100644
--- a/patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0443-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b614ee4e0e217f4adf45f45f53486376bee6533f..d04cf4eb55cf652d7ac7ae80b417b8cb592e75b7 100644
+index 9a9c6e43c96689171a2767f93aea8856db1b7287..c47681e2192cc498abb6b47c82f29ec298decd4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2679,7 +2679,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0445-Add-LivingEntity-clearActiveItem.patch b/patches/server/0444-Add-LivingEntity-clearActiveItem.patch
index 50382e523c..50382e523c 100644
--- a/patches/server/0445-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0444-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0446-Add-PlayerItemCooldownEvent.patch b/patches/server/0445-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0446-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0445-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0446-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0446-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0448-More-lightning-API.patch b/patches/server/0447-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0448-More-lightning-API.patch
+++ b/patches/server/0447-More-lightning-API.patch
diff --git a/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch
index 63d6462634..f9788eba39 100644
--- a/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 33aaabed53362367a88b09d5c3f298101e699fa6..c57ad2c8fe0c0e2f4cbc55a00c895f510eb27bfd 100644
+index 0a51ea55a6b768d71161c4492664a61ec1e5df15..0328738d613358a9042b1d12de511f212db68244 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2010,6 +2010,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb..e382a29b441b656f35bc24cb90f95cb4
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4bf48ce1824e404906a551ceec720c8e485adb44..48f772bcbc207c07aef9d28011ff935b58f8c381 100644
+index 33658a45d9f61640ab2b56be3fecb5b2552bca84..70f34d741eeafd54fcd2f5aaf9d059ba0f96e60a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3540,7 +3540,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0450-Add-missing-default-perms-for-commands.patch b/patches/server/0449-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0450-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0449-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0451-Add-PlayerShearBlockEvent.patch b/patches/server/0450-Add-PlayerShearBlockEvent.patch
index e212c2217b..e212c2217b 100644
--- a/patches/server/0451-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0450-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0452-Limit-recipe-packets.patch b/patches/server/0451-Limit-recipe-packets.patch
index ff56a355b5..ff56a355b5 100644
--- a/patches/server/0452-Limit-recipe-packets.patch
+++ b/patches/server/0451-Limit-recipe-packets.patch
diff --git a/patches/server/0453-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0452-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0453-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0452-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0454-Player-Chunk-Load-Unload-Events.patch b/patches/server/0453-Player-Chunk-Load-Unload-Events.patch
index bd58a9a7ec..bd58a9a7ec 100644
--- a/patches/server/0454-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0453-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0454-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0454-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0456-Expose-LivingEntity-hurt-direction.patch b/patches/server/0455-Expose-LivingEntity-hurt-direction.patch
index 35d1e83e02..f5a4f368a5 100644
--- a/patches/server/0456-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0455-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f07c2bd727a8e3e65bb2e6b1367a4bb392febe23..47ace2c3f395a86db3aa67d597686c8275a91323 100644
+index 8981d314a30c23d3b13087dd9c20216f57f1630d..2a2683d21d7bae023a93db422ab0aebf72ca56cb 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -187,7 +187,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0456-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index d6bcac37e8..7ac0812676 100644
--- a/patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0456-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 737fbe02c630da0a95dbed49ff152fb5c7ec4d37..e55dafab2f986e445d9499cecd346bc96673bc9c 100644
+index c6408feaff6a5bd8529004e6c2e1aa76ddc8c861..2640544d8b145df68e0fe888c8c8e5ab7034bfae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -302,6 +302,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0457-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 762023bb09..762023bb09 100644
--- a/patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0457-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0459-Add-TargetHitEvent.patch b/patches/server/0458-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0459-Add-TargetHitEvent.patch
+++ b/patches/server/0458-Add-TargetHitEvent.patch
diff --git a/patches/server/0460-MC-4-Fix-item-position-desync.patch b/patches/server/0459-MC-4-Fix-item-position-desync.patch
index ac952277d9..ac952277d9 100644
--- a/patches/server/0460-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0459-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0461-Additional-Block-Material-API.patch b/patches/server/0460-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0461-Additional-Block-Material-API.patch
+++ b/patches/server/0460-Additional-Block-Material-API.patch
diff --git a/patches/server/0462-Fix-harming-potion-dupe.patch b/patches/server/0461-Fix-harming-potion-dupe.patch
index 8fdd027d4f..8fdd027d4f 100644
--- a/patches/server/0462-Fix-harming-potion-dupe.patch
+++ b/patches/server/0461-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0462-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0462-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0463-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0463-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0464-Fix-Not-a-string-Map-Conversion-spam.patch
index 00f5d0e877..00f5d0e877 100644
--- a/patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0464-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0465-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0465-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0466-Fix-interact-event-not-being-called-sometimes.patch
index 96d7a637db..96d7a637db 100644
--- a/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0466-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0468-Zombie-API-breaking-doors.patch b/patches/server/0467-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0468-Zombie-API-breaking-doors.patch
+++ b/patches/server/0467-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0469-Fix-nerfed-slime-when-splitting.patch b/patches/server/0468-Fix-nerfed-slime-when-splitting.patch
index 2ebdf09288..2ebdf09288 100644
--- a/patches/server/0469-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0468-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0470-Add-EntityLoadCrossbowEvent.patch b/patches/server/0469-Add-EntityLoadCrossbowEvent.patch
index 3c63e2be5a..3c63e2be5a 100644
--- a/patches/server/0470-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0469-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0471-Add-WorldGameRuleChangeEvent.patch b/patches/server/0470-Add-WorldGameRuleChangeEvent.patch
index 547e9cb24d..547e9cb24d 100644
--- a/patches/server/0471-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0470-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0472-Add-ServerResourcesReloadedEvent.patch b/patches/server/0471-Add-ServerResourcesReloadedEvent.patch
index b7df3b9934..b7df3b9934 100644
--- a/patches/server/0472-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0471-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0473-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0472-Add-world-settings-for-mobs-picking-up-loot.patch
index d75813f3ee..d75813f3ee 100644
--- a/patches/server/0473-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0472-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0474-Add-BlockFailedDispenseEvent.patch b/patches/server/0473-Add-BlockFailedDispenseEvent.patch
index b1c5648ed3..10d5ce9d30 100644
--- a/patches/server/0474-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0473-Add-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index e772b6f8f78ad1292b8fa268e8bb4001a38706c6..efa7cf50b5577f87a2dfa61b59bf8105
              } else {
                  ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e55dafab2f986e445d9499cecd346bc96673bc9c..b96b2f46a8a21d8e79516d13c06d9442cbca9905 100644
+index 2640544d8b145df68e0fe888c8c8e5ab7034bfae..5feaa977db364c6811460666e820e2d6705aaeea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2036,4 +2036,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0475-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0474-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0475-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0474-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0476-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0475-Add-PlayerLoomPatternSelectEvent.patch
index 4d74c20681..4d74c20681 100644
--- a/patches/server/0476-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0475-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0477-Configurable-door-breaking-difficulty.patch b/patches/server/0476-Configurable-door-breaking-difficulty.patch
index 9fdaf01170..9fdaf01170 100644
--- a/patches/server/0477-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0476-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0478-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0477-Empty-commands-shall-not-be-dispatched.patch
index 947eb79c2e..947eb79c2e 100644
--- a/patches/server/0478-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0477-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0479-Remove-stale-POIs.patch b/patches/server/0478-Remove-stale-POIs.patch
index fece7e3371..fece7e3371 100644
--- a/patches/server/0479-Remove-stale-POIs.patch
+++ b/patches/server/0478-Remove-stale-POIs.patch
diff --git a/patches/server/0480-Fix-villager-boat-exploit.patch b/patches/server/0479-Fix-villager-boat-exploit.patch
index 91f979915f..91f979915f 100644
--- a/patches/server/0480-Fix-villager-boat-exploit.patch
+++ b/patches/server/0479-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0481-Add-sendOpLevel-API.patch b/patches/server/0480-Add-sendOpLevel-API.patch
index 6b79d31046..6e3e5ff4d6 100644
--- a/patches/server/0481-Add-sendOpLevel-API.patch
+++ b/patches/server/0480-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 505af87eaf8209437978848be1dde86f879f82f2..d5071f9f2d433706fc378f77906bb5f0
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d04cf4eb55cf652d7ac7ae80b417b8cb592e75b7..58f47db6ed35e5e94cc7eae4c83bf65a589699db 100644
+index c47681e2192cc498abb6b47c82f29ec298decd4e..330e9c37c889b1573520090173401a0615d19592 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -675,6 +675,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0482-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0481-Add-RegistryAccess-for-managing-Registries.patch
index cd3f10527d..cd3f10527d 100644
--- a/patches/server/0482-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/server/0481-Add-RegistryAccess-for-managing-Registries.patch
diff --git a/patches/server/0483-Add-StructuresLocateEvent.patch b/patches/server/0482-Add-StructuresLocateEvent.patch
index 82cdf051db..82cdf051db 100644
--- a/patches/server/0483-Add-StructuresLocateEvent.patch
+++ b/patches/server/0482-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0483-Collision-option-for-requiring-a-player-participant.patch
index 612a957bf2..ee5a887961 100644
--- a/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0483-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 77f24eb88af8fde66ef2198bb7673c71de42800f..d8658bca3964c931be9dbbfc25de03f0d2e4b6c5 100644
+index da31287d60c60f01bf274f23c6bb23803f9658fb..715185c5f6ccb15bda34a2a4722609ac25421f90 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1871,6 +1871,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0484-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index bb6de57d99..bb6de57d99 100644
--- a/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0484-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0485-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..4dea2ddeed 100644
--- a/patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0485-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0487-Make-schedule-command-per-world.patch b/patches/server/0486-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0487-Make-schedule-command-per-world.patch
+++ b/patches/server/0486-Make-schedule-command-per-world.patch
diff --git a/patches/server/0488-Configurable-max-leash-distance.patch b/patches/server/0487-Configurable-max-leash-distance.patch
index e228b633f0..e228b633f0 100644
--- a/patches/server/0488-Configurable-max-leash-distance.patch
+++ b/patches/server/0487-Configurable-max-leash-distance.patch
diff --git a/patches/server/0489-Add-BlockPreDispenseEvent.patch b/patches/server/0488-Add-BlockPreDispenseEvent.patch
index 3157a918d0..386dd687b3 100644
--- a/patches/server/0489-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0488-Add-BlockPreDispenseEvent.patch
@@ -29,7 +29,7 @@ index efa7cf50b5577f87a2dfa61b59bf81052794fbf1..b4a742e8c513e458b34c216d1e907b47
                      } else {
                          // CraftBukkit start - Fire event when pushing items into other inventories
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b96b2f46a8a21d8e79516d13c06d9442cbca9905..a7b88ce35d0de3019348a01eb84a2bd00aee24a1 100644
+index 5feaa977db364c6811460666e820e2d6705aaeea..63042ca2ce555f42e15b8783f6c35f688fc9c194 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2043,5 +2043,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0489-Add-PlayerChangeBeaconEffectEvent.patch
index b3444419ee..b3444419ee 100644
--- a/patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0489-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0490-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2576990e24..2576990e24 100644
--- a/patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0490-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0491-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0491-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0493-Expand-EntityUnleashEvent.patch b/patches/server/0492-Expand-EntityUnleashEvent.patch
index 1a84331347..e1ef8a75e4 100644
--- a/patches/server/0493-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0492-Expand-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 4c0f7741e199e4bb03767effda669bbbc9f0d233..7b10bb9cbf6f2b4a70ddaa0ba4bc7409a17f3f09 100644
+index 36f894f2a6ad5f88f6e72fb374aaf2437aa72c3b..babbcee2892990b626afed76b75861f0d42cf571 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1431,12 +1431,15 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -122,7 +122,7 @@ index dfb0db42e335fd7334b752ac62f8adb7bffbb2ef..65d140a3e3c42763ce4d162f8c9f5b9d
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a7b88ce35d0de3019348a01eb84a2bd00aee24a1..0c2e8921d1048cb138a48215853c04c5d73f3514 100644
+index 63042ca2ce555f42e15b8783f6c35f688fc9c194..a0114b08b322fbc35b82707c174e65f71b12d273 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1567,8 +1567,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0494-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0493-Reset-shield-blocking-on-dimension-change.patch
index 5125656c21..407ac22fac 100644
--- a/patches/server/0494-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0493-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89aa23a4443311771775adc2e98cb78c4bb369a5..f920c134716620c69d31a88e2ad0ee1e7e2431b0 100644
+index d262946f729a5621f311e266b6b316d445b9e02a..d7a8664e9ccccdb4b4618399c72fa38c24354e46 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1275,6 +1275,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0495-Add-DragonEggFormEvent.patch b/patches/server/0494-Add-DragonEggFormEvent.patch
index c9ec752038..c9ec752038 100644
--- a/patches/server/0495-Add-DragonEggFormEvent.patch
+++ b/patches/server/0494-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0496-Add-EntityMoveEvent.patch b/patches/server/0495-Add-EntityMoveEvent.patch
index d88e5489cc..222311818a 100644
--- a/patches/server/0496-Add-EntityMoveEvent.patch
+++ b/patches/server/0495-Add-EntityMoveEvent.patch
@@ -29,7 +29,7 @@ index a9a39c99874001f1024f71bfc97130e8c9a507e7..19333b61bcb50f2171ac2c75d7f4ca4f
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 48f772bcbc207c07aef9d28011ff935b58f8c381..f523514e65039b0683617653625c2c33559d9874 100644
+index 70f34d741eeafd54fcd2f5aaf9d059ba0f96e60a..533b020ab103bf353be21ccc95954f8e827a89c6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3477,6 +3477,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0496-added-option-to-disable-pathfinding-updates-on-block.patch
index 1af4840387..1af4840387 100644
--- a/patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0496-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0498-Inline-shift-direction-fields.patch b/patches/server/0497-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0498-Inline-shift-direction-fields.patch
+++ b/patches/server/0497-Inline-shift-direction-fields.patch
diff --git a/patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0498-Allow-adding-items-to-BlockDropItemEvent.patch
index 1a444afd42..72f559adf9 100644
--- a/patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0498-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0c2e8921d1048cb138a48215853c04c5d73f3514..dbb7b8e93c1773058c78de71a3e6e3559eb0a46b 100644
+index a0114b08b322fbc35b82707c174e65f71b12d273..8b1d92291c81078c4fc4584f9075cb01f65fab97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -451,13 +451,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0499-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0499-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0501-living-entity-allow-attribute-registration.patch b/patches/server/0500-living-entity-allow-attribute-registration.patch
index fc60a15040..fc60a15040 100644
--- a/patches/server/0501-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0500-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0502-fix-dead-slime-setSize-invincibility.patch b/patches/server/0501-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0502-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0501-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0502-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0502-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0504-Expose-Tracked-Players.patch b/patches/server/0503-Expose-Tracked-Players.patch
index b15fc67f75..b15fc67f75 100644
--- a/patches/server/0504-Expose-Tracked-Players.patch
+++ b/patches/server/0503-Expose-Tracked-Players.patch
diff --git a/patches/server/0505-Improve-ServerGUI.patch b/patches/server/0504-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0505-Improve-ServerGUI.patch
+++ b/patches/server/0504-Improve-ServerGUI.patch
diff --git a/patches/server/0506-fix-converting-txt-to-json-file.patch b/patches/server/0505-fix-converting-txt-to-json-file.patch
index ad83e310fc..ad83e310fc 100644
--- a/patches/server/0506-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0505-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0507-Add-worldborder-events.patch b/patches/server/0506-Add-worldborder-events.patch
index 2ab55e30ef..2ab55e30ef 100644
--- a/patches/server/0507-Add-worldborder-events.patch
+++ b/patches/server/0506-Add-worldborder-events.patch
diff --git a/patches/server/0508-Add-PlayerNameEntityEvent.patch b/patches/server/0507-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0508-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0507-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0509-Add-recipe-to-cook-events.patch b/patches/server/0508-Add-recipe-to-cook-events.patch
index 05bf67ef6c..05bf67ef6c 100644
--- a/patches/server/0509-Add-recipe-to-cook-events.patch
+++ b/patches/server/0508-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0510-Add-Block-isValidTool.patch b/patches/server/0509-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0510-Add-Block-isValidTool.patch
+++ b/patches/server/0509-Add-Block-isValidTool.patch
diff --git a/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0510-Allow-using-signs-inside-spawn-protection.patch
index 560f3be3dd..560f3be3dd 100644
--- a/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0510-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0512-Expand-world-key-API.patch b/patches/server/0511-Expand-world-key-API.patch
index b8790f56cd..b8790f56cd 100644
--- a/patches/server/0512-Expand-world-key-API.patch
+++ b/patches/server/0511-Expand-world-key-API.patch
diff --git a/patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0512-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0512-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0513-Drop-carried-item-when-player-has-disconnected.patch
index 4683817946..4683817946 100644
--- a/patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0513-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0514-forced-whitelist-use-configurable-kick-message.patch
index 9e79f88fe6..9e79f88fe6 100644
--- a/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0514-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0516-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0515-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 16d596879b..16d596879b 100644
--- a/patches/server/0516-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0515-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0517-Expose-protocol-version.patch b/patches/server/0516-Expose-protocol-version.patch
index e9d7b980a1..e9d7b980a1 100644
--- a/patches/server/0517-Expose-protocol-version.patch
+++ b/patches/server/0516-Expose-protocol-version.patch
diff --git a/patches/server/0518-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0517-Enhance-console-tab-completions-for-brigadier-comman.patch
index 8e6ac6e4c9..8e6ac6e4c9 100644
--- a/patches/server/0518-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0517-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0519-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0518-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 45451d4dfb..396ac14488 100644
--- a/patches/server/0519-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0518-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f523514e65039b0683617653625c2c33559d9874..3f375ec80357c3727092ce016d2697d17281976f 100644
+index 533b020ab103bf353be21ccc95954f8e827a89c6..bf5f8756555cc92d5b0a426400bf8fe8a834e96a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3971,6 +3971,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0520-Add-bypass-host-check.patch b/patches/server/0519-Add-bypass-host-check.patch
index d6c893d808..d6c893d808 100644
--- a/patches/server/0520-Add-bypass-host-check.patch
+++ b/patches/server/0519-Add-bypass-host-check.patch
diff --git a/patches/server/0521-Set-area-affect-cloud-rotation.patch b/patches/server/0520-Set-area-affect-cloud-rotation.patch
index e78e14e0a0..e78e14e0a0 100644
--- a/patches/server/0521-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0520-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0522-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0521-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0522-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0521-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0523-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0522-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2f79b2a47f..2f79b2a47f 100644
--- a/patches/server/0523-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0522-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0524-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0523-add-get-set-drop-chance-to-EntityEquipment.patch
index 746b410784..746b410784 100644
--- a/patches/server/0524-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0523-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0525-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0524-fix-PigZombieAngerEvent-cancellation.patch
index ad3619023e..ad3619023e 100644
--- a/patches/server/0525-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0524-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0526-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0525-fix-PlayerItemHeldEvent-firing-twice.patch
index ea56241b84..ea56241b84 100644
--- a/patches/server/0526-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0525-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0527-Add-PlayerDeepSleepEvent.patch b/patches/server/0526-Add-PlayerDeepSleepEvent.patch
index b9ed97ec97..b2ba3c0722 100644
--- a/patches/server/0527-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0526-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 47ace2c3f395a86db3aa67d597686c8275a91323..bed2f9903378c16d630a08156f5c39047b613ad4 100644
+index 2a2683d21d7bae023a93db422ab0aebf72ca56cb..b7c674505c2319c906a0cce53e0def2337b24d42 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -260,6 +260,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0528-More-World-API.patch b/patches/server/0527-More-World-API.patch
index 0e444d651b..0e444d651b 100644
--- a/patches/server/0528-More-World-API.patch
+++ b/patches/server/0527-More-World-API.patch
diff --git a/patches/server/0529-Add-PlayerBedFailEnterEvent.patch b/patches/server/0528-Add-PlayerBedFailEnterEvent.patch
index feffef2aec..feffef2aec 100644
--- a/patches/server/0529-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0528-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0530-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0529-Implement-methods-to-convert-between-Component-and-B.patch
index fc7d02c151..fc7d02c151 100644
--- a/patches/server/0530-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0529-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0530-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 26cdea3136..26cdea3136 100644
--- a/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0530-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0532-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0531-Introduce-beacon-activation-deactivation-events.patch
index ba8abff209..ba8abff209 100644
--- a/patches/server/0532-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0531-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0533-Add-Channel-initialization-listeners.patch b/patches/server/0532-Add-Channel-initialization-listeners.patch
index 8b6d7c3c06..8b6d7c3c06 100644
--- a/patches/server/0533-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0532-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0534-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0533-Send-empty-commands-if-tab-completion-is-disabled.patch
index 3c45c05c10..3c45c05c10 100644
--- a/patches/server/0534-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0533-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0535-Add-more-WanderingTrader-API.patch b/patches/server/0534-Add-more-WanderingTrader-API.patch
index 07cdb98c54..07cdb98c54 100644
--- a/patches/server/0535-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0534-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0536-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0535-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0536-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0535-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0537-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0536-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 839c465c9c..839c465c9c 100644
--- a/patches/server/0537-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0536-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0538-Add-HiddenPotionEffect-API.patch b/patches/server/0537-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0538-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0537-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0539-Inventory-close.patch b/patches/server/0538-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0539-Inventory-close.patch
+++ b/patches/server/0538-Inventory-close.patch
diff --git a/patches/server/0540-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0539-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 950600a9e0..950600a9e0 100644
--- a/patches/server/0540-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0539-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0541-Add-basic-Datapack-API.patch b/patches/server/0540-Add-basic-Datapack-API.patch
index 247191b57e..247191b57e 100644
--- a/patches/server/0541-Add-basic-Datapack-API.patch
+++ b/patches/server/0540-Add-basic-Datapack-API.patch
diff --git a/patches/server/0542-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0541-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0542-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0541-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0543-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0542-Expand-PlayerGameModeChangeEvent.patch
index e4dd475a9f..e528dfbb6a 100644
--- a/patches/server/0543-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0542-Expand-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ index 7f09119bc7d661e08a960dd2bd46006efe752d3e..d1da3600dc07107309b20ebe6e7c0c4d
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f920c134716620c69d31a88e2ad0ee1e7e2431b0..538720cd256d6d5fc4bf1800106c53b6a3116db9 100644
+index d7a8664e9ccccdb4b4618399c72fa38c24354e46..2ff11c9aff04f404d45e0b267285e2b4a2a23b6f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2034,8 +2034,16 @@ public class ServerPlayer extends Player {
@@ -94,7 +94,7 @@ index f920c134716620c69d31a88e2ad0ee1e7e2431b0..538720cd256d6d5fc4bf1800106c53b6
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 486d9c4dbe3ee23198eba7f34ea8b5f4e9048c0b..f080322bc766361b9d2d8b1214c3dff1c3df9ae8 100644
+index de3ec353ea32d5d71e2f1b4b369b79b85d7ce5e8..c55d944a70300bf77dbde918c91815cabe68496d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -72,14 +72,21 @@ public class ServerPlayerGameMode {
@@ -145,7 +145,7 @@ index c8124bf451f5d03374f32a04b9b28fc9d97897ae..4a5553335cd6bbad8d3a05694710d95c
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 58f47db6ed35e5e94cc7eae4c83bf65a589699db..ae2139509a201be5f7808b714211c23d50cca7a0 100644
+index 330e9c37c889b1573520090173401a0615d19592..8d78d5ecd17dcd56056f5bade6f047e30187ee2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1640,7 +1640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0544-ItemStack-repair-check-API.patch b/patches/server/0543-ItemStack-repair-check-API.patch
index 395fa0fb11..395fa0fb11 100644
--- a/patches/server/0544-ItemStack-repair-check-API.patch
+++ b/patches/server/0543-ItemStack-repair-check-API.patch
diff --git a/patches/server/0545-More-Enchantment-API.patch b/patches/server/0544-More-Enchantment-API.patch
index 1b98deff58..1b98deff58 100644
--- a/patches/server/0545-More-Enchantment-API.patch
+++ b/patches/server/0544-More-Enchantment-API.patch
diff --git a/patches/server/0546-Move-range-check-for-block-placing-up.patch b/patches/server/0545-Move-range-check-for-block-placing-up.patch
index 44913b8c49..44913b8c49 100644
--- a/patches/server/0546-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0545-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0547-Add-Mob-lookAt-API.patch b/patches/server/0546-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0547-Add-Mob-lookAt-API.patch
+++ b/patches/server/0546-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0547-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index faa6d5c514..faa6d5c514 100644
--- a/patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0547-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0549-Add-Unix-domain-socket-support.patch b/patches/server/0548-Add-Unix-domain-socket-support.patch
index 054790699a..054790699a 100644
--- a/patches/server/0549-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0548-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0550-Add-EntityInsideBlockEvent.patch b/patches/server/0549-Add-EntityInsideBlockEvent.patch
index 26d32bc8bf..26d32bc8bf 100644
--- a/patches/server/0550-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0549-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0551-Improve-item-default-attribute-API.patch b/patches/server/0550-Improve-item-default-attribute-API.patch
index 6eea3ca24b..6eea3ca24b 100644
--- a/patches/server/0551-Improve-item-default-attribute-API.patch
+++ b/patches/server/0550-Improve-item-default-attribute-API.patch
diff --git a/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0551-Add-cause-to-Weather-ThunderChangeEvents.patch
index d1900e480d..d1900e480d 100644
--- a/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0551-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0553-More-Lidded-Block-API.patch b/patches/server/0552-More-Lidded-Block-API.patch
index 437434c525..437434c525 100644
--- a/patches/server/0553-More-Lidded-Block-API.patch
+++ b/patches/server/0552-More-Lidded-Block-API.patch
diff --git a/patches/server/0554-Limit-item-frame-cursors-on-maps.patch b/patches/server/0553-Limit-item-frame-cursors-on-maps.patch
index 6072cb5269..6072cb5269 100644
--- a/patches/server/0554-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0553-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0555-Add-PlayerKickEvent-causes.patch b/patches/server/0554-Add-PlayerKickEvent-causes.patch
index bdba1e0e95..5e3f4ce433 100644
--- a/patches/server/0555-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0554-Add-PlayerKickEvent-causes.patch
@@ -486,7 +486,7 @@ index f472dea0bd4f834c0c8f0aa59ae7cdae082b14af..2fa51c3a70f43cd23b8f494fc643d66c
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ae2139509a201be5f7808b714211c23d50cca7a0..2d173370b69d4caf6b890115a2f7dabc733d0a58 100644
+index 8d78d5ecd17dcd56056f5bade6f047e30187ee2f..6c759f6860c7eccb634c1c0cda6d8e24196023d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -633,7 +633,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0556-Add-PufferFishStateChangeEvent.patch b/patches/server/0555-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0556-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0555-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0557-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0556-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 6e70197163..6e70197163 100644
--- a/patches/server/0557-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0556-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0558-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0557-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0558-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0557-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0559-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0558-Add-option-to-fix-items-merging-through-walls.patch
index 05969fb324..05969fb324 100644
--- a/patches/server/0559-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0558-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0560-Add-BellRevealRaiderEvent.patch b/patches/server/0559-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0560-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0559-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0561-Fix-invulnerable-end-crystals.patch b/patches/server/0560-Fix-invulnerable-end-crystals.patch
index bddc6ec149..bddc6ec149 100644
--- a/patches/server/0561-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0560-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0562-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0561-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0562-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0561-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0563-Fix-dangerous-end-portal-logic.patch b/patches/server/0562-Fix-dangerous-end-portal-logic.patch
index b91fabb966..b91fabb966 100644
--- a/patches/server/0563-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0562-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0564-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0563-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0564-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0563-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0565-Line-Of-Sight-Changes.patch b/patches/server/0564-Line-Of-Sight-Changes.patch
index 92a0683ab9..b1a4699ae0 100644
--- a/patches/server/0565-Line-Of-Sight-Changes.patch
+++ b/patches/server/0564-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3f375ec80357c3727092ce016d2697d17281976f..b4295448819271f5a651e3a3ae83c7ae4014d92f 100644
+index bf5f8756555cc92d5b0a426400bf8fe8a834e96a..5dc4deca24f966bd4cb0b7f296f74487964e4c95 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3720,7 +3720,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0566-add-per-world-spawn-limits.patch b/patches/server/0565-add-per-world-spawn-limits.patch
index 8ff7b50013..8ff7b50013 100644
--- a/patches/server/0566-add-per-world-spawn-limits.patch
+++ b/patches/server/0565-add-per-world-spawn-limits.patch
diff --git a/patches/server/0567-Fix-potions-splash-events.patch b/patches/server/0566-Fix-potions-splash-events.patch
index 6bc3f4cd01..0d8d8e070d 100644
--- a/patches/server/0567-Fix-potions-splash-events.patch
+++ b/patches/server/0566-Fix-potions-splash-events.patch
@@ -143,7 +143,7 @@ index d7fe99e55b64b66af7795c2d0aeca69023f93bae..bf627d66310f201172d3cd3ea12f1d32
  
      public boolean isLingering() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dbb7b8e93c1773058c78de71a3e6e3559eb0a46b..4bc21889a584add593a1ce092e5df161d8bb9d76 100644
+index 8b1d92291c81078c4fc4584f9075cb01f65fab97..63219a3e9aa7384c941d556cf24a6b3020968da9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -875,6 +875,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0568-Add-more-LimitedRegion-API.patch b/patches/server/0567-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0568-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0567-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0569-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0568-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 2190b00711..9646d27bb6 100644
--- a/patches/server/0569-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0568-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -31,7 +31,7 @@ index c81fd3e1108fb0a02f9240263404af2b968c8494..0d9de4c61c7b26a6ff37c12fde629161
              }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 538720cd256d6d5fc4bf1800106c53b6a3116db9..0887166af854bf924bd8eb528503a0e1e28e8e99 100644
+index 2ff11c9aff04f404d45e0b267285e2b4a2a23b6f..b342516707448ab5f0f1e763bf6be3f004b9e4b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2434,7 +2434,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 538720cd256d6d5fc4bf1800106c53b6a3116db9..0887166af854bf924bd8eb528503a0e1
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index bed2f9903378c16d630a08156f5c39047b613ad4..40fb59c799850915c3ae71a4c4121e664c79d9b2 100644
+index b7c674505c2319c906a0cce53e0def2337b24d42..5019b9f257382f15aa333a8d421915a7a3afe991 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -726,6 +726,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0570-Missing-Entity-API.patch b/patches/server/0569-Missing-Entity-API.patch
index 1f27707e2d..1f27707e2d 100644
--- a/patches/server/0570-Missing-Entity-API.patch
+++ b/patches/server/0569-Missing-Entity-API.patch
diff --git a/patches/server/0571-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 09e73af027..09e73af027 100644
--- a/patches/server/0571-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0572-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0572-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0573-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch
index c72ab8a129..c72ab8a129 100644
--- a/patches/server/0573-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0574-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0573-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0574-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0573-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0575-Add-PlayerArmSwingEvent.patch b/patches/server/0574-Add-PlayerArmSwingEvent.patch
index 0c66804f9a..0c66804f9a 100644
--- a/patches/server/0575-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0574-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0576-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0575-Fix-kick-event-leave-message-not-being-sent.patch
index 1bc1afc37c..0aebdf0ac4 100644
--- a/patches/server/0576-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0575-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0887166af854bf924bd8eb528503a0e1e28e8e99..25e4521676e55a876ac27d8cbe4fdb2ddc9bf5e5 100644
+index b342516707448ab5f0f1e763bf6be3f004b9e4b4..ea2c8c91408cb65b3b6a520877c9273dbffd0ac1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -285,7 +285,6 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0577-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0576-Don-t-apply-cramming-damage-to-players.patch
index 4fc24e4549..dcfd508e6b 100644
--- a/patches/server/0577-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0576-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 25e4521676e55a876ac27d8cbe4fdb2ddc9bf5e5..1be3c03022f8fb14d536981d4dc688c541f528ad 100644
+index ea2c8c91408cb65b3b6a520877c9273dbffd0ac1..bb0ac7db0467ec8468fcbf63b8f22580ed11e723 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -98,6 +98,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0579-Add-missing-forceDrop-toggles.patch b/patches/server/0578-Add-missing-forceDrop-toggles.patch
index b89de7428a..b89de7428a 100644
--- a/patches/server/0579-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0578-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0580-Stinger-API.patch b/patches/server/0579-Stinger-API.patch
index 3abe3d922a..3abe3d922a 100644
--- a/patches/server/0580-Stinger-API.patch
+++ b/patches/server/0579-Stinger-API.patch
diff --git a/patches/server/0581-Add-System.out-err-catcher.patch b/patches/server/0580-Add-System.out-err-catcher.patch
index e4d4fc106a..24fd27da5a 100644
--- a/patches/server/0581-Add-System.out-err-catcher.patch
+++ b/patches/server/0580-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c4e63ba96a54fb9e1353510f77d848bed3656405..ceb18ee56a99f56997f09e9d6dd01b8b58194430 100644
+index ec9f392d92d96a6b4f3a513361282085a95769b5..bb157f5a9d0dca8d108411a6ce09cc0297026334 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch
index 92d95bf1df..92d95bf1df 100644
--- a/patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0584-Add-PlayerSetSpawnEvent.patch b/patches/server/0583-Add-PlayerSetSpawnEvent.patch
index 95276bf07f..6ffc931866 100644
--- a/patches/server/0584-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0583-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1be3c03022f8fb14d536981d4dc688c541f528ad..093cfac173d35ab8b7b459edad9be7c3d6e5b340 100644
+index bb0ac7db0467ec8468fcbf63b8f22580ed11e723..b90b525faa5bba684c783a56f136532a8195de84 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1384,7 +1384,7 @@ public class ServerPlayer extends Player {
@@ -187,7 +187,7 @@ index ba22ad1e4253477572d10d71db6db0ebc14d6755..94d067e9eeee73183de25165d8c97043
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2d173370b69d4caf6b890115a2f7dabc733d0a58..f786981e0d07d116ba901e26ed7c3de34ee9d8ea 100644
+index 6c759f6860c7eccb634c1c0cda6d8e24196023d1..bb75c965266fefa58919823e5fcc9f56f11b04d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0586-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0585-Optimize-entity-tracker-passenger-checks.patch
index a764dcd8ab..a764dcd8ab 100644
--- a/patches/server/0586-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0585-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0587-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0586-Config-option-for-Piglins-guarding-chests.patch
index e1b0af28d0..e1b0af28d0 100644
--- a/patches/server/0587-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0586-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0588-Add-EntityDamageItemEvent.patch b/patches/server/0587-Add-EntityDamageItemEvent.patch
index e78be10457..e78be10457 100644
--- a/patches/server/0588-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0587-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0589-Optimize-indirect-passenger-iteration.patch b/patches/server/0588-Optimize-indirect-passenger-iteration.patch
index d00a5c0cf2..d00a5c0cf2 100644
--- a/patches/server/0589-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0588-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0589-Configurable-item-frame-map-cursor-update-interval.patch
index f06f3a327b..f06f3a327b 100644
--- a/patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0589-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0591-Clear-bucket-NBT-after-dispense.patch b/patches/server/0590-Clear-bucket-NBT-after-dispense.patch
index ece5517a45..ece5517a45 100644
--- a/patches/server/0591-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0590-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0591-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0591-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0593-Add-BlockBreakBlockEvent.patch b/patches/server/0592-Add-BlockBreakBlockEvent.patch
index fbf1b1ea38..fbf1b1ea38 100644
--- a/patches/server/0593-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0592-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch
index c4e4b8be1b..c4e4b8be1b 100644
--- a/patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0595-More-CommandBlock-API.patch b/patches/server/0594-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0595-More-CommandBlock-API.patch
+++ b/patches/server/0594-More-CommandBlock-API.patch
diff --git a/patches/server/0596-Add-missing-team-sidebar-display-slots.patch b/patches/server/0595-Add-missing-team-sidebar-display-slots.patch
index 3095722a10..3095722a10 100644
--- a/patches/server/0596-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0595-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0597-Add-back-EntityPortalExitEvent.patch b/patches/server/0596-Add-back-EntityPortalExitEvent.patch
index 5a83bce11c..5a83bce11c 100644
--- a/patches/server/0597-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0596-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch
index fdc84ceea1..fdc84ceea1 100644
--- a/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0599-Get-entity-default-attributes.patch b/patches/server/0598-Get-entity-default-attributes.patch
index 3d58f4c4ed..3d58f4c4ed 100644
--- a/patches/server/0599-Get-entity-default-attributes.patch
+++ b/patches/server/0598-Get-entity-default-attributes.patch
diff --git a/patches/server/0600-Left-handed-API.patch b/patches/server/0599-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0600-Left-handed-API.patch
+++ b/patches/server/0599-Left-handed-API.patch
diff --git a/patches/server/0601-Add-more-advancement-API.patch b/patches/server/0600-Add-more-advancement-API.patch
index 402274cff0..402274cff0 100644
--- a/patches/server/0601-Add-more-advancement-API.patch
+++ b/patches/server/0600-Add-more-advancement-API.patch
diff --git a/patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0601-Add-ItemFactory-getSpawnEgg-API.patch
index a1ba12cd83..a1ba12cd83 100644
--- a/patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0601-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0603-Add-critical-damage-API.patch b/patches/server/0602-Add-critical-damage-API.patch
index e0743975f1..63bd12427b 100644
--- a/patches/server/0603-Add-critical-damage-API.patch
+++ b/patches/server/0602-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index 9b5af216d38ff4584d40586403bd92207b230dfa..533ea6cbb813c8d1dc2bb3f65fd94d4f
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 40fb59c799850915c3ae71a4c4121e664c79d9b2..7cb10e9c8ba6d100f1ae4d949401cd83034f0f14 100644
+index 5019b9f257382f15aa333a8d421915a7a3afe991..f18e370399fb36040cec64dd7bee4915e3cb56d7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1274,7 +1274,7 @@ public abstract class Player extends LivingEntity {
@@ -71,7 +71,7 @@ index 047629405dc67e3bcb5e4b3d5afa0e821f8fde44..8e8258333e181491b2d5b61ebdb80de3
          int k = entity.getRemainingFireTicks();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4bc21889a584add593a1ce092e5df161d8bb9d76..5c31c652a3b956dd638137307d1a8b2ee4c3f675 100644
+index 63219a3e9aa7384c941d556cf24a6b3020968da9..c00667c0a27f96202439f45bddd2b79cd46e7c25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1064,7 +1064,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0604-Fix-issues-with-mob-conversion.patch b/patches/server/0603-Fix-issues-with-mob-conversion.patch
index c714b6dda9..c714b6dda9 100644
--- a/patches/server/0604-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0603-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0605-Add-hasCollision-methods-to-various-places.patch b/patches/server/0604-Add-hasCollision-methods-to-various-places.patch
index a6045ddd1b..a6045ddd1b 100644
--- a/patches/server/0605-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/server/0604-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0606-Goat-ram-API.patch b/patches/server/0605-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0606-Goat-ram-API.patch
+++ b/patches/server/0605-Goat-ram-API.patch
diff --git a/patches/server/0607-Add-API-for-resetting-a-single-score.patch b/patches/server/0606-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0607-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0606-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0607-Add-Raw-Byte-Entity-Serialization.patch
index d958b2b31f..d958b2b31f 100644
--- a/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0607-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0609-Vanilla-command-permission-fixes.patch b/patches/server/0608-Vanilla-command-permission-fixes.patch
index ee87698d16..ee87698d16 100644
--- a/patches/server/0609-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0608-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index e556bcb3f1..fd96ed9d70 100644
--- a/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index 5cb0281ea110a1ce3444f4392bccbb19ca3bbf09..e611857d9d29e8532b4ea3e0634c8f24
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 093cfac173d35ab8b7b459edad9be7c3d6e5b340..7ba28e1258006c8f897b7c94cbdf0b87ace12b5e 100644
+index b90b525faa5bba684c783a56f136532a8195de84..5a13975fc9a472308ee74401f7b1f84f716e46eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1675,6 +1675,18 @@ public class ServerPlayer extends Player {
@@ -51,7 +51,7 @@ index 093cfac173d35ab8b7b459edad9be7c3d6e5b340..7ba28e1258006c8f897b7c94cbdf0b87
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7cb10e9c8ba6d100f1ae4d949401cd83034f0f14..f861a942807f8b8af36d6b70a124da7853eda053 100644
+index f18e370399fb36040cec64dd7bee4915e3cb56d7..461129261d93ca9831f347c9612c6f38cbbd8ac9 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -509,6 +509,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0611-Fix-GameProfileCache-concurrency.patch b/patches/server/0610-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0611-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0610-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0612-Improve-and-expand-AsyncCatcher.patch b/patches/server/0611-Improve-and-expand-AsyncCatcher.patch
index 860e68a6e6..3fa3ba5e71 100644
--- a/patches/server/0612-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0611-Improve-and-expand-AsyncCatcher.patch
@@ -29,7 +29,7 @@ index 40d2c7bfc8ba8b8b366f23e53cf37f331e19ccf7..795e65c7c98d50ff67953ccb1ff68dac
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b4295448819271f5a651e3a3ae83c7ae4014d92f..3f46ca2f03142c3a7bb5928ec092c21491c1fdef 100644
+index 5dc4deca24f966bd4cb0b7f296f74487964e4c95..a1edb9465872f762e1bc3daf1a3121bc3654e847 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1147,7 +1147,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 38a6e5c39e..38a6e5c39e 100644
--- a/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0614-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0613-Sanitize-ResourceLocation-error-logging.patch
index 28ba1000d7..28ba1000d7 100644
--- a/patches/server/0614-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0613-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0615-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0614-Manually-inline-methods-in-BlockPosition.patch
index 630cd08862..630cd08862 100644
--- a/patches/server/0615-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0614-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ffee136c87..ffee136c87 100644
--- a/patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 0c62fa92a6..0c62fa92a6 100644
--- a/patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0620-Time-scoreboard-search.patch b/patches/server/0619-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0620-Time-scoreboard-search.patch
+++ b/patches/server/0619-Time-scoreboard-search.patch
diff --git a/patches/server/0621-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0620-Oprimise-map-impl-for-tracked-players.patch
index 05a08024ed..05a08024ed 100644
--- a/patches/server/0621-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0620-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0622-Add-missing-InventoryType.patch b/patches/server/0621-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0622-Add-missing-InventoryType.patch
+++ b/patches/server/0621-Add-missing-InventoryType.patch
diff --git a/patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 11f85426c8..11f85426c8 100644
--- a/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0624-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0624-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 1049bf5495..1049bf5495 100644
--- a/patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0627-Add-packet-limiter-config.patch b/patches/server/0626-Add-packet-limiter-config.patch
index 8315eb0598..8315eb0598 100644
--- a/patches/server/0627-Add-packet-limiter-config.patch
+++ b/patches/server/0626-Add-packet-limiter-config.patch
diff --git a/patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index d9f19d0199..d9f19d0199 100644
--- a/patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0629-Ensure-valid-vehicle-status.patch b/patches/server/0628-Ensure-valid-vehicle-status.patch
index a46a2cb96a..544ee62764 100644
--- a/patches/server/0629-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0628-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7ba28e1258006c8f897b7c94cbdf0b87ace12b5e..3f4a881a69b47e99498d4c2e53c9a20367e3887f 100644
+index 5a13975fc9a472308ee74401f7b1f84f716e46eb..a94b43df4a6cd6f5974015bc5fc87d37347276f1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -567,7 +567,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0629-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0629-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0632-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0631-Don-t-log-debug-logging-being-disabled.patch
index eda86b69fc..eda86b69fc 100644
--- a/patches/server/0632-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0631-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0633-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0632-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0633-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0632-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0634-Preserve-overstacked-loot.patch b/patches/server/0633-Preserve-overstacked-loot.patch
index bd846768be..bd846768be 100644
--- a/patches/server/0634-Preserve-overstacked-loot.patch
+++ b/patches/server/0633-Preserve-overstacked-loot.patch
diff --git a/patches/server/0635-Update-head-rotation-in-missing-places.patch b/patches/server/0634-Update-head-rotation-in-missing-places.patch
index 6159f06d52..8116c5ccb3 100644
--- a/patches/server/0635-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0634-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3bf2b943797bed06f9424acfdc05107a59ce78d2..a9db8cf04403d0e23b8891346ff4007eecb9b3d2 100644
+index 96c9feb545c02014c324852344a1d86156c32237..df7741ca931d7d1eb1b0cbdcc2b2bb15875c750c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1813,6 +1813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0636-prevent-unintended-light-block-manipulation.patch b/patches/server/0635-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0636-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0635-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0637-Fix-CraftCriteria-defaults-map.patch b/patches/server/0636-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0637-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0636-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0638-Fix-upstreams-block-state-factories.patch b/patches/server/0637-Fix-upstreams-block-state-factories.patch
index caa81d33e3..2fdb11ce82 100644
--- a/patches/server/0638-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0637-Fix-upstreams-block-state-factories.patch
@@ -13,7 +13,7 @@ the material type of the block at that location.
 public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 5e4cc5f54e8bf6afdab3afdf7f25c7b494e0d53b..7fa16b8a99509cc8f28b25513f0a1595219fe607 100644
+index 6e24673a793017ee857cf75bf9a74105ce76b773..e3c5f99b3ad91a9bb454f9ab95b1ccff0bb7b34c 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -371,7 +371,7 @@ public abstract class BlockEntity {
diff --git a/patches/server/0639-Configurable-feature-seeds.patch b/patches/server/0638-Configurable-feature-seeds.patch
index 44d7b04076..44d7b04076 100644
--- a/patches/server/0639-Configurable-feature-seeds.patch
+++ b/patches/server/0638-Configurable-feature-seeds.patch
diff --git a/patches/server/0640-Add-root-admin-user-detection.patch b/patches/server/0639-Add-root-admin-user-detection.patch
index 5b81dcd09a..5b81dcd09a 100644
--- a/patches/server/0640-Add-root-admin-user-detection.patch
+++ b/patches/server/0639-Add-root-admin-user-detection.patch
diff --git a/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch
index 69fee82c8e..1ea681b348 100644
--- a/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a9db8cf04403d0e23b8891346ff4007eecb9b3d2..17eff19ef7ce8ed51853d27c30643a727d7a942c 100644
+index df7741ca931d7d1eb1b0cbdcc2b2bb15875c750c..50aca89516dea3f4c4d668b994f4afdea69b4cc9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -730,7 +730,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch
index 1cd854d74a..69696583d7 100644
--- a/patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3f46ca2f03142c3a7bb5928ec092c21491c1fdef..dff6e07de4d447f7d7fe0107928ea0749714ba3e 100644
+index a1edb9465872f762e1bc3daf1a3121bc3654e847..13b410f0bd184fa37e2098e8f08de39babec356a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2754,16 +2754,28 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch
index 77ffcc7ddc..77ffcc7ddc 100644
--- a/patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0644-Fix-Spigot-growth-modifiers.patch b/patches/server/0643-Fix-Spigot-growth-modifiers.patch
index 245729c1f4..245729c1f4 100644
--- a/patches/server/0644-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0643-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0646-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0645-Add-PlayerItemFrameChangeEvent.patch
index 37c616b0a1..37c616b0a1 100644
--- a/patches/server/0646-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0645-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0647-Optimize-HashMapPalette.patch b/patches/server/0646-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0647-Optimize-HashMapPalette.patch
+++ b/patches/server/0646-Optimize-HashMapPalette.patch
diff --git a/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch
index 0c13f2a408..0c13f2a408 100644
--- a/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 239a0c56cc..239a0c56cc 100644
--- a/patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0650-Add-more-Campfire-API.patch b/patches/server/0649-Add-more-Campfire-API.patch
index c47758fa53..c47758fa53 100644
--- a/patches/server/0650-Add-more-Campfire-API.patch
+++ b/patches/server/0649-Add-more-Campfire-API.patch
diff --git a/patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 82e383fc34..82e383fc34 100644
--- a/patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0651-Forward-CraftEntity-in-teleport-command.patch
index c07753356e..c07753356e 100644
--- a/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0651-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0653-Improve-scoreboard-entries.patch b/patches/server/0652-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0653-Improve-scoreboard-entries.patch
+++ b/patches/server/0652-Improve-scoreboard-entries.patch
diff --git a/patches/server/0654-Entity-powdered-snow-API.patch b/patches/server/0653-Entity-powdered-snow-API.patch
index 84af920e2a..84af920e2a 100644
--- a/patches/server/0654-Entity-powdered-snow-API.patch
+++ b/patches/server/0653-Entity-powdered-snow-API.patch
diff --git a/patches/server/0655-Add-API-for-item-entity-health.patch b/patches/server/0654-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0655-Add-API-for-item-entity-health.patch
+++ b/patches/server/0654-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0655-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0655-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0659-Bucketable-API.patch b/patches/server/0658-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0659-Bucketable-API.patch
+++ b/patches/server/0658-Bucketable-API.patch
diff --git a/patches/server/0660-Validate-usernames.patch b/patches/server/0659-Validate-usernames.patch
index d3b04f3950..d3b04f3950 100644
--- a/patches/server/0660-Validate-usernames.patch
+++ b/patches/server/0659-Validate-usernames.patch
diff --git a/patches/server/0661-Make-water-animal-spawn-height-configurable.patch b/patches/server/0660-Make-water-animal-spawn-height-configurable.patch
index 36a83d9116..36a83d9116 100644
--- a/patches/server/0661-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0660-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 1510a6974e..1510a6974e 100644
--- a/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0665-Multiple-Entries-with-Scoreboards.patch b/patches/server/0664-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0665-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0664-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0666-Reset-placed-block-on-exception.patch b/patches/server/0665-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0666-Reset-placed-block-on-exception.patch
+++ b/patches/server/0665-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0667-Add-configurable-height-for-slime-spawn.patch b/patches/server/0666-Add-configurable-height-for-slime-spawn.patch
index 04458eb176..04458eb176 100644
--- a/patches/server/0667-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0666-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0668-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0667-Fix-xp-reward-for-baby-zombies.patch
index 67fe48ec26..67fe48ec26 100644
--- a/patches/server/0668-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0667-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0669-Multi-Block-Change-API-Implementation.patch b/patches/server/0668-Multi-Block-Change-API-Implementation.patch
index 14aac72dbe..95d2c691b3 100644
--- a/patches/server/0669-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0668-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f786981e0d07d116ba901e26ed7c3de34ee9d8ea..a7c03ca87bb0d38552ea7a80b97a0ef0af394190 100644
+index bb75c965266fefa58919823e5fcc9f56f11b04d0..409d8f8957eda02a474f36e4c9010aee62c7fade 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -928,6 +928,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0670-Fix-NotePlayEvent.patch b/patches/server/0669-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0670-Fix-NotePlayEvent.patch
+++ b/patches/server/0669-Fix-NotePlayEvent.patch
diff --git a/patches/server/0671-Freeze-Tick-Lock-API.patch b/patches/server/0670-Freeze-Tick-Lock-API.patch
index 05be0b3d3d..9486dbc6b4 100644
--- a/patches/server/0671-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0670-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11917a810a4d1a4f55ddb2afd81b9d15d011cbf8..c4d595ef91f43efe0f4f5ff27f311e8f9dcb7796 100644
+index af1b161e5e61fe244b316d352452038c9b4ea458..060eaba7971ee9e4ca1d77fa6a2d1265a41d26b9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -406,6 +406,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -46,7 +46,7 @@ index 11917a810a4d1a4f55ddb2afd81b9d15d011cbf8..c4d595ef91f43efe0f4f5ff27f311e8f
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dff6e07de4d447f7d7fe0107928ea0749714ba3e..4444e25adf854f2efdd8b29dba151d03070c3e8c 100644
+index 13b410f0bd184fa37e2098e8f08de39babec356a..450de702338fae6f305fd37965e79bd52f3c221c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0672-More-PotionEffectType-API.patch b/patches/server/0671-More-PotionEffectType-API.patch
index 07a0ef6777..07a0ef6777 100644
--- a/patches/server/0672-More-PotionEffectType-API.patch
+++ b/patches/server/0671-More-PotionEffectType-API.patch
diff --git a/patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index b19bb65d35..b19bb65d35 100644
--- a/patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch
index 663e5c98a6..663e5c98a6 100644
--- a/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0675-Add-missing-structure-set-seed-configs.patch b/patches/server/0674-Add-missing-structure-set-seed-configs.patch
index 0c160b7c1c..0c160b7c1c 100644
--- a/patches/server/0675-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0674-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0676-Implement-regenerateChunk.patch b/patches/server/0675-Implement-regenerateChunk.patch
index c6a6c8eb34..c6a6c8eb34 100644
--- a/patches/server/0676-Implement-regenerateChunk.patch
+++ b/patches/server/0675-Implement-regenerateChunk.patch
diff --git a/patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch
index e46654952c..e46654952c 100644
--- a/patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 0a3836e40d..0a3836e40d 100644
--- a/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0679-Add-GameEvent-tags.patch b/patches/server/0678-Add-GameEvent-tags.patch
index eae0382748..eae0382748 100644
--- a/patches/server/0679-Add-GameEvent-tags.patch
+++ b/patches/server/0678-Add-GameEvent-tags.patch
diff --git a/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 74e1372a47..74e1372a47 100644
--- a/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0681-Furnace-RecipesUsed-API.patch b/patches/server/0680-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0681-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0680-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0682-Configurable-sculk-sensor-listener-range.patch b/patches/server/0681-Configurable-sculk-sensor-listener-range.patch
index f2d79796cb..f2d79796cb 100644
--- a/patches/server/0682-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0681-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0683-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0682-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0683-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0682-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0684-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0683-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index db238fea90..db238fea90 100644
--- a/patches/server/0684-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0683-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0685-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0684-Put-world-into-worldlist-before-initing-the-world.patch
index c7500050db..c7500050db 100644
--- a/patches/server/0685-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0684-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0686-Fix-Entity-Position-Desync.patch b/patches/server/0685-Fix-Entity-Position-Desync.patch
index fb9d587df1..fb9d587df1 100644
--- a/patches/server/0686-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0685-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0687-Custom-Potion-Mixes.patch b/patches/server/0686-Custom-Potion-Mixes.patch
index 1a33bb32b6..1a33bb32b6 100644
--- a/patches/server/0687-Custom-Potion-Mixes.patch
+++ b/patches/server/0686-Custom-Potion-Mixes.patch
diff --git a/patches/server/0688-Force-close-world-loading-screen.patch b/patches/server/0687-Force-close-world-loading-screen.patch
index a90bc669b4..a90bc669b4 100644
--- a/patches/server/0688-Force-close-world-loading-screen.patch
+++ b/patches/server/0687-Force-close-world-loading-screen.patch
diff --git a/patches/server/0689-Fix-falling-block-spawn-methods.patch b/patches/server/0688-Fix-falling-block-spawn-methods.patch
index 1f5d0c19cc..1f5d0c19cc 100644
--- a/patches/server/0689-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0688-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0690-Expose-furnace-minecart-push-values.patch b/patches/server/0689-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0690-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0689-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0690-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d524b390b..2d524b390b 100644
--- a/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0690-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0692-More-Projectile-API.patch b/patches/server/0691-More-Projectile-API.patch
index ddeec71ec7..18230771e2 100644
--- a/patches/server/0692-More-Projectile-API.patch
+++ b/patches/server/0691-More-Projectile-API.patch
@@ -553,7 +553,7 @@ index e374b9f40eddca13b30855d25a2030f8df98138f..4fc893378fb0568ddcffc7593d66df6b
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5c31c652a3b956dd638137307d1a8b2ee4c3f675..90696beb3ca48fc28c9842589bc3ea398af7d422 100644
+index c00667c0a27f96202439f45bddd2b79cd46e7c25..b8bb8887646076ad5724dd5558f5f819a530b5fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -832,19 +832,19 @@ public class CraftEventFactory {
diff --git a/patches/server/0693-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0692-Fix-swamp-hut-cat-generation-deadlock.patch
index 1b0f7d0ed5..1b0f7d0ed5 100644
--- a/patches/server/0693-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0692-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0694-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0693-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 64325ae484..64325ae484 100644
--- a/patches/server/0694-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0693-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0695-Implement-getComputedBiome-API.patch b/patches/server/0694-Implement-getComputedBiome-API.patch
index 57a6b3a7c5..57a6b3a7c5 100644
--- a/patches/server/0695-Implement-getComputedBiome-API.patch
+++ b/patches/server/0694-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0696-Make-some-itemstacks-nonnull.patch b/patches/server/0695-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0696-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0695-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0697-Implement-enchantWithLevels-API.patch b/patches/server/0696-Implement-enchantWithLevels-API.patch
index 7031b197b7..7031b197b7 100644
--- a/patches/server/0697-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0696-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0698-Fix-saving-in-unloadWorld.patch b/patches/server/0697-Fix-saving-in-unloadWorld.patch
index c0315d4c94..c0315d4c94 100644
--- a/patches/server/0698-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0697-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0699-Buffer-OOB-setBlock-calls.patch b/patches/server/0698-Buffer-OOB-setBlock-calls.patch
index d0e56ca766..d0e56ca766 100644
--- a/patches/server/0699-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0698-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0700-Add-TameableDeathMessageEvent.patch b/patches/server/0699-Add-TameableDeathMessageEvent.patch
index 355d8192ca..355d8192ca 100644
--- a/patches/server/0700-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0699-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0701-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0700-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index f1e6097f9a..271b4f683c 100644
--- a/patches/server/0701-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0700-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -196,7 +196,7 @@ index edc20745649b0837f1371c8d29e71fc0c8e5528f..932831bb5632ead5850842fc77192c84
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 90696beb3ca48fc28c9842589bc3ea398af7d422..a40e6a19459cb5853f72708a0e7b8cc7334dca51 100644
+index b8bb8887646076ad5724dd5558f5f819a530b5fa..cbbc313f83df3bd3e87a1e2879bcf8d9de1b96dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1358,11 +1358,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0702-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0701-fix-player-loottables-running-when-mob-loot-gamerule.patch
index e154a821bb..8791910638 100644
--- a/patches/server/0702-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0701-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3f4a881a69b47e99498d4c2e53c9a20367e3887f..bbd5cbdae03dd3b81d5eca275c81801bd32e46ae 100644
+index a94b43df4a6cd6f5974015bc5fc87d37347276f1..c5f3849a5ce90c985faeff04f718491373155cbc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -952,12 +952,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0702-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 20e29b87ab..d38d586754 100644
--- a/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0702-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c4d595ef91f43efe0f4f5ff27f311e8f9dcb7796..b3522e7d1c622ecb86668f5822da2d32922173e4 100644
+index 060eaba7971ee9e4ca1d77fa6a2d1265a41d26b9..3d02354bb2c058ddd48beadb3d6af4480ea6b307 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2610,7 +2610,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0704-cache-resource-keys.patch b/patches/server/0703-cache-resource-keys.patch
index 7f3b6ce992..7f3b6ce992 100644
--- a/patches/server/0704-cache-resource-keys.patch
+++ b/patches/server/0703-cache-resource-keys.patch
diff --git a/patches/server/0705-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0704-Allow-changing-the-EnderDragon-podium.patch
index 623c4b9689..623c4b9689 100644
--- a/patches/server/0705-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0704-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0706-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0705-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 05d5b9189b..05d5b9189b 100644
--- a/patches/server/0706-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0705-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0707-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0706-Prevent-tile-entity-copies-loading-chunks.patch
index 850db8e7b0..850db8e7b0 100644
--- a/patches/server/0707-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0706-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0708-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0707-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 9eed66c5cf..9eed66c5cf 100644
--- a/patches/server/0708-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0707-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0709-Expand-PlayerItemDamageEvent.patch b/patches/server/0708-Expand-PlayerItemDamageEvent.patch
index bb07753eca..bb07753eca 100644
--- a/patches/server/0709-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0708-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0710-WorldCreator-keepSpawnLoaded.patch b/patches/server/0709-WorldCreator-keepSpawnLoaded.patch
index 071ef743e7..071ef743e7 100644
--- a/patches/server/0710-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0709-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0711-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0710-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0711-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0710-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0712-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0711-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d6e979b4fa..2dae75e5b1 100644
--- a/patches/server/0712-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0711-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f080322bc766361b9d2d8b1214c3dff1c3df9ae8..d8c5f8e584976a97bd909bfa20023993ab776952 100644
+index c55d944a70300bf77dbde918c91815cabe68496d..ac2bd55deeef8e14b8fa0db1f2d10e36d045f0e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -424,12 +424,16 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0713-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0712-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 190a5b5de8..190a5b5de8 100644
--- a/patches/server/0713-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0712-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0714-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0713-Fire-CauldronLevelChange-on-initial-fill.patch
index 4f5e70f836..4f5e70f836 100644
--- a/patches/server/0714-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0713-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0715-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0714-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0715-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0714-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0716-Add-PlayerStopUsingItemEvent.patch b/patches/server/0715-Add-PlayerStopUsingItemEvent.patch
index 4424b580ac..fcd77f7a88 100644
--- a/patches/server/0716-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0715-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4444e25adf854f2efdd8b29dba151d03070c3e8c..0c737b3c0a7645fddf157e1f12af14b8da34d09e 100644
+index 450de702338fae6f305fd37965e79bd52f3c221c..7ae2e7751644df130c45e191dc7abdacfc308b88 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4033,6 +4033,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0717-Don-t-tick-markers.patch b/patches/server/0716-Don-t-tick-markers.patch
index c78f41d43b..c78f41d43b 100644
--- a/patches/server/0717-Don-t-tick-markers.patch
+++ b/patches/server/0716-Don-t-tick-markers.patch
diff --git a/patches/server/0718-Expand-FallingBlock-API.patch b/patches/server/0717-Expand-FallingBlock-API.patch
index 861e7e87f2..861e7e87f2 100644
--- a/patches/server/0718-Expand-FallingBlock-API.patch
+++ b/patches/server/0717-Expand-FallingBlock-API.patch
diff --git a/patches/server/0719-Add-support-for-Proxy-Protocol.patch b/patches/server/0718-Add-support-for-Proxy-Protocol.patch
index 1a5592988a..1a5592988a 100644
--- a/patches/server/0719-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0718-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0720-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0719-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0720-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0719-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0721-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0720-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0721-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0720-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0722-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0721-Sanitize-sent-BlockEntity-NBT.patch
index 08938ddd13..08938ddd13 100644
--- a/patches/server/0722-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0721-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0723-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0722-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0723-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0722-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0724-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0723-Prevent-entity-loading-causing-async-lookups.patch
index 729aed4101..f646863d88 100644
--- a/patches/server/0724-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0723-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b3522e7d1c622ecb86668f5822da2d32922173e4..c4f4aee317a15f9df5d249a8c86354b16ae9158a 100644
+index 3d02354bb2c058ddd48beadb3d6af4480ea6b307..e241286d52dcb934a7430d24a114e34f23ec56ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -739,6 +739,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0725-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0724-Throw-exception-on-world-create-while-being-ticked.patch
index d6ff930cbd..d6ff930cbd 100644
--- a/patches/server/0725-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0724-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0726-Dont-resent-entity-on-art-update.patch b/patches/server/0725-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0726-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0725-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0727-Add-WardenAngerChangeEvent.patch b/patches/server/0726-Add-WardenAngerChangeEvent.patch
index 38df99e752..38df99e752 100644
--- a/patches/server/0727-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0726-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0727-Add-option-for-strict-advancement-dimension-checks.patch
index ff7a351ea1..67c0fb153c 100644
--- a/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0727-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 5be2d877162922d6f29592e723b7d5aff14e1515..37174de2319e353b2f989d8321758a08
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bbd5cbdae03dd3b81d5eca275c81801bd32e46ae..a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c 100644
+index c5f3849a5ce90c985faeff04f718491373155cbc..d0a7bcc0dde8b2a9543cf4c0c8d35ab042fb4e3b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1349,6 +1349,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0728-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0728-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0730-Nameable-Banner-API.patch b/patches/server/0729-Nameable-Banner-API.patch
index 21ca7151b4..21ca7151b4 100644
--- a/patches/server/0730-Nameable-Banner-API.patch
+++ b/patches/server/0729-Nameable-Banner-API.patch
diff --git a/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0730-Don-t-broadcast-messages-to-command-blocks.patch
index 040cdaea59..040cdaea59 100644
--- a/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0730-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0731-Prevent-empty-items-from-being-added-to-world.patch
index 6515705f6a..6515705f6a 100644
--- a/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0731-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0732-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 56d5a7ad9e..56d5a7ad9e 100644
--- a/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0732-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0734-Add-Player-getFishHook.patch b/patches/server/0733-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0734-Add-Player-getFishHook.patch
+++ b/patches/server/0733-Add-Player-getFishHook.patch
diff --git a/patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0734-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0734-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0735-Add-various-missing-EntityDropItemEvent-calls.patch
index 61af5f9a4a..046b6ed184 100644
--- a/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0735-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c4f4aee317a15f9df5d249a8c86354b16ae9158a..dcee9128fdd482653488d9fff1ad2a75860b0f8e 100644
+index e241286d52dcb934a7430d24a114e34f23ec56ba..ba6f680e9a851376960c6a3e29db5d6ca46c7e85 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2518,6 +2518,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0737-Fix-Bee-flower-NPE.patch b/patches/server/0736-Fix-Bee-flower-NPE.patch
index 13dcee533d..13dcee533d 100644
--- a/patches/server/0737-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0736-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0737-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index dabe57eadf..dabe57eadf 100644
--- a/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0737-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0739-More-Teleport-API.patch b/patches/server/0738-More-Teleport-API.patch
index 56d40e9b11..79cf35f0fd 100644
--- a/patches/server/0739-More-Teleport-API.patch
+++ b/patches/server/0738-More-Teleport-API.patch
@@ -112,7 +112,7 @@ index 113ca1d16cb7650d72f488cdaa9e670d51dc85f0..b6fef2ca5b564c293cb602cb8e300d35
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a7c03ca87bb0d38552ea7a80b97a0ef0af394190..d5d8fd34f3cbd18b2b956792ec07838b9c5e572d 100644
+index 409d8f8957eda02a474f36e4c9010aee62c7fade..37ca21194e90523c2461468f68509257d11234b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1273,13 +1273,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0740-Add-EntityPortalReadyEvent.patch b/patches/server/0739-Add-EntityPortalReadyEvent.patch
index 11414b6d48..11414b6d48 100644
--- a/patches/server/0740-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0739-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0740-Don-t-use-level-random-in-entity-constructors.patch
index 4d7c249601..4d7c249601 100644
--- a/patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0740-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0742-Send-block-entities-after-destroy-prediction.patch b/patches/server/0741-Send-block-entities-after-destroy-prediction.patch
index e5845bc0c1..df7f376456 100644
--- a/patches/server/0742-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0741-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index d8c5f8e584976a97bd909bfa20023993ab776952..77e78808171daac78502ef3fcc70f03579eaa9e3 100644
+index ac2bd55deeef8e14b8fa0db1f2d10e36d045f0e4..7e3d7d76dfe1c2487cd05c1290b856a1a3ccef24 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -61,6 +61,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0742-Warn-on-plugins-accessing-faraway-chunks.patch
index 2f60387b5d..2f60387b5d 100644
--- a/patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0742-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0743-Custom-Chat-Completion-Suggestions-API.patch
index 9358628d81..75a1697e0d 100644
--- a/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0743-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5d8fd34f3cbd18b2b956792ec07838b9c5e572d..b99dc0fee6c23707785ee155c69d013facf2bc96 100644
+index 37ca21194e90523c2461468f68509257d11234b1..9fd66c351dc74ed9a62db1efd58df2c5bfddfad8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -689,6 +689,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0744-Add-and-fix-missing-BlockFadeEvents.patch
index 18f8fbe87f..18f8fbe87f 100644
--- a/patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0744-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0746-Collision-API.patch b/patches/server/0745-Collision-API.patch
index b4840d04ac..b4840d04ac 100644
--- a/patches/server/0746-Collision-API.patch
+++ b/patches/server/0745-Collision-API.patch
diff --git a/patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0746-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index c145128551..c145128551 100644
--- a/patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0746-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0748-Block-Ticking-API.patch b/patches/server/0747-Block-Ticking-API.patch
index f9900a3d65..f9900a3d65 100644
--- a/patches/server/0748-Block-Ticking-API.patch
+++ b/patches/server/0747-Block-Ticking-API.patch
diff --git a/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0748-Add-Velocity-IP-Forwarding-Support.patch
index b1064130c8..44ddd5cb1d 100644
--- a/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0748-Add-Velocity-IP-Forwarding-Support.patch
@@ -228,7 +228,7 @@ index 9bcded0466f3b10fafd709edc44c60f85cb48b7f..cb006ae0e5be2f1d31261bdd36964229
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 865d330d4c707c4b649650730a66a43e3cb01936..d0f4657a89c6fad5dda556ddec543bb9024952e2 100644
+index 291e444e75d4155a0bcb2335a54436a4ddf69f7c..c26e50d9f50e96135a7729070c1e71d82751a990 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -811,7 +811,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0750-Add-NamespacedKey-biome-methods.patch b/patches/server/0749-Add-NamespacedKey-biome-methods.patch
index 92e69eb6fe..92e69eb6fe 100644
--- a/patches/server/0750-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0749-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0750-Fix-plugin-loggers-on-server-shutdown.patch
index 8a41141be3..8a41141be3 100644
--- a/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0750-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0752-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0751-Stop-large-look-changes-from-crashing-the-server.patch
index 7f3e95c5fc..16f7778bb8 100644
--- a/patches/server/0752-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0751-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0c737b3c0a7645fddf157e1f12af14b8da34d09e..8e56fdb91fdf006e99a1464568b0d87e9e8daee1 100644
+index 7ae2e7751644df130c45e191dc7abdacfc308b88..3764d88dcf0795612b1f502cf927ae2dcb54c605 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3142,37 +3142,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0752-Fire-EntityChangeBlockEvent-in-more-places.patch
index d21cfe9e22..d21cfe9e22 100644
--- a/patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0752-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0754-Missing-eating-regain-reason.patch b/patches/server/0753-Missing-eating-regain-reason.patch
index c0552cc611..b7a24c42cf 100644
--- a/patches/server/0754-Missing-eating-regain-reason.patch
+++ b/patches/server/0753-Missing-eating-regain-reason.patch
@@ -31,7 +31,7 @@ index 85e0a68d85fe62df19ad9809b1869a3eee6d5465..bc346a6ab6aaa7de363e058d1065fd14
  
              boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index ad54de2cf8b8be7ce072c58848ae6b79078f247c..6482cc47b7ecff784344c278ab2db9f99825a169 100644
+index b6574ffbe3b9fac6ce0f4d398508c9914139f7ec..724c4c8493a4b167911dd526ed8662ab4f9b2b66 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -189,7 +189,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
diff --git a/patches/server/0755-Missing-effect-cause.patch b/patches/server/0754-Missing-effect-cause.patch
index 17172c3b36..17172c3b36 100644
--- a/patches/server/0755-Missing-effect-cause.patch
+++ b/patches/server/0754-Missing-effect-cause.patch
diff --git a/patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0755-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0755-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0756-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c6ff862ed6..23927dc5e5 100644
--- a/patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0756-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a4c6fd2f6066ecc4a36a423cb2980ec60d9c7ec1..f3ec9ae17355abf430ebb781b9acd9f529d88a11 100644
+index 382b4f0854284a561325dde141000434a9ddd885..eaeacf28295a5f1af37c8733f36066a69d858cc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -561,8 +561,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0758-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0757-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0758-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0757-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0759-Configurable-chat-thread-limit.patch b/patches/server/0758-Configurable-chat-thread-limit.patch
index fa5e60fd33..fa5e60fd33 100644
--- a/patches/server/0759-Configurable-chat-thread-limit.patch
+++ b/patches/server/0758-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0759-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 351cbaeb38..351cbaeb38 100644
--- a/patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0759-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0761-fix-Jigsaw-block-kicking-user.patch b/patches/server/0760-fix-Jigsaw-block-kicking-user.patch
index 0c52c47ce9..0c52c47ce9 100644
--- a/patches/server/0761-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0760-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0761-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0761-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0763-Add-getDrops-to-BlockState.patch b/patches/server/0762-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0763-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0762-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0763-Fix-a-bunch-of-vanilla-bugs.patch
index 5145bc1511..a8aac72778 100644
--- a/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0763-Fix-a-bunch-of-vanilla-bugs.patch
@@ -130,7 +130,7 @@ index e42dd32e277d8071a2c1b4411bc222a62023102d..5a1493a981ba99f287fc70193bfdf04f
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c..9b62135df9be88b1981d2d330449d42870aaba01 100644
+index d0a7bcc0dde8b2a9543cf4c0c8d35ab042fb4e3b..5647a2c7788b09eb8b14286b0ded0a64c244e25b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -445,14 +445,14 @@ public class ServerPlayer extends Player {
@@ -151,7 +151,7 @@ index a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c..9b62135df9be88b1981d2d330449d428
              while (!world.noCollision((Entity) this) && this.getY() < (double) (world.getMaxBuildHeight() - 1)) {
                  this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 77e78808171daac78502ef3fcc70f03579eaa9e3..0cfdd01778fb4f2150a4dea2d9dc6b3b830af987 100644
+index 7e3d7d76dfe1c2487cd05c1290b856a1a3ccef24..7c1d3b042291a42f13ff32e9a9c6e07da47277ae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -91,7 +91,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch
index c764e834e8..c764e834e8 100644
--- a/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0766-Fix-custom-piglin-loved-items.patch b/patches/server/0765-Fix-custom-piglin-loved-items.patch
index 043217eed5..043217eed5 100644
--- a/patches/server/0766-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0765-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0767-EntityPickupItemEvent-fixes.patch b/patches/server/0766-EntityPickupItemEvent-fixes.patch
index 5780237591..5780237591 100644
--- a/patches/server/0767-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0766-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0767-Correctly-handle-interactions-with-items-on-cooldown.patch
index e9996dba57..116a7a4078 100644
--- a/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0767-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0cfdd01778fb4f2150a4dea2d9dc6b3b830af987..ee7f36700863b9f504a70a56c5f28c8e39b45c91 100644
+index 7c1d3b042291a42f13ff32e9a9c6e07da47277ae..af4ee7e936dad42c458488b128d733a34b08afb5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -509,6 +509,7 @@ public class ServerPlayerGameMode {
@@ -30,7 +30,7 @@ index 0cfdd01778fb4f2150a4dea2d9dc6b3b830af987..ee7f36700863b9f504a70a56c5f28c8e
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a40e6a19459cb5853f72708a0e7b8cc7334dca51..43759af5c1ddb49926cdf49b95acd65e68cffd60 100644
+index cbbc313f83df3bd3e87a1e2879bcf8d9de1b96dd..633d19fef92cc13bc08e63d4fa441903c8c1f49e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -545,6 +545,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0768-Add-PlayerInventorySlotChangeEvent.patch
index 292fb5ad41..a186dc3a9b 100644
--- a/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0768-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9b62135df9be88b1981d2d330449d42870aaba01..535c176eb1d7141e7f46ec2380c3ae0f012a69b3 100644
+index 5647a2c7788b09eb8b14286b0ded0a64c244e25b..cd07b3e1bc12eb8474a74fb08ee6521b5674b105 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -347,6 +347,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0770-Elder-Guardian-appearance-API.patch b/patches/server/0769-Elder-Guardian-appearance-API.patch
index 660b7c3b7e..70da2d10fe 100644
--- a/patches/server/0770-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0769-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b99dc0fee6c23707785ee155c69d013facf2bc96..80a1b190772334c7cc43b8f3dbfc8db96c70c2ca 100644
+index 9fd66c351dc74ed9a62db1efd58df2c5bfddfad8..d3fb8dfa57b83bcdca34909269a09787c2b5ae7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3271,6 +3271,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0771-Allow-changing-bed-s-occupied-property.patch b/patches/server/0770-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0771-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0770-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0772-Add-entity-knockback-API.patch b/patches/server/0771-Add-entity-knockback-API.patch
index c5c8da6eb6..96fdca374b 100644
--- a/patches/server/0772-Add-entity-knockback-API.patch
+++ b/patches/server/0771-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f3ec9ae17355abf430ebb781b9acd9f529d88a11..3e8740f39a0ecd853d7aa9dcee6f8a3d09b14460 100644
+index eaeacf28295a5f1af37c8733f36066a69d858cc3..bd2287ca5d47d5fa2cae95c43d7e4ea5d74cf39c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1088,4 +1088,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0773-Detect-headless-JREs.patch b/patches/server/0772-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0773-Detect-headless-JREs.patch
+++ b/patches/server/0772-Detect-headless-JREs.patch
diff --git a/patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0773-fix-entity-vehicle-collision-event-not-called.patch
index fdb817e0f7..fdb817e0f7 100644
--- a/patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0773-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0775-Add-EntityToggleSitEvent.patch b/patches/server/0774-Add-EntityToggleSitEvent.patch
index 6430c3e7f9..6430c3e7f9 100644
--- a/patches/server/0775-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0774-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0776-Add-fire-tick-delay-option.patch b/patches/server/0775-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0776-Add-fire-tick-delay-option.patch
+++ b/patches/server/0775-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0777-Add-Moving-Piston-API.patch b/patches/server/0776-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0777-Add-Moving-Piston-API.patch
+++ b/patches/server/0776-Add-Moving-Piston-API.patch
diff --git a/patches/server/0778-Ignore-impossible-spawn-tick.patch b/patches/server/0777-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0778-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0777-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0778-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0778-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0779-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index d6c80e3c8e..d6c80e3c8e 100644
--- a/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0779-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0781-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0780-Add-PrePlayerAttackEntityEvent.patch
index 2c7c8105ab..bebf69dca0 100644
--- a/patches/server/0781-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0780-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f861a942807f8b8af36d6b70a124da7853eda053..90c9856dc16f83c762415aaeeb030bcd07b72d51 100644
+index 461129261d93ca9831f347c9612c6f38cbbd8ac9..1ef5f8e0592e528b46af2a94b0650e9d15c58186 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1246,8 +1246,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0781-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0781-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0782-fix-MC-252817-green-map-markers-do-not-disappear.patch
index a5e8df272b..a5e8df272b 100644
--- a/patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0782-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0784-Add-Player-Warden-Warning-API.patch b/patches/server/0783-Add-Player-Warden-Warning-API.patch
index a049f08c9f..aa8f021904 100644
--- a/patches/server/0784-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0783-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 80a1b190772334c7cc43b8f3dbfc8db96c70c2ca..cceaeda61af0db282c94bf306c34979100f050df 100644
+index d3fb8dfa57b83bcdca34909269a09787c2b5ae7b..47c4255348fc8aca404d8fcce72d1b54a833413a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3276,6 +3276,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0784-More-vanilla-friendly-methods-to-update-trades.patch
index 5280c03219..5280c03219 100644
--- a/patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0784-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0786-Add-paper-dumplisteners-command.patch b/patches/server/0785-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0786-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0785-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0787-check-global-player-list-where-appropriate.patch b/patches/server/0786-check-global-player-list-where-appropriate.patch
index beebaacc34..bee5e7552f 100644
--- a/patches/server/0787-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0786-check-global-player-list-where-appropriate.patch
@@ -24,7 +24,7 @@ index 9f7088691c3ab848c5095b6109d14eae947ace99..1e122d5b49aa7f6a626e781e53de53be
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8e56fdb91fdf006e99a1464568b0d87e9e8daee1..f725d1f797733f7a4871aa1f84e7353fc3c3f948 100644
+index 3764d88dcf0795612b1f502cf927ae2dcb54c605..d3a48cdb8a6f56cefe824fac814cef58c1697c10 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3688,7 +3688,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch
index a5f4531c29..a5f4531c29 100644
--- a/patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0789-ItemStack-damage-API.patch b/patches/server/0788-ItemStack-damage-API.patch
index 807a916f44..fc693daf07 100644
--- a/patches/server/0789-ItemStack-damage-API.patch
+++ b/patches/server/0788-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3e8740f39a0ecd853d7aa9dcee6f8a3d09b14460..5fe3e5b9f52dc1d2b9b4adb7ccaaa2bbf591af9c 100644
+index bd2287ca5d47d5fa2cae95c43d7e4ea5d74cf39c..350ec6c4af1dc8c559d5987d011049f14b85bd06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1096,4 +1096,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0790-Friction-API.patch b/patches/server/0789-Friction-API.patch
index c713bd2c3a..d0994709bc 100644
--- a/patches/server/0790-Friction-API.patch
+++ b/patches/server/0789-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f725d1f797733f7a4871aa1f84e7353fc3c3f948..205c7bdc03c86229a100bd535db16b502d99ba24 100644
+index d3a48cdb8a6f56cefe824fac814cef58c1697c10..8a4977bf4d5b87ca30e048d749b6a878b1a17911 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -273,6 +273,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -133,7 +133,7 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 5fe3e5b9f52dc1d2b9b4adb7ccaaa2bbf591af9c..e87a52f5dbb8cd984fd2203d912ac3f1ff9d68aa 100644
+index 350ec6c4af1dc8c559d5987d011049f14b85bd06..025cdeecfd26aed350bda6098714608b31c6d513 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1140,4 +1140,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0791-Fix-premature-player-kicks-on-shutdown.patch
index 7cdccaff49..7cdccaff49 100644
--- a/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0791-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0793-Sync-offhand-slot-in-menus.patch b/patches/server/0792-Sync-offhand-slot-in-menus.patch
index 38a66ea248..fc35b87cb4 100644
--- a/patches/server/0793-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0792-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 535c176eb1d7141e7f46ec2380c3ae0f012a69b3..d59225c63aa4d3df9f8e87a1b3527d044fd2c410 100644
+index cd07b3e1bc12eb8474a74fb08ee6521b5674b105..a79023c9e3265221e55cae1879f9c0052dafbef6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -316,6 +316,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0794-Player-Entity-Tracking-Events.patch b/patches/server/0793-Player-Entity-Tracking-Events.patch
index 7d1dfb015f..7d1dfb015f 100644
--- a/patches/server/0794-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0793-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0795-Limit-pet-look-distance.patch b/patches/server/0794-Limit-pet-look-distance.patch
index 7a9fe7cf5c..7a9fe7cf5c 100644
--- a/patches/server/0795-Limit-pet-look-distance.patch
+++ b/patches/server/0794-Limit-pet-look-distance.patch
diff --git a/patches/server/0796-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0795-Fixes-and-additions-to-the-SpawnReason-API.patch
index d758b37206..d758b37206 100644
--- a/patches/server/0796-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0795-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0797-fix-Instruments.patch b/patches/server/0796-fix-Instruments.patch
index c6f5f590e8..3b295bdea4 100644
--- a/patches/server/0797-fix-Instruments.patch
+++ b/patches/server/0796-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 cceaeda61af0db282c94bf306c34979100f050df..f2d862671df42706e8d36db458f58cb51acd8efa 100644
+index 47c4255348fc8aca404d8fcce72d1b54a833413a..560a354451e1c027ce4df3f18d39e122be7f96ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -766,7 +766,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0798-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0797-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 2f86713e06..2f86713e06 100644
--- a/patches/server/0798-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0797-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0799-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0798-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 5b38409d1f..5b38409d1f 100644
--- a/patches/server/0799-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0798-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0800-Add-BlockLockCheckEvent.patch b/patches/server/0799-Add-BlockLockCheckEvent.patch
index 7e9746e1ed..7e9746e1ed 100644
--- a/patches/server/0800-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0799-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0801-Add-Sneaking-API-for-Entities.patch b/patches/server/0800-Add-Sneaking-API-for-Entities.patch
index 47d08328f7..47d08328f7 100644
--- a/patches/server/0801-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0800-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0802-Improve-logging-and-errors.patch b/patches/server/0801-Improve-logging-and-errors.patch
index e5bcd5c0f7..e5bcd5c0f7 100644
--- a/patches/server/0802-Improve-logging-and-errors.patch
+++ b/patches/server/0801-Improve-logging-and-errors.patch
diff --git a/patches/server/0803-Improve-PortalEvents.patch b/patches/server/0802-Improve-PortalEvents.patch
index 8ab28ebae1..8ab28ebae1 100644
--- a/patches/server/0803-Improve-PortalEvents.patch
+++ b/patches/server/0802-Improve-PortalEvents.patch
diff --git a/patches/server/0804-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0803-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0804-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0803-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0805-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0804-Add-missing-SpigotConfig-logCommands-check.patch
index e4ad80f75d..e4ad80f75d 100644
--- a/patches/server/0805-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0804-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0805-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0805-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0807-Flying-Fall-Damage.patch b/patches/server/0806-Flying-Fall-Damage.patch
index 2e5344a36c..f1e038d077 100644
--- a/patches/server/0807-Flying-Fall-Damage.patch
+++ b/patches/server/0806-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 90c9856dc16f83c762415aaeeb030bcd07b72d51..96fc37c871566ec41c42bd0e0f4a147044c239b4 100644
+index 1ef5f8e0592e528b46af2a94b0650e9d15c58186..83a205387cb902121aabf0f5082c650debcb734c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -194,6 +194,7 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index 90c9856dc16f83c762415aaeeb030bcd07b72d51..96fc37c871566ec41c42bd0e0f4a1470
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f2d862671df42706e8d36db458f58cb51acd8efa..729033560f55f54ca418c5d5445b82efceabafa4 100644
+index 560a354451e1c027ce4df3f18d39e122be7f96ed..9716687ba5aa407d714389c50b00e8c7ecf88724 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2563,6 +2563,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 7a2771679a..89d91e3b85 100644
--- a/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6b61e4d5774532e67932b872bb84d7e91589fc6..1c370fd90427ea3ec9bcaece45775b1aa7ba9ee7 100644
+index 661f630b38dff4aa760e7939ff80b1361d426565..a6f0a1114da54f78ccb2fb6151bf14e34cd5c330 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -967,6 +967,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0809-config-for-disabling-entity-tag-tags.patch b/patches/server/0808-config-for-disabling-entity-tag-tags.patch
index 79f922d624..79f922d624 100644
--- a/patches/server/0809-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0808-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0810-Use-single-player-info-update-packet-on-join.patch b/patches/server/0809-Use-single-player-info-update-packet-on-join.patch
index f8e74ba432..f8e74ba432 100644
--- a/patches/server/0810-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0809-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 98f6d365c0..f604d274b1 100644
--- a/patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 205c7bdc03c86229a100bd535db16b502d99ba24..f6f2f62cf9a4c7876c251766ad7c32f6f046eb2e 100644
+index 8a4977bf4d5b87ca30e048d749b6a878b1a17911..6c502f67234eee9c1446d490acde1dbe6f34119e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1644,7 +1644,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0812-Win-Screen-API.patch b/patches/server/0811-Win-Screen-API.patch
index 0bc7c9aa44..57cc12a7dc 100644
--- a/patches/server/0812-Win-Screen-API.patch
+++ b/patches/server/0811-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 729033560f55f54ca418c5d5445b82efceabafa4..606b56bcb3fdc3c01a1a98f1c8de77ff0bc70727 100644
+index 9716687ba5aa407d714389c50b00e8c7ecf88724..79ab080e496df2b8d11c777427863bd775e60b91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1292,6 +1292,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch
index 83f46bb0c6..b95442b660 100644
--- a/patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0812-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 76191fe677f3dd91ea55d53881f52952410a3a05..91c1cba51863aeac0f648089bb4b5297ed33320d 100644
+index 6352e56fa3e69690846842d474a1ae51ad4059c6..a1173823b3a95b973ae742f886b0555b3203288c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -160,7 +160,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0814-Fix-force-opening-enchantment-tables.patch b/patches/server/0813-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0814-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0813-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0815-Add-Entity-Body-Yaw-API.patch b/patches/server/0814-Add-Entity-Body-Yaw-API.patch
index 47d59d5783..d7a5c9f9a3 100644
--- a/patches/server/0815-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0814-Add-Entity-Body-Yaw-API.patch
@@ -43,7 +43,7 @@ index 365281dfc0308c5db0c72b56208d9b87be0e955e..991b94ff1186b1071a94b2662873dc07
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e87a52f5dbb8cd984fd2203d912ac3f1ff9d68aa..2e614eb8cdc249670c3ca2be42704e4de69f3175 100644
+index 025cdeecfd26aed350bda6098714608b31c6d513..c11b9afdf8d5f6f61aa2e07f6e5b78855bf5d8bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1154,4 +1154,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0817-Add-EntityFertilizeEggEvent.patch b/patches/server/0816-Add-EntityFertilizeEggEvent.patch
index e002e6919d..413691a350 100644
--- a/patches/server/0817-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0816-Add-EntityFertilizeEggEvent.patch
@@ -69,7 +69,7 @@ index a0c52ce65d4035d135b1536c7408a6867a553447..dc035bf94c5f6574ed8ad369b327b7f7
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper - Call EntityDropItemEvent
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 43759af5c1ddb49926cdf49b95acd65e68cffd60..cd515bbb191e23bbb297dcc2e849e64a26ee28da 100644
+index 633d19fef92cc13bc08e63d4fa441903c8c1f49e..4c2a09f137a5cb508317b4a72ae82d6389ad6305 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2106,4 +2106,28 @@ public class CraftEventFactory {
diff --git a/patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0819-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..34b66d686a 100644
--- a/patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0819-Correctly-handle-ArmorStand-invisibility.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle ArmorStand invisibility
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2c16cedf8cb2e4047415e056c419ed9c33c80e93..ccda0d7a96c201905f0f62dcb0e5b278a51dee9f 100644
+index 1087840331f68ffe79e79f6493137b2b894832f9..9fe85d6f807e64cf02d8e1921672e3196f6d606f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -152,6 +152,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0820-Fix-advancement-triggers-for-entity-damage.patch
index 6d0a71ca45..eef1839698 100644
--- a/patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0820-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index 2ebbf7954dc5e0d6c9d53327d05b725eec310086..c5bd2e90ad74ba08910f65a2e07b6f76
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f6f2f62cf9a4c7876c251766ad7c32f6f046eb2e..454d4fa966fd83632ae237bc3e94fddc68e9a8ad 100644
+index 6c502f67234eee9c1446d490acde1dbe6f34119e..84b7552dfc2077b02e3c4120ad72334cf60212d6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2375,7 +2375,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0822-Fix-text-display-error-on-spawn.patch b/patches/server/0821-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0822-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0821-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0823-Fix-inventories-returning-null-Locations.patch b/patches/server/0822-Fix-inventories-returning-null-Locations.patch
index eabfae28c5..eabfae28c5 100644
--- a/patches/server/0823-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0822-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0824-Add-Shearable-API.patch b/patches/server/0823-Add-Shearable-API.patch
index 34eb025e6b..34eb025e6b 100644
--- a/patches/server/0824-Add-Shearable-API.patch
+++ b/patches/server/0823-Add-Shearable-API.patch
diff --git a/patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch
index af809bf2b4..af809bf2b4 100644
--- a/patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index c51be7e3ac..c51be7e3ac 100644
--- a/patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0827-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0826-Treat-sequence-violations-like-they-should-be.patch
index b60e6de65d..b60e6de65d 100644
--- a/patches/server/0827-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0826-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0828-remove-duplicate-animate-packet-for-records.patch b/patches/server/0827-remove-duplicate-animate-packet-for-records.patch
index 47fc3e8c30..47fc3e8c30 100644
--- a/patches/server/0828-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0827-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch
index d71981b357..d71981b357 100644
--- a/patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index e2e9fd9b35..e2e9fd9b35 100644
--- a/patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0831-Use-array-for-gamerule-storage.patch b/patches/server/0830-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0831-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0830-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0831-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0831-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0834-Add-Mob-Experience-reward-API.patch b/patches/server/0833-Add-Mob-Experience-reward-API.patch
index 487fe9e567..487fe9e567 100644
--- a/patches/server/0834-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0833-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0834-Break-redstone-on-top-of-trap-doors-early.patch
index 2f89b7d780..2f89b7d780 100644
--- a/patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0834-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0837-More-accurate-isInOpenWater-impl.patch b/patches/server/0836-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0837-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0836-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0838-Expand-PlayerItemMendEvent.patch b/patches/server/0837-Expand-PlayerItemMendEvent.patch
index fac31424c0..5017935fca 100644
--- a/patches/server/0838-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0837-Expand-PlayerItemMendEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand PlayerItemMendEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542d3a78da2 100644
+index 27b75172820c35b02fe6b63e379a5c9a9fa59159..fb2e9f832841a35b07db7bfe55ffd1c81322fe64 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -344,7 +344,7 @@ public class ExperienceOrb extends Entity {
+@@ -350,7 +350,7 @@ public class ExperienceOrb extends Entity {
              ItemStack itemstack = (ItemStack) entry.getValue();
              int j = Math.min(this.xpToDurability(amount), itemstack.getDamageValue());
              // CraftBukkit start
@@ -17,13 +17,13 @@ index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542
              j = event.getRepairAmount();
              if (event.isCancelled()) {
                  return amount;
-@@ -352,8 +352,13 @@ public class ExperienceOrb extends Entity {
+@@ -358,8 +358,13 @@ public class ExperienceOrb extends Entity {
              // CraftBukkit end
  
              itemstack.setDamageValue(itemstack.getDamageValue() - j);
 -            int k = amount - this.durabilityToXp(j);
 +            int k = amount - event.getDurabilityToXpOperation().applyAsInt(j); // Paper - Expand PlayerItemMendEvent
-             this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls
+             // this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
 +            // Paper start - Expand PlayerItemMendEvent
 +            if (j == 0 && amount == k) { // if repair amount is 0 and no xp was removed, don't do recursion; treat as cancelled
 +                return k;
@@ -33,7 +33,7 @@ index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 606b56bcb3fdc3c01a1a98f1c8de77ff0bc70727..7522a31d618e90d5109f3067e07748f9a07482a5 100644
+index 79ab080e496df2b8d11c777427863bd775e60b91..c341c64950e2addfcf30655f1cf94bc543bbdba4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1835,11 +1835,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -51,7 +51,7 @@ index 606b56bcb3fdc3c01a1a98f1c8de77ff0bc70727..7522a31d618e90d5109f3067e07748f9
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cd515bbb191e23bbb297dcc2e849e64a26ee28da..355c9c8121a6ef60d6178eebc1587b90b9731f12 100644
+index 4c2a09f137a5cb508317b4a72ae82d6389ad6305..95b819ef8953b2d94a76e33328c967d21bf216b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1264,10 +1264,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0838-Refresh-ProjectileSource-for-projectiles.patch
index 224c05a6f9..4292aa9845 100644
--- a/patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0838-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1c370fd90427ea3ec9bcaece45775b1aa7ba9ee7..cd9ec9d94594fc03b293728e442e20894ad6465b 100644
+index a6f0a1114da54f78ccb2fb6151bf14e34cd5c330..1d934225d6abbec6f231042b8a9c823ee4a26029 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -385,6 +385,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0840-Add-transient-modifier-API.patch b/patches/server/0839-Add-transient-modifier-API.patch
index 5614f73626..d0da33ee19 100644
--- a/patches/server/0840-Add-transient-modifier-API.patch
+++ b/patches/server/0839-Add-transient-modifier-API.patch
@@ -21,7 +21,7 @@ index 12135ffeacd648f6bc4d7d327059ea1a7e8c79c4..52439f4b959c74027eb191a3af960c70
      public void removeModifier(AttributeModifier modifier) {
          throw new UnsupportedOperationException("Cannot modify default attributes");
 diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
-index 8afbb8e0cb368e95f23bb78c1261f9aa9b8abd86..c0fb6da6bc3c5b4f37601d898fa421d430417d97 100644
+index 0a18983151d17b8e1460b82326b0380087e13795..7d16545665f74ce619f7b18e568226642c84ceee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
 +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
 @@ -50,6 +50,14 @@ public class CraftAttributeInstance implements AttributeInstance {
diff --git a/patches/server/0841-Fix-block-place-logic.patch b/patches/server/0840-Fix-block-place-logic.patch
index 6438856b91..6438856b91 100644
--- a/patches/server/0841-Fix-block-place-logic.patch
+++ b/patches/server/0840-Fix-block-place-logic.patch
diff --git a/patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index c2c946f528..c2c946f528 100644
--- a/patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 77e4fe6394..bde2e03a16 100644
--- a/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d0f4657a89c6fad5dda556ddec543bb9024952e2..72b9b8f0e06ced33ac76af162fff52442decb2cf 100644
+index c26e50d9f50e96135a7729070c1e71d82751a990..1c0361f1533f5bff7eac650ca933c962e56437a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -350,7 +350,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0844-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0844-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0846-Fix-sniffer-removeExploredLocation.patch b/patches/server/0845-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0846-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0845-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0846-Add-method-to-remove-all-active-potion-effects.patch
index a3bf117ed3..1b923edd92 100644
--- a/patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0846-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2e614eb8cdc249670c3ca2be42704e4de69f3175..aa351df679f300018367244c7ccb3e5a59e9276f 100644
+index c11b9afdf8d5f6f61aa2e07f6e5b78855bf5d8bd..2d4e49f386be35ee8912c1bca38f74b8d8926f3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -555,6 +555,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 702619dd05..702619dd05 100644
--- a/patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0849-Add-event-for-player-editing-sign.patch b/patches/server/0848-Add-event-for-player-editing-sign.patch
index ec1df39aea..ec1df39aea 100644
--- a/patches/server/0849-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0848-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0849-Only-tick-item-frames-if-players-can-see-it.patch
index dbf1486052..dbf1486052 100644
--- a/patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0849-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch
index 1f86b6a789..1f86b6a789 100644
--- a/patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0852-Add-option-to-disable-block-updates.patch b/patches/server/0851-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0852-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0851-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0853-Call-missing-BlockDispenseEvent.patch b/patches/server/0852-Call-missing-BlockDispenseEvent.patch
index a4fb5e7017..1bc62b09cc 100644
--- a/patches/server/0853-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0852-Call-missing-BlockDispenseEvent.patch
@@ -50,7 +50,7 @@ index 9507dbbb4b490149b9248c384be5adaccae40c41..5bbadc890a72f1cb22c6881ebcc163b0
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 355c9c8121a6ef60d6178eebc1587b90b9731f12..2e676e7754429e1bd6cc7fdac32adcac56ab0f7d 100644
+index 95b819ef8953b2d94a76e33328c967d21bf216b4..6ecdb9d965d9a14a65d7ce6b3c7b39d72d396167 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2107,6 +2107,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch
index 80cc7dc7bc..5e49d5fc94 100644
--- a/patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cd9ec9d94594fc03b293728e442e20894ad6465b..6178ce2639b26c6dcd0033d0a99af0ddee10a7fe 100644
+index 1d934225d6abbec6f231042b8a9c823ee4a26029..9541fbd06bc000023d6119eff03787ef068178ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1210,7 +1210,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0855-Optimize-player-lookups-for-beacons.patch b/patches/server/0854-Optimize-player-lookups-for-beacons.patch
index c6e0cae5ab..c6e0cae5ab 100644
--- a/patches/server/0855-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0854-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0856-Add-Sign-getInteractableSideFor.patch b/patches/server/0855-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0856-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0855-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0857-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch
index 61e0e014da..61e0e014da 100644
--- a/patches/server/0857-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0858-Fix-BanList-API.patch b/patches/server/0857-Fix-BanList-API.patch
index 41e95259ca..8cd8ecd005 100644
--- a/patches/server/0858-Fix-BanList-API.patch
+++ b/patches/server/0857-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7522a31d618e90d5109f3067e07748f9a07482a5..7dfad8abaf5db2ca5ea942a0ce92c3313a132205 100644
+index c341c64950e2addfcf30655f1cf94bc543bbdba4..abc9c4869994e97b0d6301dd58882f8f7e9383e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1733,23 +1733,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0860-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0859-Fix-possible-NPE-on-painting-creation.patch
index cf51e817de..7806a724f0 100644
--- a/patches/server/0860-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0859-Fix-possible-NPE-on-painting-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 7ba6302ecb72fa6e523054e7e3223d79eedf6589..63f9852de5b557351793ba3aebdd7e752caf2417 100644
+index 907904da7f89e8e5e5cfab80977f04af3fdf17c7..2ab13259d2f3ecef4d9195c8b99775281aeaf12a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 @@ -325,8 +325,13 @@ public final class CraftEntityTypes {
diff --git a/patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 32b71969c8..32b71969c8 100644
--- a/patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 2beca46925..8b1e62e4fc 100644
--- a/patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2e676e7754429e1bd6cc7fdac32adcac56ab0f7d..304a224e82d3b73ae914c58753eca9ecb1a08c1c 100644
+index 67604683e474701ac84b6e0a2f9c93a50978147b..332fb71629dfb281656e6473fb5504557848aab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -735,7 +735,8 @@ public class CraftEventFactory {
@@ -16,5 +16,5 @@ index 2e676e7754429e1bd6cc7fdac32adcac56ab0f7d..304a224e82d3b73ae914c58753eca9ec
 +            event = CraftEventFactory.callEntitySpawnEvent(entity); // Call spawn event for ExperienceOrb entities
 +            if (radius > 0 && !event.isCancelled() && !entity.isRemoved()) {
                  // Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
-                 final int maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
-                 final boolean mergeUnconditionally = world.paperConfig().entities.behavior.experienceMergeMaxValue <= 0;
+                 final long maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
+                 final boolean mergeUnconditionally = maxValue <= 0;
diff --git a/patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0864-Add-whitelist-events.patch b/patches/server/0863-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0864-Add-whitelist-events.patch
+++ b/patches/server/0863-Add-whitelist-events.patch
diff --git a/patches/server/0865-Implement-PlayerFailMoveEvent.patch b/patches/server/0864-Implement-PlayerFailMoveEvent.patch
index 9a127a050d..9a127a050d 100644
--- a/patches/server/0865-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0864-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0866-Folia-scheduler-and-owned-region-API.patch b/patches/server/0865-Folia-scheduler-and-owned-region-API.patch
index 59cf2bb87c..8140417dc2 100644
--- a/patches/server/0866-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0865-Folia-scheduler-and-owned-region-API.patch
@@ -1251,7 +1251,7 @@ index 9541fbd06bc000023d6119eff03787ef068178ce..3aeb24963ce0415e97168196cbf53e8f
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 870cdb65854cb2cc204aca7c14ca867655e44512..2dc0473b2b4d905da5b4ba62db373feab9cb7763 100644
+index 1c0361f1533f5bff7eac650ca933c962e56437a6..24bded5c7c2c64b359348929ee94cbef8899a121 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0867-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0866-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0867-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0866-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0868-API-for-updating-recipes-on-clients.patch b/patches/server/0867-API-for-updating-recipes-on-clients.patch
index 246bac1bcd..246bac1bcd 100644
--- a/patches/server/0868-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0867-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0869-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0868-Fix-rotation-when-spawning-display-entities.patch
index a027b8b8bb..61dcfe34f7 100644
--- a/patches/server/0869-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0868-Fix-rotation-when-spawning-display-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotation when spawning display entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 63f9852de5b557351793ba3aebdd7e752caf2417..2c44056065b75efecdf7bc835d1e899d1b50ccfe 100644
+index 2ab13259d2f3ecef4d9195c8b99775281aeaf12a..d9881f5f9b36e215afc98ce84c83b3a5443d1d39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 @@ -220,6 +220,7 @@ public final class CraftEntityTypes {
diff --git a/patches/server/0870-Only-capture-actual-tree-growth.patch b/patches/server/0869-Only-capture-actual-tree-growth.patch
index 9f209c027a..9f209c027a 100644
--- a/patches/server/0870-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0869-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0871-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0871-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0872-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch
index a51b206d8a..a51b206d8a 100644
--- a/patches/server/0872-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0873-Use-correct-seed-on-api-world-load.patch b/patches/server/0872-Use-correct-seed-on-api-world-load.patch
index 667c63e488..667c63e488 100644
--- a/patches/server/0873-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0872-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0875-Cache-map-ids-on-item-frames.patch b/patches/server/0874-Cache-map-ids-on-item-frames.patch
index 4294f88d3c..4294f88d3c 100644
--- a/patches/server/0875-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0874-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0876-Fix-custom-statistic-criteria-creation.patch b/patches/server/0875-Fix-custom-statistic-criteria-creation.patch
index 00b97b15e6..00b97b15e6 100644
--- a/patches/server/0876-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0875-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0877-Bandaid-fix-for-Effect.patch b/patches/server/0876-Bandaid-fix-for-Effect.patch
index 890c0c308e..309449999a 100644
--- a/patches/server/0877-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0876-Bandaid-fix-for-Effect.patch
@@ -81,7 +81,7 @@ index 0c5c67480e16333641f4ebc89d892f7a0e2387fd..18c1cceb9e8b2873b24134a9e0126336
              // 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 7dfad8abaf5db2ca5ea942a0ce92c3313a132205..36ffa642655bea0281251996b8207dd6335043ba 100644
+index abc9c4869994e97b0d6301dd58882f8f7e9383e1..1654c04c261f5591df4815423efb55751882de10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -915,7 +915,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0878-SculkCatalyst-bloom-API.patch b/patches/server/0877-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0878-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0877-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0879-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0878-API-for-an-entity-s-scoreboard-name.patch
index c44b023d7d..c44b023d7d 100644
--- a/patches/server/0879-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0878-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch
index 3d748a27fb..3d748a27fb 100644
--- a/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 83a253acb9..83a253acb9 100644
--- a/patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch
index aa3f1c73c8..fb7b92cfbd 100644
--- a/patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index ee7f36700863b9f504a70a56c5f28c8e39b45c91..7b4426ac0435d3f419d9ece29dc9eccdb8f99950 100644
+index af4ee7e936dad42c458488b128d733a34b08afb5..266fd2874293091f7bf49dcb8c9295250ac7286c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -434,8 +434,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0882-Fire-entity-death-event-for-ender-dragon.patch
index 28897505d4..28897505d4 100644
--- a/patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0882-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1cf3f3d9a6..1cf3f3d9a6 100644
--- a/patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0885-Add-Listing-API-for-Player.patch b/patches/server/0884-Add-Listing-API-for-Player.patch
index c5a9538763..f380ada607 100644
--- a/patches/server/0885-Add-Listing-API-for-Player.patch
+++ b/patches/server/0884-Add-Listing-API-for-Player.patch
@@ -119,7 +119,7 @@ index ea04eb049e16d1027d15f9863d1fcd16f090c464..0aa28caa1254137c0bae8e213bd08c9a
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36ffa642655bea0281251996b8207dd6335043ba..e423e97d07ef0f5d0e5bcc7ceb0f353be142e0bf 100644
+index 1654c04c261f5591df4815423efb55751882de10..4e034c274964a651d6d91a7e1dc39c04e4fba184 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -199,6 +199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0886-Configurable-Region-Compression-Format.patch b/patches/server/0885-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0886-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0885-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0886-Add-BlockFace-to-BlockDamageEvent.patch
index 2fcc02db1b..570b327293 100644
--- a/patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0886-Add-BlockFace-to-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockFace to BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 7b4426ac0435d3f419d9ece29dc9eccdb8f99950..cef3a64b5e6c4d34ed079078420078a7adfcd574 100644
+index 266fd2874293091f7bf49dcb8c9295250ac7286c..dd78a1685bd841577aa9d5010fffda1468901baf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -256,7 +256,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 7b4426ac0435d3f419d9ece29dc9eccdb8f99950..cef3a64b5e6c4d34ed079078420078a7
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 304a224e82d3b73ae914c58753eca9ecb1a08c1c..1543a8d55a55b1e6b48855f584ecf8c543f2e5f2 100644
+index fc14a3a64fe18971dcac8d90a062407f1d978fef..ae4a7249adfe707693dea4d2748590b869c2d4f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,13 +650,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0887-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0887-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0889-Expand-Pose-API.patch b/patches/server/0888-Expand-Pose-API.patch
index 7a1897fcb2..0cd10176d6 100644
--- a/patches/server/0889-Expand-Pose-API.patch
+++ b/patches/server/0888-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 56f0648a7bb7eacc0a023c657be476b78774622d..bde80f721ea08f3f183d9cd60c944dcf8f798087 100644
+index 3aeb24963ce0415e97168196cbf53e8f26334013..de841b91b0a0c10c4b9f4dfdd3858c83f81ad183 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -420,6 +420,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0890-More-DragonBattle-API.patch b/patches/server/0889-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0890-More-DragonBattle-API.patch
+++ b/patches/server/0889-More-DragonBattle-API.patch
diff --git a/patches/server/0891-Add-PlayerPickItemEvent.patch b/patches/server/0890-Add-PlayerPickItemEvent.patch
index 010e85d01a..010e85d01a 100644
--- a/patches/server/0891-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0890-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0892-Allow-trident-custom-damage.patch b/patches/server/0891-Allow-trident-custom-damage.patch
index eaa126da9c..eaa126da9c 100644
--- a/patches/server/0892-Allow-trident-custom-damage.patch
+++ b/patches/server/0891-Allow-trident-custom-damage.patch
diff --git a/patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0892-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0892-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0894-Optimize-nearest-structure-border-iteration.patch b/patches/server/0893-Optimize-nearest-structure-border-iteration.patch
index 805af0f26c..805af0f26c 100644
--- a/patches/server/0894-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0893-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0895-Implement-OfflinePlayer-isConnected.patch b/patches/server/0894-Implement-OfflinePlayer-isConnected.patch
index 5eade7d5b4..479e78450f 100644
--- a/patches/server/0895-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0894-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 e423e97d07ef0f5d0e5bcc7ceb0f353be142e0bf..4bdbc94f7221a88ee073e73ec0a13af51f704478 100644
+index 4e034c274964a651d6d91a7e1dc39c04e4fba184..5da5dc72a0ddb45515bce0ea81825f5368bbd997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -254,6 +254,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0896-Fix-inventory-desync.patch b/patches/server/0895-Fix-inventory-desync.patch
index d59662eab7..aaa16e68f2 100644
--- a/patches/server/0896-Fix-inventory-desync.patch
+++ b/patches/server/0895-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 992032821110fc658fecc09530097a526f20d74d..b2c7b0d21a386bd0e87f22e1a1dc5b2d314395ed 100644
+index a79023c9e3265221e55cae1879f9c0052dafbef6..88ea8ed1b81ece6315bc8dcde04b5fa1bb6a7d04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -397,6 +397,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 992032821110fc658fecc09530097a526f20d74d..b2c7b0d21a386bd0e87f22e1a1dc5b2d
          this.containerMenu.findSlot(this.getInventory(), this.getInventory().selected).ifPresent(s -> {
              this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem());
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7b10bb9cbf6f2b4a70ddaa0ba4bc7409a17f3f09..e671aa59dc60e6d836cbe5b3947a4ca66d914809 100644
+index babbcee2892990b626afed76b75861f0d42cf571..13c4edabb3671357d07a27d3e6403ed66a5028d5 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1466,8 +1466,9 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
diff --git a/patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch
index 2d47281f92..e00de009ff 100644
--- a/patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d59225c63aa4d3df9f8e87a1b3527d044fd2c410..e10c8309e184fe2c5c9682aa901ed7a320980431 100644
+index 88ea8ed1b81ece6315bc8dcde04b5fa1bb6a7d04..9179434d490bc8546ba3a35434998b9fc916e6b2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1618,12 +1618,17 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 3d36d79a4e7f16f6face3465cdf54656984f3ebc..41f3cdec7deabf34358b8087df77169f
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper - Prevent opening inventories when frozen
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1543a8d55a55b1e6b48855f584ecf8c543f2e5f2..e100aaccab7e50c6d71b350443e3779472c910eb 100644
+index ae4a7249adfe707693dea4d2748590b869c2d4f9..31c35ccbd84fab60fcf30d0d00f1ee38c05e78ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1381,10 +1381,21 @@ public class CraftEventFactory {
diff --git a/patches/server/0898-Configure-sniffer-egg-hatch-time.patch b/patches/server/0897-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0898-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0897-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch
index 55393e1053..67d506a715 100644
--- a/patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch
@@ -12,7 +12,7 @@ some servers that have players placing end crystals as a style of combat.
 The very cheap distance check prevents running the entity lookup every time.
 
 diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-index 1339459dcbd85897f32362019f79a68393c91674..26c77cead77db560dd5836f5b56e09775cf5172d 100644
+index 273bb38f14b8af08d123e02742d365fb5d91cdf5..5f51e64cb0611a4ba6bdcdcacbcba1063a7f3a5c 100644
 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
 +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
 @@ -30,7 +30,7 @@ public class EndCrystalItem extends Item {
diff --git a/patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0900-Add-slot-sanity-checks-in-container-clicks.patch
index b049da07fe..b049da07fe 100644
--- a/patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0900-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch
index bafd87afad..bafd87afad 100644
--- a/patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0902-Allow-proper-checking-of-empty-item-stacks.patch
index 906d0184e4..96786bb1b5 100644
--- a/patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0902-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 eb305f23898ecb0c1dbc4c659da0a23207d8d362..0790f10122546bff1079b522b08d117426364a95 100644
+index 55ae50f99a891a26dcdc0ec6266e3c05b3d12a5e..819e237a8797ab51b7f888b42a013c5198d8fcf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -36,12 +36,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0904-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0903-Fix-silent-equipment-change-for-mobs.patch
index 3ec68fbdbd..1db9162577 100644
--- a/patches/server/0904-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0903-Fix-silent-equipment-change-for-mobs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix silent equipment change for mobs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 66814adfb2cf92067702fc2695b083661cf859c0..bca70fff39409617e9c2b8ea66c1de4b9376d261 100644
+index 13c4edabb3671357d07a27d3e6403ed66a5028d5..f9a8bcbd58ba450bf6f5f82ae9e08b8bec9a9c4d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1153,19 +1153,26 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
diff --git a/patches/server/0905-Fix-spigot-s-Forced-Stats.patch b/patches/server/0904-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0905-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0904-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0905-Add-missing-InventoryHolders-to-inventories.patch
index 7f32a639b2..7f32a639b2 100644
--- a/patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0905-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 21515b5dba..21515b5dba 100644
--- a/patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0907-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0907-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0912-Fix-missing-map-initialize-event-call.patch b/patches/server/0911-Fix-missing-map-initialize-event-call.patch
index fd2193a41f..fd2193a41f 100644
--- a/patches/server/0912-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0911-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..35494c32ed 100644
--- a/patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Update entity data when attaching firework to entity
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index fedbfbac02b73382aacc69f8a1e5a3e746c55ea2..1309fabd357eb9b8f90f882ec7ff3de9e60f187d 100644
+index 3c31ff72f3e77ee0d9231fec5f15267c56799a7c..95e35c223f2ad9b6de6749544abd68de71e4f1ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -69,6 +69,10 @@ public class CraftFirework extends CraftProjectile implements Firework {
diff --git a/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0913-Fix-UnsafeValues-loadAdvancement.patch
index 5c6b4fb26d..5c6b4fb26d 100644
--- a/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0913-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0915-Add-player-idle-duration-API.patch b/patches/server/0914-Add-player-idle-duration-API.patch
index 6c4c560343..e4e5d0f4c5 100644
--- a/patches/server/0915-Add-player-idle-duration-API.patch
+++ b/patches/server/0914-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4bdbc94f7221a88ee073e73ec0a13af51f704478..9c818bb1ea5c9dc8764845d5930d60503fc06f54 100644
+index 5da5dc72a0ddb45515bce0ea81825f5368bbd997..027abbde974ff2c4844c3d815230d600140690a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3391,6 +3391,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch
index a63a8d3cb7..a63a8d3cb7 100644
--- a/patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f575aef28..3f575aef28 100644
--- a/patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index bb8021000e..0f038d99ce 100644
--- a/patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0917-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 9c818bb1ea5c9dc8764845d5930d60503fc06f54..e582f9bad4173886905e33861da2493981bc7f4d 100644
+index 027abbde974ff2c4844c3d815230d600140690a4..7fca299a92d330a46336c9fc88156d2ff18f3903 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1125,7 +1125,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0919-Optimize-VarInts.patch b/patches/server/0918-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0919-Optimize-VarInts.patch
+++ b/patches/server/0918-Optimize-VarInts.patch
diff --git a/patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 48e81c5809..48e81c5809 100644
--- a/patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0920-Add-predicate-for-blocks-when-raytracing.patch
index 712ca7a8c8..712ca7a8c8 100644
--- a/patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0920-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch
index c1b5abaf2a..7100c3fc83 100644
--- a/patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 454d4fa966fd83632ae237bc3e94fddc68e9a8ad..c5cc7edd3d100b31a6319b6924de524305adb023 100644
+index 84b7552dfc2077b02e3c4120ad72334cf60212d6..b08a7a3ab30a6e4bf8d4dd90022e446444fafa46 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3714,7 +3714,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0923-Expand-LingeringPotion-API.patch b/patches/server/0922-Expand-LingeringPotion-API.patch
index b203b03355..b203b03355 100644
--- a/patches/server/0923-Expand-LingeringPotion-API.patch
+++ b/patches/server/0922-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 3d51508d96..3d51508d96 100644
--- a/patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch
index 3bc8cd9b24..3bc8cd9b24 100644
--- a/patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0925-Fix-several-issues-with-EntityBreedEvent.patch
index f4709f9402..0db9ed0db3 100644
--- a/patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0925-Fix-several-issues-with-EntityBreedEvent.patch
@@ -119,7 +119,7 @@ index 8cae4e154ca07493aba9acadd4ff7150d7ae4f67..9357cf0179d19fbdfe76413e909a99b9
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 6482cc47b7ecff784344c278ab2db9f99825a169..929fe14541b444e510b48c13aee5d69a8f58194e 100644
+index 724c4c8493a4b167911dd526ed8662ab4f9b2b66..36d654073ab4058db54830d9447d7d959a0b25f1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -184,7 +184,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
diff --git a/patches/server/0927-Add-UUID-attribute-modifier-API.patch b/patches/server/0926-Add-UUID-attribute-modifier-API.patch
index c9666b4f31..d4c5c49b0c 100644
--- a/patches/server/0927-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0926-Add-UUID-attribute-modifier-API.patch
@@ -29,7 +29,7 @@ index 52439f4b959c74027eb191a3af960c70beb978e8..a2c057d92ea34368c7efc538b6e5b15e
      public void addModifier(AttributeModifier modifier) {
          throw new UnsupportedOperationException("Cannot modify default attributes");
 diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
-index c0fb6da6bc3c5b4f37601d898fa421d430417d97..bd0f7dceab1a74dbb7486e126e31152579f987de 100644
+index 7d16545665f74ce619f7b18e568226642c84ceee..c8dffec6e4524a6b02dd068429e4b12f256d1741 100644
 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
 +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
 @@ -44,6 +44,21 @@ public class CraftAttributeInstance implements AttributeInstance {
diff --git a/patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch
index ac77e45fa2..ac77e45fa2 100644
--- a/patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0929-Lazily-create-LootContext-for-criterions.patch b/patches/server/0928-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0929-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0928-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0929-Don-t-fire-sync-events-during-worldgen.patch
index 36aa3de397..dc885d181f 100644
--- a/patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0929-Don-t-fire-sync-events-during-worldgen.patch
@@ -31,7 +31,7 @@ index 2da315d288efa66f7bff96923ebd5eac5130ba39..39cf7ae086108d8077121829368b8160
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bde80f721ea08f3f183d9cd60c944dcf8f798087..7636b0ee46fd3f11ed7a4221dd29e6be8a4e5158 100644
+index de841b91b0a0c10c4b9f4dfdd3858c83f81ad183..9e3fef06ff458d8df327acb9eb740f755e2b34de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -649,7 +649,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -68,7 +68,7 @@ index d769dc472d3f12bf1e30ddd767a76659b734caac..8c7cc9c5af0b8d8bef9b6e2d3d3e723c
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c5cc7edd3d100b31a6319b6924de524305adb023..048e8dcdc56d02a5466085f4842fdd7f8f5f12a8 100644
+index b08a7a3ab30a6e4bf8d4dd90022e446444fafa46..853196418b29bb6013fcf22b3bc873a5b06820b7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1163,6 +1163,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0931-Add-Structure-check-API.patch b/patches/server/0930-Add-Structure-check-API.patch
index b1501eb55b..b1501eb55b 100644
--- a/patches/server/0931-Add-Structure-check-API.patch
+++ b/patches/server/0930-Add-Structure-check-API.patch
diff --git a/patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32337c9ace..32337c9ace 100644
--- a/patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0933-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0932-Restore-vanilla-entity-drops-behavior.patch
index d950d8a3de..860e4ede46 100644
--- a/patches/server/0933-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0932-Restore-vanilla-entity-drops-behavior.patch
@@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e10c8309e184fe2c5c9682aa901ed7a320980431..3a3c17e62244a16cbad5558d55bcf8e330997acb 100644
+index 9179434d490bc8546ba3a35434998b9fc916e6b2..b032ce115b98af0e0384fb88ca88075eb4ffac11 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -969,22 +969,20 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index e10c8309e184fe2c5c9682aa901ed7a320980431..3a3c17e62244a16cbad5558d55bcf8e3
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7636b0ee46fd3f11ed7a4221dd29e6be8a4e5158..b7945199edd3151bd2300fc7a2718a0e5db86e6a 100644
+index 9e3fef06ff458d8df327acb9eb740f755e2b34de..6342b9142ca6c3e17020911f95a81a4be3ca0401 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2523,6 +2523,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -104,7 +104,7 @@ index 7636b0ee46fd3f11ed7a4221dd29e6be8a4e5158..b7945199edd3151bd2300fc7a2718a0e
              return this.spawnAtLocation(entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 048e8dcdc56d02a5466085f4842fdd7f8f5f12a8..9a5b42bce2604d17ed4cf2c8c7eea55557ec3eff 100644
+index 853196418b29bb6013fcf22b3bc873a5b06820b7..ae63033bab20bec39e0562421e7a3f449648a69d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -266,7 +266,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -165,7 +165,7 @@ index 767f076c6fad7a1146bc409bf47f1d2fc3caf3ce..095a678e3ff7b2bd713fe5bc8542b35a
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e100aaccab7e50c6d71b350443e3779472c910eb..313916df9dd87f9835897fc35de50648e180b042 100644
+index 31c35ccbd84fab60fcf30d0d00f1ee38c05e78ca..d94f59e6de51da2c4b261957e8bb21ba90ef9f91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -964,18 +964,24 @@ public class CraftEventFactory {
diff --git a/patches/server/0934-Dont-resend-blocks-on-interactions.patch b/patches/server/0933-Dont-resend-blocks-on-interactions.patch
index 5cca0bf242..5cca0bf242 100644
--- a/patches/server/0934-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0933-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0935-add-more-scoreboard-API.patch b/patches/server/0934-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0935-add-more-scoreboard-API.patch
+++ b/patches/server/0934-add-more-scoreboard-API.patch
diff --git a/patches/server/0936-Improve-Registry.patch b/patches/server/0935-Improve-Registry.patch
index 966048fae0..966048fae0 100644
--- a/patches/server/0936-Improve-Registry.patch
+++ b/patches/server/0935-Improve-Registry.patch
diff --git a/patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 3c24a26423..949aca9655 100644
--- a/patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -52,7 +52,7 @@ index 8fa9282acd87132516329083f774345df3310cf2..edd29c2f4d0151d512618115a8fb4b74
              }
              Location to = event.getTo();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 94b9bb65d14ef58fc00c2de2953b2ce2a9b87b0a..2b149742536af8689562876d97b31bc6367757e7 100644
+index c2005b86ac9ff6aa03ef7937c2b7a228addc4f01..bd6171d75fbf4a0debef3892d6f67356dc811b4d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -415,7 +415,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
diff --git a/patches/server/0938-Add-experience-points-API.patch b/patches/server/0937-Add-experience-points-API.patch
index f0ca6dbcf9..01c02c32f8 100644
--- a/patches/server/0938-Add-experience-points-API.patch
+++ b/patches/server/0937-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 96fc37c871566ec41c42bd0e0f4a147044c239b4..10b62625323e24aa4e9e01e7c0c02d8c49f96a60 100644
+index 83a205387cb902121aabf0f5082c650debcb734c..dad2b84a2220368f2da005e217d73c63bb540a08 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1855,7 +1855,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index 96fc37c871566ec41c42bd0e0f4a147044c239b4..10b62625323e24aa4e9e01e7c0c02d8c
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e582f9bad4173886905e33861da2493981bc7f4d..b60db7df3cef33a4a6a9804104759ecaa3ae330a 100644
+index 7fca299a92d330a46336c9fc88156d2ff18f3903..8016976d226a421b3e16d281fa3c01be2f8d3eb0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0939-Add-drops-to-shear-events.patch b/patches/server/0938-Add-drops-to-shear-events.patch
index 8c729c0f48..5ad1532f94 100644
--- a/patches/server/0939-Add-drops-to-shear-events.patch
+++ b/patches/server/0938-Add-drops-to-shear-events.patch
@@ -275,7 +275,7 @@ index 9c0bfddd479eef688d2509ad700371c3c860ff1a..e9f9b041ae7195e9d23bd446454b1d8c
      public boolean readyForShearing() {
          return !this.isSheared() && this.isAlive();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 313916df9dd87f9835897fc35de50648e180b042..1d526e76eca94cf2dce473cff2b56ea9f7f0ec18 100644
+index d94f59e6de51da2c4b261957e8bb21ba90ef9f91..df82d811e94ee466f2336b8e04bc3441474cc3d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1666,20 +1666,20 @@ public class CraftEventFactory {
@@ -306,7 +306,7 @@ index 313916df9dd87f9835897fc35de50648e180b042..1d526e76eca94cf2dce473cff2b56ea9
  
      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 0790f10122546bff1079b522b08d117426364a95..2ba771efa61e109804f3141e95f77613ac952ed1 100644
+index 819e237a8797ab51b7f888b42a013c5198d8fcf6..f53d6587b2bab3ed8428338950795a62b356c694 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -65,6 +65,16 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0940-Add-PlayerShieldDisableEvent.patch b/patches/server/0939-Add-PlayerShieldDisableEvent.patch
index e4fddcc8e5..5d2b15dfcb 100644
--- a/patches/server/0940-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0939-Add-PlayerShieldDisableEvent.patch
@@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 10b62625323e24aa4e9e01e7c0c02d8c49f96a60..18a83c189e50f68d3aa2982d828c9d6d94c13c1c 100644
+index dad2b84a2220368f2da005e217d73c63bb540a08..ebb70bfa34750227cda55b56764446833d3e1df6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -989,7 +989,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0940-Validate-ResourceLocation-in-NBT-reading.patch
index f1217f22a8..f1217f22a8 100644
--- a/patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0940-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0941-Properly-handle-experience-dropping-on-block-break.patch
index 3ee724786e..3ee724786e 100644
--- a/patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0941-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0943-Fixup-NamespacedKey-handling.patch b/patches/server/0942-Fixup-NamespacedKey-handling.patch
index 138131931b..138131931b 100644
--- a/patches/server/0943-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0942-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0944-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0943-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0944-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0943-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc2cbd7a08..dc2cbd7a08 100644
--- a/patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 7d75e1147a..7d75e1147a 100644
--- a/patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0947-Add-ShulkerDuplicateEvent.patch b/patches/server/0946-Add-ShulkerDuplicateEvent.patch
index 85b28347eb..37ba1cb428 100644
--- a/patches/server/0947-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0946-Add-ShulkerDuplicateEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ShulkerDuplicateEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 2b149742536af8689562876d97b31bc6367757e7..1acf95fd38c09d29411171964dd79172e0bdf221 100644
+index bd6171d75fbf4a0debef3892d6f67356dc811b4d..e03119f88719c8d6d44793a6b3706ae97b2da307 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -491,6 +491,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
diff --git a/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0947-Add-api-for-spawn-egg-texture-colors.patch
index 007f7ada26..007f7ada26 100644
--- a/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0947-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0949-Add-Lifecycle-Event-system.patch b/patches/server/0948-Add-Lifecycle-Event-system.patch
index 61aced9c2d..a1499842cb 100644
--- a/patches/server/0949-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0948-Add-Lifecycle-Event-system.patch
@@ -707,7 +707,7 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67
                  } catch (Throwable e) {
                      LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ffb456ef6386eaaca3df3f36666e41f85210f88c..99a06496935489ff641c4db78e147d29466dc05a 100644
+index 19934047295cb8ad3783bb73a03075916f1508ae..17a50b11da960a24bfea0ec780faf1718ca992d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1013,6 +1013,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0950-ItemStack-Tooltip-API.patch b/patches/server/0949-ItemStack-Tooltip-API.patch
index ddeb751677..ddeb751677 100644
--- a/patches/server/0950-ItemStack-Tooltip-API.patch
+++ b/patches/server/0949-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch
index 70efa7282a..70efa7282a 100644
--- a/patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0952-Add-FluidState-API.patch b/patches/server/0951-Add-FluidState-API.patch
index de7b959ccc..de7b959ccc 100644
--- a/patches/server/0952-Add-FluidState-API.patch
+++ b/patches/server/0951-Add-FluidState-API.patch
diff --git a/patches/server/0953-add-number-format-api.patch b/patches/server/0952-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0953-add-number-format-api.patch
+++ b/patches/server/0952-add-number-format-api.patch
diff --git a/patches/server/0954-improve-BanList-types.patch b/patches/server/0953-improve-BanList-types.patch
index e1f5999a85..e1f5999a85 100644
--- a/patches/server/0954-improve-BanList-types.patch
+++ b/patches/server/0953-improve-BanList-types.patch
diff --git a/patches/server/0955-Expanded-Hopper-API.patch b/patches/server/0954-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0955-Expanded-Hopper-API.patch
+++ b/patches/server/0954-Expanded-Hopper-API.patch
diff --git a/patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0955-Add-BlockBreakProgressUpdateEvent.patch
index a5a136f346..a5a136f346 100644
--- a/patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0955-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0957-Deprecate-ItemStack-setType.patch b/patches/server/0956-Deprecate-ItemStack-setType.patch
index f625bd3cf1..f625bd3cf1 100644
--- a/patches/server/0957-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0956-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0958-Add-CartographyItemEvent.patch b/patches/server/0957-Add-CartographyItemEvent.patch
index c867a928b3..c867a928b3 100644
--- a/patches/server/0958-Add-CartographyItemEvent.patch
+++ b/patches/server/0957-Add-CartographyItemEvent.patch
diff --git a/patches/server/0959-More-Raid-API.patch b/patches/server/0958-More-Raid-API.patch
index 14fcb7449a..14fcb7449a 100644
--- a/patches/server/0959-More-Raid-API.patch
+++ b/patches/server/0958-More-Raid-API.patch
diff --git a/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0959-Add-onboarding-message-for-initial-server-start.patch
index a409b84b72..a409b84b72 100644
--- a/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0959-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0961-Configurable-max-block-fluid-ticks.patch b/patches/server/0960-Configurable-max-block-fluid-ticks.patch
index f5f77d679f..f5f77d679f 100644
--- a/patches/server/0961-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0960-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0962-Fix-bees-aging-inside-hives.patch b/patches/server/0961-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0962-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0961-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0963-Disable-memory-reserve-allocating.patch b/patches/server/0962-Disable-memory-reserve-allocating.patch
index 30eabae9e8..30eabae9e8 100644
--- a/patches/server/0963-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0962-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0964-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0963-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 5c5bb40964..5c5bb40964 100644
--- a/patches/server/0964-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0963-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0965-Fix-DamageSource-API.patch b/patches/server/0964-Fix-DamageSource-API.patch
index f9dc1e0d5d..8e74fed75b 100644
--- a/patches/server/0965-Fix-DamageSource-API.patch
+++ b/patches/server/0964-Fix-DamageSource-API.patch
@@ -197,7 +197,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 1d526e76eca94cf2dce473cff2b56ea9f7f0ec18..e075770772b84a79f2e05f273f31a4aeb479ff98 100644
+index df82d811e94ee466f2336b8e04bc3441474cc3d2..9f1c34ea44d00530713baf9fd40993cc5018e999 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1084,7 +1084,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0965-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 2b1eed9161..2b1eed9161 100644
--- a/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0965-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0967-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0966-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 21910b922f..21910b922f 100644
--- a/patches/server/0967-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0966-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0968-Improve-tag-parser-handling.patch b/patches/server/0967-Improve-tag-parser-handling.patch
index 702d71c5bd..702d71c5bd 100644
--- a/patches/server/0968-Improve-tag-parser-handling.patch
+++ b/patches/server/0967-Improve-tag-parser-handling.patch
diff --git a/patches/server/0969-Item-Mutation-Fixes.patch b/patches/server/0968-Item-Mutation-Fixes.patch
index 1a3a62c7da..1a3a62c7da 100644
--- a/patches/server/0969-Item-Mutation-Fixes.patch
+++ b/patches/server/0968-Item-Mutation-Fixes.patch
diff --git a/patches/server/0970-Per-world-ticks-per-spawn-settings.patch b/patches/server/0969-Per-world-ticks-per-spawn-settings.patch
index ebdf89762d..ebdf89762d 100644
--- a/patches/server/0970-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0969-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0971-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0970-Properly-track-the-changed-item-from-dispense-events.patch
index 9957c97ca3..9957c97ca3 100644
--- a/patches/server/0971-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0970-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0972-Rewrite-dataconverter-system.patch b/patches/server/0971-Rewrite-dataconverter-system.patch
index 8c6cdaf4bf..8c6cdaf4bf 100644
--- a/patches/server/0972-Rewrite-dataconverter-system.patch
+++ b/patches/server/0971-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0973-Suspicious-Effect-Entry-API.patch b/patches/server/0972-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 100644
--- a/patches/server/0973-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0972-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0974-check-if-itemstack-is-stackable-first.patch b/patches/server/0973-check-if-itemstack-is-stackable-first.patch
index 6143642997..6143642997 100644
--- a/patches/server/0974-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0973-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0975-disable-forced-empty-world-ticks.patch b/patches/server/0974-disable-forced-empty-world-ticks.patch
index c6a2989ea0..c6a2989ea0 100644
--- a/patches/server/0975-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0974-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0976-Starlight.patch b/patches/server/0975-Starlight.patch
index 72b56b3d53..c610c62e49 100644
--- a/patches/server/0976-Starlight.patch
+++ b/patches/server/0975-Starlight.patch
@@ -4858,7 +4858,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..6051e5f272838ef23276a90e21c2fc82
      public static <T> TicketType<T> create(String name, Comparator<T> argumentComparator) {
          return new TicketType<>(name, argumentComparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 333a02e08cccf5cb0efa2076582cbd69e95ff0c0..ca4c8e256047a4af45811c3e772b5a959e2ae941 100644
+index 386fbf79afe91af445f54aeab7d1296d1407a4d8..abbd4140cb4478a34a5185d8555f83d96c04d468 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -109,6 +109,27 @@ public class WorldGenRegion implements WorldGenLevel {
diff --git a/patches/server/0977-Rewrite-chunk-system.patch b/patches/server/0976-Rewrite-chunk-system.patch
index d1e7cfff7e..d1e7cfff7e 100644
--- a/patches/server/0977-Rewrite-chunk-system.patch
+++ b/patches/server/0976-Rewrite-chunk-system.patch
diff --git a/patches/server/0978-incremental-chunk-and-player-saving.patch b/patches/server/0977-incremental-chunk-and-player-saving.patch
index c30ee17c0d..2bb349d0d4 100644
--- a/patches/server/0978-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0977-incremental-chunk-and-player-saving.patch
@@ -118,7 +118,7 @@ index 0ccdc8d135dd3edb410fbc1d248c20a4a45b37fa..468fae61d9187ea127a0a6beccbe99d7
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 683d2cc82e1ffce45d533eab0a1ee7c367af62c8..467ef6237e11b9d28f5d7ebf9dc56723d756e5ba 100644
+index e2b72b07888e84fb4472920932b3feedbd4829b9..30bd4ff4e9d4160b547681603127a5aa13a7ebbc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -199,6 +199,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/patches/server/0979-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/server/0979-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0980-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 38bfb4ac90..e5964bbeeb 100644
--- a/patches/server/0980-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -25,7 +25,7 @@ index 468fae61d9187ea127a0a6beccbe99d7c2f36dcd..4934c59f0ac6bd6dea67b716e4db07d2
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 18a83c189e50f68d3aa2982d828c9d6d94c13c1c..093d1388ff90ad59110a37536b6639f939549068 100644
+index ebb70bfa34750227cda55b56764446833d3e1df6..686374e89e41b0917791264f3281f7384835bca8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -789,6 +789,14 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0981-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index e558120a95..77d789e4c0 100644
--- a/patches/server/0981-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 480d7633016ac641d4318f7eb971e0c721c5397a..322de978f5738433e6064f9210893dcfbc701b91 100644
+index 5eda2e858b309d2be704db1015c9c114ed9e63a9..7a6b667e637f3397211b68ccc699a6262cfe8265 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3736,7 +3736,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0982-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/server/0982-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0983-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0982-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/server/0983-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0982-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0984-Fix-World-isChunkGenerated-calls.patch b/patches/server/0983-Fix-World-isChunkGenerated-calls.patch
index 85cc5c81aa..85cc5c81aa 100644
--- a/patches/server/0984-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0983-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0985-Flat-bedrock-generator-settings.patch b/patches/server/0984-Flat-bedrock-generator-settings.patch
index b973a4d233..b973a4d233 100644
--- a/patches/server/0985-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0984-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0986-Entity-Activation-Range-2.0.patch b/patches/server/0985-Entity-Activation-Range-2.0.patch
index 79dc1f9f2b..0c3b97f266 100644
--- a/patches/server/0986-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0985-Entity-Activation-Range-2.0.patch
@@ -111,7 +111,7 @@ index 4934c59f0ac6bd6dea67b716e4db07d295757f46..12245d90ccb4bce09966ab6b3def1e7e
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 920631eaa850f98eea92c9d78b6d94b922490c7c..b8030331085ea0fdb58e525693fc9e31d7b5929c 100644
+index 6324b875472fc2dbc581157306ff255ef1bf5db2..98816b5f759aa72198fb259b4df79a2cd6ee567c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -413,6 +413,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -147,7 +147,7 @@ index 920631eaa850f98eea92c9d78b6d94b922490c7c..b8030331085ea0fdb58e525693fc9e31
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b5fd4feb44e5aca2b37f0e6b3c5317d6caf4b3d4..e89f9c3e887601d8461eb967ae0bf582b672f631 100644
+index d680ad6ce6cfc58753a3754a1bd5113fa9778cdc..9f42563699508fcb3d8a96cfdfc25a7bffd99759 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -237,6 +237,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
diff --git a/patches/server/0987-Optional-per-player-mob-spawns.patch b/patches/server/0986-Optional-per-player-mob-spawns.patch
index b8fd54cd56..ccb51b683d 100644
--- a/patches/server/0987-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0986-Optional-per-player-mob-spawns.patch
@@ -64,7 +64,7 @@ index d1728e13a7b649f308bde90ab633c79d86c10822..002aad174fb1781ee963414037f84e51
  
                  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 467ef6237e11b9d28f5d7ebf9dc56723d756e5ba..7626872528cddd3e3b9a895a77a2ceca50bdb452 100644
+index 30bd4ff4e9d4160b547681603127a5aa13a7ebbc..2a7d050c785e6cba36ec3df3127c2fc3b7932db6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -272,6 +272,10 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0988-Anti-Xray.patch b/patches/server/0987-Anti-Xray.patch
index cc7b53bc1e..cc7b53bc1e 100644
--- a/patches/server/0988-Anti-Xray.patch
+++ b/patches/server/0987-Anti-Xray.patch
diff --git a/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 4415e66df9..4415e66df9 100644
--- a/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0990-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0989-Optimize-Collision-to-not-load-chunks.patch
index e89d90fed5..5b8c5a114c 100644
--- a/patches/server/0990-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0989-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 8f1a2de2a5542929f8a2fdd4d38de141eda985b2..29b35b8c0a6001d626e327a82eaff26d
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b8030331085ea0fdb58e525693fc9e31d7b5929c..5a15319fa9e3660369093c77ac6aedd8d906870f 100644
+index 98816b5f759aa72198fb259b4df79a2cd6ee567c..8619482c85f22fb6d30e847099c59da4d0abaf6d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -244,6 +244,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0991-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/0991-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0992-Entity-load-save-limit-per-chunk.patch b/patches/server/0991-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/server/0992-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0991-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0993-Improved-Watchdog-Support.patch b/patches/server/0992-Improved-Watchdog-Support.patch
index 3fe8cd817b..3fe8cd817b 100644
--- a/patches/server/0993-Improved-Watchdog-Support.patch
+++ b/patches/server/0992-Improved-Watchdog-Support.patch
diff --git a/patches/server/0994-Optimize-Voxel-Shape-Merging.patch b/patches/server/0993-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/0994-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0993-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0995-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0994-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 648e4a4818..648e4a4818 100644
--- a/patches/server/0995-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0994-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0996-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0995-Use-distance-map-to-optimise-entity-tracker.patch
index 5ed0bd172b..ea6fe22d5b 100644
--- a/patches/server/0996-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0995-Use-distance-map-to-optimise-entity-tracker.patch
@@ -236,7 +236,7 @@ index 4621c33ed73b0db64e78e7b9be7013a2ba7393c8..48f7997e8a20f5a5a77516cbde990d0a
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a15319fa9e3660369093c77ac6aedd8d906870f..190a1e24c9b0109f8a881ecc017425fd3428b25e 100644
+index 8619482c85f22fb6d30e847099c59da4d0abaf6d..b0bd8be7f657cf0accd1d7b474298c281c174589 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -59,6 +59,7 @@ import net.minecraft.network.syncher.SyncedDataHolder;
diff --git a/patches/server/0997-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0996-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/server/0997-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0996-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0998-Remove-streams-from-hot-code.patch b/patches/server/0997-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/0998-Remove-streams-from-hot-code.patch
+++ b/patches/server/0997-Remove-streams-from-hot-code.patch
diff --git a/patches/server/0999-Eigencraft-redstone-implementation.patch b/patches/server/0998-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/0999-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0998-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1000-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1000-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1001-Improve-boat-collision-performance.patch b/patches/server/1000-Improve-boat-collision-performance.patch
index 32c6ddbca3..53d19d034f 100644
--- a/patches/server/1001-Improve-boat-collision-performance.patch
+++ b/patches/server/1000-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 2cd0a4dc4f0baa08bd7f5a053303bb63733f0bab..0bd367235f80c1f0d319a6aa5130d82a
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 322de978f5738433e6064f9210893dcfbc701b91..7614b06669485ae565764f3e5e543300ff711b21 100644
+index 7a6b667e637f3397211b68ccc699a6262cfe8265..f2d432eea1641533690502f27349c562c3a691ba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1459,7 +1459,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1002-Optimise-general-POI-access.patch b/patches/server/1001-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/server/1002-Optimise-general-POI-access.patch
+++ b/patches/server/1001-Optimise-general-POI-access.patch
diff --git a/patches/server/1003-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1003-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1004-Execute-chunk-tasks-mid-tick.patch b/patches/server/1003-Execute-chunk-tasks-mid-tick.patch
index 6ee2d94ec9..6ee2d94ec9 100644
--- a/patches/server/1004-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1003-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1005-Optimise-random-block-ticking.patch b/patches/server/1004-Optimise-random-block-ticking.patch
index 36af1b75bf..36af1b75bf 100644
--- a/patches/server/1005-Optimise-random-block-ticking.patch
+++ b/patches/server/1004-Optimise-random-block-ticking.patch
diff --git a/patches/server/1006-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index aac5515348..aac5515348 100644
--- a/patches/server/1006-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1007-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch
index c83372d4cd..c83372d4cd 100644
--- a/patches/server/1007-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1008-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1007-Detail-more-information-in-watchdog-dumps.patch
index fa3f9d12ec..fa3f9d12ec 100644
--- a/patches/server/1008-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1007-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1009-Collision-optimisations.patch b/patches/server/1008-Collision-optimisations.patch
index ed7ccc6b93..2b30993fa1 100644
--- a/patches/server/1009-Collision-optimisations.patch
+++ b/patches/server/1008-Collision-optimisations.patch
@@ -2179,7 +2179,7 @@ index 03c45ee77276462818a6f774b5945b25924aa3f0..ab289a6ca85459e03acb2089c6b9e931
      private Direction(
          final int id,
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95f5fda22759b8fe5ce7e01635fe908cf3d92337..d18aa39b93c1d7d2b6f9e24ba99008d277839d92 100644
+index 54023123e8f46671968f23f05590dd18ed5c2024..09a80b6816e50ea0d733725c59164520136308d6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -523,7 +523,7 @@ public class ServerPlayer extends Player {
@@ -2214,7 +2214,7 @@ index 60ba289e724463129dfb27aa5e3b6daf3dd7386e..68446b7532dfbda303293aa9e756644c
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 638ebf8d902d67fb90058fca4a17bd959426a7df..de655714c471143aa8c830d28c96b4fc17b4b588 100644
+index 8485d30feb6844d9659d6364c576c0b3da5dea8f..533808bb5652d70230062893b80c20b2010370c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1260,9 +1260,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1010-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch
index 7faeede880..7faeede880 100644
--- a/patches/server/1010-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1011-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1010-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/1011-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1010-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
index d24e7d583c..d24e7d583c 100644
--- a/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1013-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1012-Add-Alternate-Current-redstone-implementation.patch
index 2e914661d3..2e914661d3 100644
--- a/patches/server/1013-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1012-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1014-optimize-dirt-and-snow-spreading.patch b/patches/server/1013-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1014-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1013-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1015-Properly-resend-entities.patch b/patches/server/1014-Properly-resend-entities.patch
index 4a99a8b2e4..c0412d12bf 100644
--- a/patches/server/1015-Properly-resend-entities.patch
+++ b/patches/server/1014-Properly-resend-entities.patch
@@ -57,7 +57,7 @@ index 02bf2705ca1c99023a83a22d92e1962181102297..0f99733660f91280e4c6262cf75b3c9c
  
          final EntityDataAccessor<T> accessor;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index abb9a86cd42a34cf722a312068134e820ac21956..f168044d36f22080504da171e5ed31a6f02385ba 100644
+index 56de0da254c8f027fa23afc261be3b5e5ffdde93..c7efde4e2b87b14e768429748b01c1bce659682b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -556,6 +556,7 @@ public class ServerPlayerGameMode {
@@ -115,7 +115,7 @@ index 68446b7532dfbda303293aa9e756644c6fcdffca..a2142930b4d4b05987c90496fb9d733d
          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 de655714c471143aa8c830d28c96b4fc17b4b588..4edf4da2e3ad010ab3d41aa5f66c776e7917cbf2 100644
+index 533808bb5652d70230062893b80c20b2010370c4..4ee843dfd826772c9157ca421d8fe1f36f814b51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -703,13 +703,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -166,7 +166,7 @@ index de655714c471143aa8c830d28c96b4fc17b4b588..4edf4da2e3ad010ab3d41aa5f66c776e
      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 7614b06669485ae565764f3e5e543300ff711b21..8e7ff76818ad26f69785a60de25ad07a3ba72039 100644
+index f2d432eea1641533690502f27349c562c3a691ba..2676beb338f5e4d30c22124eb55cc5aa03807408 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3834,6 +3834,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1016-Optimize-Hoppers.patch b/patches/server/1015-Optimize-Hoppers.patch
index 6117a90b47..6117a90b47 100644
--- a/patches/server/1016-Optimize-Hoppers.patch
+++ b/patches/server/1015-Optimize-Hoppers.patch
diff --git a/patches/server/1017-Improve-performance-of-mass-crafts.patch b/patches/server/1016-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/server/1017-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1016-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1018-Actually-optimise-explosions.patch b/patches/server/1017-Actually-optimise-explosions.patch
index 8885f7e533..8885f7e533 100644
--- a/patches/server/1018-Actually-optimise-explosions.patch
+++ b/patches/server/1017-Actually-optimise-explosions.patch
diff --git a/patches/server/1019-Optimise-chunk-tick-iteration.patch b/patches/server/1018-Optimise-chunk-tick-iteration.patch
index 4b4ea50dfe..6b17ae655d 100644
--- a/patches/server/1019-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1018-Optimise-chunk-tick-iteration.patch
@@ -365,7 +365,7 @@ index 7fbeebe63f755624b967374072aa2e0565ce8c35..36caf354634d6675a3f1ec6829f4778e
              gameprofilerfiller.pop();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d18aa39b93c1d7d2b6f9e24ba99008d277839d92..c10401e587a710d49c4af481c1e531b4bf51f755 100644
+index 09a80b6816e50ea0d733725c59164520136308d6..6a4637eef14cbd84bbe26ef16f004b8f93367a3d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -342,6 +342,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1020-Lag-compensation-ticks.patch b/patches/server/1019-Lag-compensation-ticks.patch
index 7ea2698089..ecde97f058 100644
--- a/patches/server/1020-Lag-compensation-ticks.patch
+++ b/patches/server/1019-Lag-compensation-ticks.patch
@@ -50,7 +50,7 @@ index 05bf2094d10f924401eb122cd3fe4540aafce497..d4376ed215d97066a21e462fae2a0e25
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f168044d36f22080504da171e5ed31a6f02385ba..5cedce1f432f6b809b25269242a16477682c824f 100644
+index c7efde4e2b87b14e768429748b01c1bce659682b..1047027610624c9ba4bb5afd5d7f0714a062b198 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -127,7 +127,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/1021-Optimise-nearby-player-retrieval.patch b/patches/server/1020-Optimise-nearby-player-retrieval.patch
index eae5d781cc..eae5d781cc 100644
--- a/patches/server/1021-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1020-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1022-Distance-manager-tick-timings.patch b/patches/server/1021-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1022-Distance-manager-tick-timings.patch
+++ b/patches/server/1021-Distance-manager-tick-timings.patch
diff --git a/patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1022-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1022-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1025-API-for-checking-sent-chunks.patch b/patches/server/1024-API-for-checking-sent-chunks.patch
index 01ec0b2993..01ec0b2993 100644
--- a/patches/server/1025-API-for-checking-sent-chunks.patch
+++ b/patches/server/1024-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1026-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1025-Add-config-for-mobs-immune-to-default-effects.patch
index 7bf145751f..7bf145751f 100644
--- a/patches/server/1026-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/1025-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1027-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1026-Deep-clone-nbt-tags-in-PDC.patch
index 96cc14f9db..96cc14f9db 100644
--- a/patches/server/1027-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/1026-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/1028-Support-old-UUID-format-for-NBT.patch b/patches/server/1027-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/1028-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/1027-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/1029-Fix-shield-disable-inconsistency.patch b/patches/server/1028-Fix-shield-disable-inconsistency.patch
index bcc617a146..d769ff49ce 100644
--- a/patches/server/1029-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/1028-Fix-shield-disable-inconsistency.patch
@@ -8,7 +8,7 @@ it will not disable the shield if the attacker is holding
 an axe item.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6a7642697c08bcdc69b4f1d4475f0532e131b80..a1a72712e9acd4023c4b6832e5ec09dcc3676b6e 100644
+index 62a38a21f7a949ca20b4975a603e163483fe6757..0580d34ee23bba9709fd8dac78582f4f1cf0a71c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2341,7 +2341,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1030-Write-SavedData-IO-async.patch b/patches/server/1029-Write-SavedData-IO-async.patch
index 66e24700a5..66e24700a5 100644
--- a/patches/server/1030-Write-SavedData-IO-async.patch
+++ b/patches/server/1029-Write-SavedData-IO-async.patch
diff --git a/patches/server/1031-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch
index d64eaac093..d64eaac093 100644
--- a/patches/server/1031-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/1032-Add-experimental-improved-give-command.patch b/patches/server/1031-Add-experimental-improved-give-command.patch
index fd226dcb27..fd226dcb27 100644
--- a/patches/server/1032-Add-experimental-improved-give-command.patch
+++ b/patches/server/1031-Add-experimental-improved-give-command.patch
diff --git a/patches/server/1033-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1032-Handle-Large-Packets-disconnecting-client.patch
index 49f2553189..49f2553189 100644
--- a/patches/server/1033-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/1032-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/1034-Fix-ItemFlags.patch b/patches/server/1033-Fix-ItemFlags.patch
index df5328f3a8..df5328f3a8 100644
--- a/patches/server/1034-Fix-ItemFlags.patch
+++ b/patches/server/1033-Fix-ItemFlags.patch
diff --git a/patches/server/1035-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch
index af975bb004..aaade14d1f 100644
--- a/patches/server/1035-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch
@@ -7,7 +7,7 @@ Affect the falling stalactite damage type where the
 reduction is not applied like in Vanilla
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e075770772b84a79f2e05f273f31a4aeb479ff98..34b91eff3190848bae38b20e1d956ece497b1473 100644
+index 9f1c34ea44d00530713baf9fd40993cc5018e999..0cc8e7aa1b1bf29765709c883d11ec8601423737 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1212,7 +1212,7 @@ public class CraftEventFactory {
diff --git a/patches/server/1036-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 84ae9df20b..bb1077fa6c 100644
--- a/patches/server/1036-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a1a72712e9acd4023c4b6832e5ec09dcc3676b6e..ef0f118aecf0893e45cb9423a677d7e42496324b 100644
+index 0580d34ee23bba9709fd8dac78582f4f1cf0a71c..b68ef1439e72c61828bb15fe82da11c9057bdb30 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2226,7 +2226,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1037-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/1036-improve-checking-handled-tags-in-itemmeta.patch
index 1bf22549e6..432f4e4dab 100644
--- a/patches/server/1037-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/1036-improve-checking-handled-tags-in-itemmeta.patch
@@ -194,7 +194,7 @@ index 13b91cddffbe8ae6f07ce5c0ae45beba151e1aca..569f7157a625b981bff43650e9dd0a8c
          getOrEmpty(tag, CraftMetaArmor.TRIM).ifPresent((trimCompound) -> {
              TrimMaterial trimMaterial = org.bukkit.craftbukkit.CraftRegistry.unwrapAndConvertHolder(io.papermc.paper.registry.RegistryKey.TRIM_MATERIAL, trimCompound.material()).orElse(null); // Paper - fix upstream not being correct
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index 84e09a934600df116206df1c3922a11ee969901a..04ca71d03eea61b0e7e62f2beb954b505a717f24 100644
+index 59bdac414e8205ed608f79ef0d1502acd826d216..53df7e876c9f3e67aa2326fa1a5ce5e90ab7efd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -47,8 +47,8 @@ public class CraftMetaArmorStand extends CraftMetaItem implements com.destroysto
diff --git a/patches/server/1038-General-ItemMeta-fixes.patch b/patches/server/1037-General-ItemMeta-fixes.patch
index 052b5dc3ba..052b5dc3ba 100644
--- a/patches/server/1038-General-ItemMeta-fixes.patch
+++ b/patches/server/1037-General-ItemMeta-fixes.patch
diff --git a/patches/server/1039-Expose-hasColor-to-leather-armor.patch b/patches/server/1038-Expose-hasColor-to-leather-armor.patch
index fdec76346c..0cdf66fe04 100644
--- a/patches/server/1039-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/1038-Expose-hasColor-to-leather-armor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose #hasColor to leather armor
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaColorableArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaColorableArmor.java
-index 3109df67e42838f3e69681326efb1caf237548a5..62965625b187da28e2cead1d94bae2509c5943c3 100644
+index 4e423c4790d7b03c283c9a5fa94bce4a1153445e..1e8a76f6dd54931eec261653a7bd51b6d18d3c68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaColorableArmor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaColorableArmor.java
 @@ -134,4 +134,11 @@ public class CraftMetaColorableArmor extends CraftMetaArmor implements Colorable
@@ -21,7 +21,7 @@ index 3109df67e42838f3e69681326efb1caf237548a5..62965625b187da28e2cead1d94bae250
 +    // Paper end - Expose #hasColor to leather armor
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
-index cdbf91f1fce21a84b74412a985a8c7c93626768d..f48e4086af9cef0166e2a5108292c8a3d3833390 100644
+index 70c0d4cc85c045d040a35cd406f3f7ce9b6a58fa..0860d85fb9c6d0567f678569efb3c560f58612a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
 @@ -183,4 +183,11 @@ class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta {
diff --git a/patches/server/1040-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/1039-Added-API-to-get-player-ha-proxy-address.patch
index a9b47406aa..a9b47406aa 100644
--- a/patches/server/1040-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/1039-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/1041-More-Chest-Block-API.patch b/patches/server/1040-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/1041-More-Chest-Block-API.patch
+++ b/patches/server/1040-More-Chest-Block-API.patch
diff --git a/patches/server/1042-Print-data-component-type-on-encoding-error.patch b/patches/server/1041-Print-data-component-type-on-encoding-error.patch
index 78cb82fa00..78cb82fa00 100644
--- a/patches/server/1042-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/1041-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/1043-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch
index a39b2bf46f..a39b2bf46f 100644
--- a/patches/server/1043-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1044-Brigadier-based-command-API.patch b/patches/server/1043-Brigadier-based-command-API.patch
index 2dd9a7550d..2dd9a7550d 100644
--- a/patches/server/1044-Brigadier-based-command-API.patch
+++ b/patches/server/1043-Brigadier-based-command-API.patch
diff --git a/patches/server/1045-Fix-issues-with-Recipe-API.patch b/patches/server/1044-Fix-issues-with-Recipe-API.patch
index a5312e5dc7..a5312e5dc7 100644
--- a/patches/server/1045-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/1044-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/1046-Fix-equipment-slot-and-group-API.patch b/patches/server/1045-Fix-equipment-slot-and-group-API.patch
index 8bfd78d2c2..8bfd78d2c2 100644
--- a/patches/server/1046-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/1045-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/1047-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 980c3dc8a0..980c3dc8a0 100644
--- a/patches/server/1047-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/1048-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch
index a395e17562..67f4c24e87 100644
--- a/patches/server/1048-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -214,7 +214,7 @@ index b9b3277c8ed94e0cd30b20b9c00a33eaad48e5ac..c450447585af4c8cdc87abe871c229ff
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ef0f118aecf0893e45cb9423a677d7e42496324b..2c2aefa1d57a939c3ac6c3d6f3a22de848cabf14 100644
+index b68ef1439e72c61828bb15fe82da11c9057bdb30..0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3318,7 +3318,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch
index f1cbb0fcf3..f1cbb0fcf3 100644
--- a/patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/1050-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 96084e7275..96084e7275 100644
--- a/patches/server/1050-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch