Updated Upstream (Bukkit/CraftBukkit) (#8430)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events

CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY

979 files changed, 321 insertions, 588 deletions

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index edcb5d8355..11e12cc29e 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..16776e693165758e47152eb6726969426f180f14
+index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d458795755649837d7fc
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,81 @@
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
 +    api("com.google.guava:guava:31.0.1-jre")
 +    api("com.google.code.gson:gson:2.8.9")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
-+    api("org.yaml:snakeyaml:1.32")
++    api("org.yaml:snakeyaml:1.33")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
 +    options.isDocFilesSubDirs = true
 +    options.links(
 +        "https://guava.dev/releases/31.0.1-jre/api/docs/",
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
++        "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +    )
@@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 9909fc466d96023f0b574a9bd2a2330d433d4400..0000000000000000000000000000000000000000
+index becaae6cc840ee2ac49853e41d86087bc0e893a8..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,252 +0,0 @@
@@ -175,7 +175,7 @@ index 9909fc466d96023f0b574a9bd2a2330d433d4400..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
--            <version>1.32</version>
+-            <version>1.33</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index a4a8bdd664..fd42c769ba 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a4394123ad22dba 100644
+index e1e7c0ff7edcc5865e81d458795755649837d7fc..fc6cd4fcab1b7430cb3d5c66e386bf4ea6e8f599 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,15 +14,27 @@ dependencies {
      api("com.google.code.gson:gson:2.8.9")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
-     api("org.yaml:snakeyaml:1.32")
+     api("org.yaml:snakeyaml:1.33")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
@@ -40,7 +40,7 @@ index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a439412
 @@ -64,7 +76,7 @@ tasks.withType<Javadoc> {
      options.links(
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
          "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 210a9cbf33..cfac50b517 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd56f543b6 100644
+index f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9741344fc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,17 +8,37 @@ java {
@@ -33,7 +33,7 @@ index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd
      api("com.google.code.gson:gson:2.8.9")
 -    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
-     api("org.yaml:snakeyaml:1.32")
+     api("org.yaml:snakeyaml:1.33")
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
@@ -51,7 +51,7 @@ index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 @@ -78,9 +98,24 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
          "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
 -        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +        // Paper start
@@ -1805,7 +1805,7 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 259d878ddd4e4e2b289c0de0325ca8fd6203c484..a829779ac56a271cad463806984991b4713a27be 100644
+index 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b453b779473 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0030-Custom-replacement-for-eaten-items.patch b/patches/api/0030-Custom-replacement-for-eaten-items.patch
index 94ff9d88e2..f7a9207fb3 100644
--- a/patches/api/0030-Custom-replacement-for-eaten-items.patch
+++ b/patches/api/0030-Custom-replacement-for-eaten-items.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index c2793f3ef01c1246c130971c17e1c2bf8f551435..373f4b5b5185aa81ff728da89c9cc4e0ccf87889 100644
+index 5c054eb531e3caf17c179aff6a712fb8c33d8f77..6110d0417340710333b44312d82c7bd5165a8954 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-@@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
-     private static final HandlerList handlers = new HandlerList();
+@@ -24,6 +24,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
      private boolean isCancelled = false;
      private ItemStack item;
+     private final EquipmentSlot hand;
 +    @Nullable private ItemStack replacement; // Paper
  
      /**
       * @param player the player consuming
-@@ -58,6 +59,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
-         }
+@@ -82,6 +83,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
+         return hand;
      }
  
 +    // Paper start
diff --git a/patches/api/0135-Add-TNTPrimeEvent.patch b/patches/api/0134-Add-TNTPrimeEvent.patch
index 2bddc56f13..2bddc56f13 100644
--- a/patches/api/0135-Add-TNTPrimeEvent.patch
+++ b/patches/api/0134-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0134-Add-hand-to-bucket-events.patch b/patches/api/0134-Add-hand-to-bucket-events.patch
deleted file mode 100644
index 85c5c370f3..0000000000
--- a/patches/api/0134-Add-hand-to-bucket-events.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <[email protected]>
-Date: Thu, 2 Aug 2018 08:44:20 -0500
-Subject: [PATCH] Add hand to bucket events
-
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-index 7f225baa9fd3ff6f4f950ae70f9500141c674f66..25bd8153ef2ab7ab1052cf756bb599f1095732e7 100644
---- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-@@ -5,6 +5,7 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- 
-@@ -22,6 +23,16 @@ public class PlayerBucketEmptyEvent extends PlayerBucketEvent {
-     public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-         super(who, block, blockClicked, blockFace, bucket, itemInHand);
-     }
-+    // Paper start - add EquipmentSlot
-+    @Deprecated
-+    public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, block, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+    // Paper end
- 
-     @NotNull
-     @Override
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index 0e4fa04ea73baaf2f9ad86725d379b569d7d6381..1e0f7ee7d198c08ce421ce105be42c4d01dc924f 100644
---- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-@@ -5,6 +5,7 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.Cancellable;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-@@ -19,6 +20,7 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-     private final Block blockClicked;
-     private final BlockFace blockFace;
-     private final Material bucket;
-+    private final EquipmentSlot hand; // Paper - add EquipmentSlot
- 
-     @Deprecated
-     public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-@@ -26,12 +28,24 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-     }
- 
-     public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-+        // Paper start - add EquipmentSlot
-+        this(who, block, blockClicked, blockFace, bucket, itemInHand, null);
-+    }
-+
-+    @Deprecated
-+    public PlayerBucketEvent(@NotNull final Player who,@NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable  final EquipmentSlot hand) {
-+        this(who, null, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable  final EquipmentSlot hand) {
-+        // Paper end
-         super(who);
-         this.block = block;
-         this.blockClicked = blockClicked;
-         this.blockFace = blockFace;
-         this.itemStack = itemInHand;
-         this.bucket = bucket;
-+        this.hand = hand == null ? player.getInventory().getItemInMainHand().equals(itemInHand) ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND : hand; // Paper - add EquipmentSlot
-     }
- 
-     /**
-@@ -93,6 +107,18 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-         return blockFace;
-     }
- 
-+    // Paper start
-+    /**
-+     * The hand used to perform this action.
-+     *
-+     * @return the hand used
-+     */
-+    @NotNull
-+    public EquipmentSlot getHand() {
-+        return hand;
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean isCancelled() {
-         return cancelled;
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-index 77c3a6e5c89ffde564d63b98b2d9e36c356d79fd..56f1cc2d773d2c58207ee291bac596692980a731 100644
---- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-@@ -5,6 +5,7 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- 
-@@ -23,6 +24,18 @@ public class PlayerBucketFillEvent extends PlayerBucketEvent {
-         super(who, block, blockClicked, blockFace, bucket, itemInHand);
-     }
- 
-+    // Paper start - add EquipmentSlot
-+    @Deprecated
-+    public PlayerBucketFillEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    // Paper start - add EquipmentSlot
-+    public PlayerBucketFillEvent(@NotNull final Player who, @NotNull Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, block, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+    // Paper end
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
diff --git a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 493bf262e6..401c96f1fa 100644
--- a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0dfde46c3 100644
+index 15478355e0a4f7d247f1a051cbbf841c98a7688b..e596e5d372dba6ee1e44486659332b5a747e96d5 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder {
@@ -44,7 +44,7 @@ index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f46032ac8d48ba172e6a9157dd6b477ddf2cd4cb..cbfd9f994e545aa36c62f9cf801a595d3db71e9f 100644
+index c58c9c7791eff28ba8f847f5bc60e0db757ababd..8c71be9c39ec6aae07b088a63e71cc2ae44b0412 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -212,6 +212,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 55575b0642..5f7cd8a636 100644
--- a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 1a4b6922c0a881b60ddf305b1e2b3af0dfde46c3..049c36807d2a970842442c1b7517c06f3f150041 100644
+index e596e5d372dba6ee1e44486659332b5a747e96d5..e1e1bc868019f715370490719ef887e0eee3ddec 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -1,6 +1,8 @@
diff --git a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index 536fdc2d06..536fdc2d06 100644
--- a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index e23878d106..5a8996d135 100644
--- a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -50,7 +50,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fc
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index cbfd9f994e545aa36c62f9cf801a595d3db71e9f..89e46828639b85da1f70f03bfd2a8e9c8487033f 100644
+index 8c71be9c39ec6aae07b088a63e71cc2ae44b0412..25e38f0f4fe36193dcc968ef7619bc8c0e705fb2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -95,6 +95,40 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/api/0139-Slime-Pathfinder-Events.patch
index 953bdc27eb..953bdc27eb 100644
--- a/patches/api/0140-Slime-Pathfinder-Events.patch
+++ b/patches/api/0139-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/api/0140-Add-PhantomPreSpawnEvent.patch
index 5ffdc818cb..5ffdc818cb 100644
--- a/patches/api/0141-Add-PhantomPreSpawnEvent.patch
+++ b/patches/api/0140-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/api/0141-Add-More-Creeper-API.patch
index 9054588ca5..9054588ca5 100644
--- a/patches/api/0142-Add-More-Creeper-API.patch
+++ b/patches/api/0141-Add-More-Creeper-API.patch
diff --git a/patches/api/0143-Inventory-removeItemAnySlot.patch b/patches/api/0142-Inventory-removeItemAnySlot.patch
index 25b79cf6bd..25b79cf6bd 100644
--- a/patches/api/0143-Inventory-removeItemAnySlot.patch
+++ b/patches/api/0142-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0144-isChunkGenerated-API.patch b/patches/api/0143-isChunkGenerated-API.patch
index 1899b4e2d2..222f76220e 100644
--- a/patches/api/0144-isChunkGenerated-API.patch
+++ b/patches/api/0143-isChunkGenerated-API.patch
@@ -34,7 +34,7 @@ index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 89e46828639b85da1f70f03bfd2a8e9c8487033f..324fca7bf480a463adb30842fa169052534f5252 100644
+index 25e38f0f4fe36193dcc968ef7619bc8c0e705fb2..44b758d70b96a0ba857e1090af91893313945096 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -260,6 +260,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch
index 9f9e760855..9f9e760855 100644
--- a/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch
+++ b/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/api/0145-Async-Chunks-API.patch
index 67dcb55f9c..f42bce4b89 100644
--- a/patches/api/0146-Async-Chunks-API.patch
+++ b/patches/api/0145-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 324fca7bf480a463adb30842fa169052534f5252..3e3682be2a1afe92ccdc9a1d97469a69f952a9ed 100644
+index 44b758d70b96a0ba857e1090af91893313945096..d7f0117a8776a5bd0c6ec6c05d2c56c3b8e08de8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -969,6 +969,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -495,7 +495,7 @@ index 324fca7bf480a463adb30842fa169052534f5252..3e3682be2a1afe92ccdc9a1d97469a69
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c6f14159067a14afd44378aaa9ac840aba2e2f9c..8751ba50a0e5d00839885ad5a905eb727445b749 100644
+index 7c867a54e18798d782971a68548eac541e9f50c0..fb3187692878e9686d54c8d022035eba2cea6f25 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -164,6 +164,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch
index 88b6298ac2..88b6298ac2 100644
--- a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch
index c7c1cb413e..c7c1cb413e 100644
--- a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0149-Improve-death-events.patch b/patches/api/0148-Improve-death-events.patch
index 7cad311ede..7cad311ede 100644
--- a/patches/api/0149-Improve-death-events.patch
+++ b/patches/api/0148-Improve-death-events.patch
diff --git a/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0149-Add-Git-information-to-version-command-on-startup.patch
index 533ac1f870..533ac1f870 100644
--- a/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0149-Add-Git-information-to-version-command-on-startup.patch
diff --git a/patches/api/0151-Mob-Pathfinding-API.patch b/patches/api/0150-Mob-Pathfinding-API.patch
index 8c3f3a59d2..ebd31df062 100644
--- a/patches/api/0151-Mob-Pathfinding-API.patch
+++ b/patches/api/0150-Mob-Pathfinding-API.patch
@@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..43f062257472a06e9e64c2feef6c3b10
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 00266bf81b022a0f4b4f71061b82a8713b773320..dcaddf4a1e3d954565f2110224be8e7d5c597a0a 100644
+index 4f63988848443aff55619bc12ef12c925642a3f9..6de4344931b2e3d570346b800186c44a0d5782cc 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
diff --git a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 56ad8fa03c..0e894e6763 100644
--- a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,7 +226,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index a19635c38705e6221ae25d58e976e483e7ed17e4..71c7780424a986a95852b1ca15116096896500df 100644
+index 64114b1a9e201df369fc794fbee984d496385420..35009498aafd1bd36c493085127135fc8a5c36ec 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
index 6befcec378..6befcec378 100644
--- a/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
index 1a4eca8cc0..1a4eca8cc0 100644
--- a/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
index 709ba414da..709ba414da 100644
--- a/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0156-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch
index 9f13508f04..9f13508f04 100644
--- a/patches/api/0156-Material-API-additions.patch
+++ b/patches/api/0155-Material-API-additions.patch
diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch
index 20ac53dcf4..8b13eaa41e 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/api/0156-Add-Material-Tags.patch
@@ -1073,7 +1073,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 7e3c8812247f86313c49c1a0d9af557abd30d029..33f022a01e44e6b806e6d38eef003da161b6be53 100644
+index 6f6e359dfdba27f6550719479a2256a2b159d39e..60e98f0eb8028fc9dfb73320b2939a33435174c1 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0158-PreSpawnerSpawnEvent.patch b/patches/api/0157-PreSpawnerSpawnEvent.patch
index dcb362d8bc..dcb362d8bc 100644
--- a/patches/api/0158-PreSpawnerSpawnEvent.patch
+++ b/patches/api/0157-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
index bdd4575033..bdd4575033 100644
--- a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0160-Add-sun-related-API.patch b/patches/api/0159-Add-sun-related-API.patch
index ce6031e8d0..714a4b24ea 100644
--- a/patches/api/0160-Add-sun-related-API.patch
+++ b/patches/api/0159-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3e3682be2a1afe92ccdc9a1d97469a69f952a9ed..8f7536e5ef73328cb69f7214956aac582a7d6f24 100644
+index d7f0117a8776a5bd0c6ec6c05d2c56c3b8e08de8..24a14005cb9c2fe7e97ba0fbd948c0c1110c52ce 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1796,6 +1796,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -26,7 +26,7 @@ index 3e3682be2a1afe92ccdc9a1d97469a69f952a9ed..8f7536e5ef73328cb69f7214956aac58
       * Gets the full in-game time on this world since the world generation
       *
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index dcaddf4a1e3d954565f2110224be8e7d5c597a0a..4a7ffd617c2a660a4d2e9d10f54add2391f832b9 100644
+index 6de4344931b2e3d570346b800186c44a0d5782cc..7eee2e561346ac1d672f9652edb78e76c910fc9d 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -20,6 +20,13 @@ public interface Mob extends LivingEntity, Lootable {
diff --git a/patches/api/0161-Turtle-API.patch b/patches/api/0160-Turtle-API.patch
index a8eec937cc..a8eec937cc 100644
--- a/patches/api/0161-Turtle-API.patch
+++ b/patches/api/0160-Turtle-API.patch
diff --git a/patches/api/0162-Add-spectator-target-events.patch b/patches/api/0161-Add-spectator-target-events.patch
index c5d4b7c4db..c5d4b7c4db 100644
--- a/patches/api/0162-Add-spectator-target-events.patch
+++ b/patches/api/0161-Add-spectator-target-events.patch
diff --git a/patches/api/0163-Add-more-Witch-API.patch b/patches/api/0162-Add-more-Witch-API.patch
index 0da75bb9b7..0da75bb9b7 100644
--- a/patches/api/0163-Add-more-Witch-API.patch
+++ b/patches/api/0162-Add-more-Witch-API.patch
diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch
index 780b707eab..780b707eab 100644
--- a/patches/api/0164-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0163-Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 6eec419672..6eec419672 100644
--- a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0166-Add-more-Zombie-API.patch b/patches/api/0165-Add-more-Zombie-API.patch
index 7f559eef52..7f559eef52 100644
--- a/patches/api/0166-Add-more-Zombie-API.patch
+++ b/patches/api/0165-Add-more-Zombie-API.patch
diff --git a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
index fa3de62864..fa3de62864 100644
--- a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
index f1a017f4fb..f1a017f4fb 100644
--- a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 99524ae7c9..ad97b59cd4 100644
--- a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 9d774a10b9543e9293cb10ee9d7c9adebbfef34c..23e853bae0e051cd43deb9eb24c54e74a56d8ab0 100644
+index 93f86bb30725dff5dbfcccf15012ffd1cee237bf..a7d1f1e701f23e851f735584a30bedadb0d8b9bd 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -160,7 +160,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
diff --git a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
index cba58643e4..cba58643e4 100644
--- a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0171-BlockDestroyEvent.patch b/patches/api/0170-BlockDestroyEvent.patch
index c414a42532..c414a42532 100644
--- a/patches/api/0171-BlockDestroyEvent.patch
+++ b/patches/api/0170-BlockDestroyEvent.patch
diff --git a/patches/api/0172-Add-WhitelistToggleEvent.patch b/patches/api/0171-Add-WhitelistToggleEvent.patch
index 4bb54b5c92..4bb54b5c92 100644
--- a/patches/api/0172-Add-WhitelistToggleEvent.patch
+++ b/patches/api/0171-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0173-Add-GS4-Query-event.patch b/patches/api/0172-Add-GS4-Query-event.patch
index ffab49a92a..ffab49a92a 100644
--- a/patches/api/0173-Add-GS4-Query-event.patch
+++ b/patches/api/0172-Add-GS4-Query-event.patch
diff --git a/patches/api/0174-Add-PlayerPostRespawnEvent.patch b/patches/api/0173-Add-PlayerPostRespawnEvent.patch
index 004d74e96d..004d74e96d 100644
--- a/patches/api/0174-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0173-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0175-Entity-getEntitySpawnReason.patch b/patches/api/0174-Entity-getEntitySpawnReason.patch
index ca09ffacbc..ef8d83b271 100644
--- a/patches/api/0175-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0174-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8751ba50a0e5d00839885ad5a905eb727445b749..f17f30a9969e52313387c0d92edd980f72687a11 100644
+index fb3187692878e9686d54c8d022035eba2cea6f25..383844bf956e70cc8a821913d5b2560226d8e2fc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -754,5 +754,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
index cab4daf9d2..cab4daf9d2 100644
--- a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/api/0177-Server-Tick-Events.patch b/patches/api/0176-Server-Tick-Events.patch
index 9cb8b9a4c0..9cb8b9a4c0 100644
--- a/patches/api/0177-Server-Tick-Events.patch
+++ b/patches/api/0176-Server-Tick-Events.patch
diff --git a/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch
index 871984a4fc..871984a4fc 100644
--- a/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0179-Add-Heightmap-API.patch b/patches/api/0178-Add-Heightmap-API.patch
index d2e3bd0011..c891f6d3f2 100644
--- a/patches/api/0179-Add-Heightmap-API.patch
+++ b/patches/api/0178-Add-Heightmap-API.patch
@@ -103,7 +103,7 @@ index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7358c9148853d4b5b35998094838156231497747..352a20da402b3b0182b7a0c69d94397f42054053 100644
+index 891b25c84f6cc86ac3ccf61eca1d4398f31ba6b5..79b1015c56aab88ee8bf70cef0a2ab05c910d991 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -167,6 +167,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0180-Mob-Spawner-API-Enhancements.patch b/patches/api/0179-Mob-Spawner-API-Enhancements.patch
index 2bbe92cbe9..2bbe92cbe9 100644
--- a/patches/api/0180-Mob-Spawner-API-Enhancements.patch
+++ b/patches/api/0179-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0181-Add-BlockSoundGroup-interface.patch b/patches/api/0180-Add-BlockSoundGroup-interface.patch
index 1d34e11a3b..1d34e11a3b 100644
--- a/patches/api/0181-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0180-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0183-Increase-custom-payload-channel-message-size.patch b/patches/api/0182-Increase-custom-payload-channel-message-size.patch
index 24aacd2b29..24aacd2b29 100644
--- a/patches/api/0183-Increase-custom-payload-channel-message-size.patch
+++ b/patches/api/0182-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0184-Expose-the-internal-current-tick.patch b/patches/api/0183-Expose-the-internal-current-tick.patch
index c8ae43d595..c8ae43d595 100644
--- a/patches/api/0184-Expose-the-internal-current-tick.patch
+++ b/patches/api/0183-Expose-the-internal-current-tick.patch
diff --git a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch
index 0561046520..0561046520 100644
--- a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0186-Add-effect-to-block-break-naturally.patch b/patches/api/0185-Add-effect-to-block-break-naturally.patch
index 81c136c000..81c136c000 100644
--- a/patches/api/0186-Add-effect-to-block-break-naturally.patch
+++ b/patches/api/0185-Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/0187-Add-ThrownEggHatchEvent.patch b/patches/api/0186-Add-ThrownEggHatchEvent.patch
index f605a2a11b..f605a2a11b 100644
--- a/patches/api/0187-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0186-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0188-Entity-Jump-API.patch b/patches/api/0187-Entity-Jump-API.patch
index 8c2aa6bf87..8c2aa6bf87 100644
--- a/patches/api/0188-Entity-Jump-API.patch
+++ b/patches/api/0187-Entity-Jump-API.patch
diff --git a/patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch
index f15b482d62..f15b482d62 100644
--- a/patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0190-Add-tick-times-API.patch b/patches/api/0189-Add-tick-times-API.patch
index 3f4f81a1a3..3f4f81a1a3 100644
--- a/patches/api/0190-Add-tick-times-API.patch
+++ b/patches/api/0189-Add-tick-times-API.patch
diff --git a/patches/api/0191-Expose-MinecraftServer-isRunning.patch b/patches/api/0190-Expose-MinecraftServer-isRunning.patch
index 7a9f4ee7d6..7a9f4ee7d6 100644
--- a/patches/api/0191-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0190-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
index ffc54997ee..ffc54997ee 100644
--- a/patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
index 0ce11aba90..0ce11aba90 100644
--- a/patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
+++ b/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/0194-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch
index 9afcec1657..9afcec1657 100644
--- a/patches/api/0194-Make-JavaPluginLoader-thread-safe.patch
+++ b/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/0195-Add-Player-Client-Options-API.patch b/patches/api/0194-Add-Player-Client-Options-API.patch
index 86a6b786c0..86a6b786c0 100644
--- a/patches/api/0195-Add-Player-Client-Options-API.patch
+++ b/patches/api/0194-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
index 15fa2db392..15fa2db392 100644
--- a/patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
index 2fa02a7788..2fa02a7788 100644
--- a/patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0198-Add-item-slot-convenience-methods.patch b/patches/api/0197-Add-item-slot-convenience-methods.patch
index abad4883ed..abad4883ed 100644
--- a/patches/api/0198-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0197-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0199-Villager-Restocks-API.patch b/patches/api/0198-Villager-Restocks-API.patch
index b456e877c6..b456e877c6 100644
--- a/patches/api/0199-Villager-Restocks-API.patch
+++ b/patches/api/0198-Villager-Restocks-API.patch
diff --git a/patches/api/0200-Expose-game-version.patch b/patches/api/0199-Expose-game-version.patch
index be7aec4713..be7aec4713 100644
--- a/patches/api/0200-Expose-game-version.patch
+++ b/patches/api/0199-Expose-game-version.patch
diff --git a/patches/api/0201-Add-Mob-Goal-API.patch b/patches/api/0200-Add-Mob-Goal-API.patch
index d4f8ce75de..d4f8ce75de 100644
--- a/patches/api/0201-Add-Mob-Goal-API.patch
+++ b/patches/api/0200-Add-Mob-Goal-API.patch
diff --git a/patches/api/0202-Add-villager-reputation-API.patch b/patches/api/0201-Add-villager-reputation-API.patch
index 14c6a88c1c..14c6a88c1c 100644
--- a/patches/api/0202-Add-villager-reputation-API.patch
+++ b/patches/api/0201-Add-villager-reputation-API.patch
diff --git a/patches/api/0203-Spawn-Reason-API.patch b/patches/api/0202-Spawn-Reason-API.patch
index 60d33effef..60d33effef 100644
--- a/patches/api/0203-Spawn-Reason-API.patch
+++ b/patches/api/0202-Spawn-Reason-API.patch
diff --git a/patches/api/0204-Potential-bed-API.patch b/patches/api/0203-Potential-bed-API.patch
index 102eb79e40..102eb79e40 100644
--- a/patches/api/0204-Potential-bed-API.patch
+++ b/patches/api/0203-Potential-bed-API.patch
diff --git a/patches/api/0205-Prioritise-own-classes-where-possible.patch b/patches/api/0204-Prioritise-own-classes-where-possible.patch
index 948e2f95fa..948e2f95fa 100644
--- a/patches/api/0205-Prioritise-own-classes-where-possible.patch
+++ b/patches/api/0204-Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch
index f780b485d6..f780b485d6 100644
--- a/patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch
+++ b/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch
index d834d6cdb3..d834d6cdb3 100644
--- a/patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0208-Improve-Arrow-API.patch b/patches/api/0207-Improve-Arrow-API.patch
index 1c70418e98..1c70418e98 100644
--- a/patches/api/0208-Improve-Arrow-API.patch
+++ b/patches/api/0207-Improve-Arrow-API.patch
diff --git a/patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 93bd233b85..93bd233b85 100644
--- a/patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0210-Support-components-in-ItemMeta.patch b/patches/api/0209-Support-components-in-ItemMeta.patch
index d9bc5b4ade..a4e6b27bd0 100644
--- a/patches/api/0210-Support-components-in-ItemMeta.patch
+++ b/patches/api/0209-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 5428aeb018c415f8e9bb46c84a627adf70829259..f1e9a7626c4efb99be78f1056dc04b06bbe13c87 100644
+index 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
diff --git a/patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 747470a546..747470a546 100644
--- a/patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0212-Add-entity-liquid-API.patch b/patches/api/0211-Add-entity-liquid-API.patch
index 19f023a488..cf83bc59f7 100644
--- a/patches/api/0212-Add-entity-liquid-API.patch
+++ b/patches/api/0211-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f17f30a9969e52313387c0d92edd980f72687a11..587bf31ed2b2edc7d467d226c91c2bccdd1e4044 100644
+index 383844bf956e70cc8a821913d5b2560226d8e2fc..88e35a4e8d82e2e071ecd47fe8871e0f13a84e2e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -760,5 +760,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 5dc61d601d..5dc61d601d 100644
--- a/patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0214-Brand-support.patch b/patches/api/0213-Brand-support.patch
index ce8d4fade7..ce8d4fade7 100644
--- a/patches/api/0214-Brand-support.patch
+++ b/patches/api/0213-Brand-support.patch
diff --git a/patches/api/0215-Support-hex-colors-in-getLastColors.patch b/patches/api/0214-Support-hex-colors-in-getLastColors.patch
index fec6bebf3c..fec6bebf3c 100644
--- a/patches/api/0215-Support-hex-colors-in-getLastColors.patch
+++ b/patches/api/0214-Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/0216-Add-setMaxPlayers-API.patch b/patches/api/0215-Add-setMaxPlayers-API.patch
index e37f12a879..e37f12a879 100644
--- a/patches/api/0216-Add-setMaxPlayers-API.patch
+++ b/patches/api/0215-Add-setMaxPlayers-API.patch
diff --git a/patches/api/0217-Add-BellRingEvent.patch b/patches/api/0216-Add-BellRingEvent.patch
index 7862ad8c88..7862ad8c88 100644
--- a/patches/api/0217-Add-BellRingEvent.patch
+++ b/patches/api/0216-Add-BellRingEvent.patch
diff --git a/patches/api/0218-Add-moon-phase-API.patch b/patches/api/0217-Add-moon-phase-API.patch
index 1a307b0721..1a307b0721 100644
--- a/patches/api/0218-Add-moon-phase-API.patch
+++ b/patches/api/0217-Add-moon-phase-API.patch
diff --git a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch
index a2b38a0e8b..a2b38a0e8b 100644
--- a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0220-Add-more-Evoker-API.patch b/patches/api/0219-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0220-Add-more-Evoker-API.patch
+++ b/patches/api/0219-Add-more-Evoker-API.patch
diff --git a/patches/api/0221-Add-methods-to-get-translation-keys.patch b/patches/api/0220-Add-methods-to-get-translation-keys.patch
index 909c3426d5..909c3426d5 100644
--- a/patches/api/0221-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0220-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch
index eaeeffb576..eaeeffb576 100644
--- a/patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch
index 2d427236be..2d427236be 100644
--- a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index e88d196cc0..e88d196cc0 100644
--- a/patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0225-Entity-isTicking.patch b/patches/api/0224-Entity-isTicking.patch
index ec9d55e28c..36e078fb7c 100644
--- a/patches/api/0225-Entity-isTicking.patch
+++ b/patches/api/0224-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 587bf31ed2b2edc7d467d226c91c2bccdd1e4044..895ccd46d6792210ac9e53093111bd9439e1a41c 100644
+index 88e35a4e8d82e2e071ecd47fe8871e0f13a84e2e..be83ba864e2b9df50275f0fcdb50dc57a955ebec 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -790,5 +790,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
index 5bc3c30ecd..094bcc1ce8 100644
--- a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
+++ b/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 895ccd46d6792210ac9e53093111bd9439e1a41c..b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0 100644
+index be83ba864e2b9df50275f0fcdb50dc57a955ebec..f9b2251dbb7c9fe7dccc0fd28b4c00881124b6f3 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -756,7 +756,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0227-Villager-resetOffers.patch b/patches/api/0226-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0227-Villager-resetOffers.patch
+++ b/patches/api/0226-Villager-resetOffers.patch
diff --git a/patches/api/0228-Player-elytra-boost-API.patch b/patches/api/0227-Player-elytra-boost-API.patch
index 40d4cad6f1..40d4cad6f1 100644
--- a/patches/api/0228-Player-elytra-boost-API.patch
+++ b/patches/api/0227-Player-elytra-boost-API.patch
diff --git a/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
index 1aebb14af4..1aebb14af4 100644
--- a/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0230-Add-ignore-discounts-API.patch b/patches/api/0229-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0230-Add-ignore-discounts-API.patch
+++ b/patches/api/0229-Add-ignore-discounts-API.patch
diff --git a/patches/api/0231-Item-no-age-no-player-pickup.patch b/patches/api/0230-Item-no-age-no-player-pickup.patch
index 5dd7572120..5dd7572120 100644
--- a/patches/api/0231-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0230-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0232-Beacon-API-custom-effect-ranges.patch b/patches/api/0231-Beacon-API-custom-effect-ranges.patch
index ff56b99ebf..ff56b99ebf 100644
--- a/patches/api/0232-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0231-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0233-Add-API-for-quit-reason.patch b/patches/api/0232-Add-API-for-quit-reason.patch
index 70e37ffc9b..70e37ffc9b 100644
--- a/patches/api/0233-Add-API-for-quit-reason.patch
+++ b/patches/api/0232-Add-API-for-quit-reason.patch
diff --git a/patches/api/0234-Add-Destroy-Speed-API.patch b/patches/api/0233-Add-Destroy-Speed-API.patch
index dbca343b9b..dbca343b9b 100644
--- a/patches/api/0234-Add-Destroy-Speed-API.patch
+++ b/patches/api/0233-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0235-Add-LivingEntity-clearActiveItem.patch b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch
index 66a33785b7..66a33785b7 100644
--- a/patches/api/0235-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0236-Add-PlayerItemCooldownEvent.patch b/patches/api/0235-Add-PlayerItemCooldownEvent.patch
index 378f88f6e6..378f88f6e6 100644
--- a/patches/api/0236-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0235-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0237-More-lightning-API.patch b/patches/api/0236-More-lightning-API.patch
index 3ff480a14c..3ff480a14c 100644
--- a/patches/api/0237-More-lightning-API.patch
+++ b/patches/api/0236-More-lightning-API.patch
diff --git a/patches/api/0238-Add-PlayerShearBlockEvent.patch b/patches/api/0237-Add-PlayerShearBlockEvent.patch
index 051544b4a9..051544b4a9 100644
--- a/patches/api/0238-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0237-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0239-Enable-multi-release-plugin-jars.patch b/patches/api/0238-Enable-multi-release-plugin-jars.patch
index 40eb489f1d..40eb489f1d 100644
--- a/patches/api/0239-Enable-multi-release-plugin-jars.patch
+++ b/patches/api/0238-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0240-Player-Chunk-Load-Unload-Events.patch b/patches/api/0239-Player-Chunk-Load-Unload-Events.patch
index e2ce87ec9d..e2ce87ec9d 100644
--- a/patches/api/0240-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0239-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0241-Expose-LivingEntity-hurt-direction.patch b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch
index 3d78532a21..3d78532a21 100644
--- a/patches/api/0241-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0243-Added-PlayerTradeEvent.patch b/patches/api/0242-Added-PlayerTradeEvent.patch
index e09b088160..e09b088160 100644
--- a/patches/api/0243-Added-PlayerTradeEvent.patch
+++ b/patches/api/0242-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0244-Add-TargetHitEvent-API.patch b/patches/api/0243-Add-TargetHitEvent-API.patch
index 247421fb61..247421fb61 100644
--- a/patches/api/0244-Add-TargetHitEvent-API.patch
+++ b/patches/api/0243-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0245-Additional-Block-Material-API-s.patch b/patches/api/0244-Additional-Block-Material-API-s.patch
index fe8d819d32..fe8d819d32 100644
--- a/patches/api/0245-Additional-Block-Material-API-s.patch
+++ b/patches/api/0244-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index b42db5d4db..b42db5d4db 100644
--- a/patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch
index d9cd5a9f01..d9cd5a9f01 100644
--- a/patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0248-Zombie-API-breaking-doors.patch b/patches/api/0247-Zombie-API-breaking-doors.patch
index cda09b776b..cda09b776b 100644
--- a/patches/api/0248-Zombie-API-breaking-doors.patch
+++ b/patches/api/0247-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0249-Add-EntityLoadCrossbowEvent.patch b/patches/api/0248-Add-EntityLoadCrossbowEvent.patch
index 1e0386a9aa..1e0386a9aa 100644
--- a/patches/api/0249-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0248-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0250-Added-WorldGameRuleChangeEvent.patch b/patches/api/0249-Added-WorldGameRuleChangeEvent.patch
index 8ef5f7efcd..8ef5f7efcd 100644
--- a/patches/api/0250-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0249-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0251-Added-ServerResourcesReloadedEvent.patch b/patches/api/0250-Added-ServerResourcesReloadedEvent.patch
index de081bbae7..de081bbae7 100644
--- a/patches/api/0251-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0250-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0252-Add-BlockFailedDispenseEvent.patch b/patches/api/0251-Add-BlockFailedDispenseEvent.patch
index 126714b965..126714b965 100644
--- a/patches/api/0252-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0251-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0253-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch
index 2b65c3a245..2b65c3a245 100644
--- a/patches/api/0253-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch
index 5677026956..5677026956 100644
--- a/patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index afc3f45d28..afc3f45d28 100644
--- a/patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0256-Add-sendOpLevel-API.patch b/patches/api/0255-Add-sendOpLevel-API.patch
index b3bdaac090..b3bdaac090 100644
--- a/patches/api/0256-Add-sendOpLevel-API.patch
+++ b/patches/api/0255-Add-sendOpLevel-API.patch
diff --git a/patches/api/0257-Add-PaperRegistry.patch b/patches/api/0256-Add-PaperRegistry.patch
index 1a1ca3cc24..1a1ca3cc24 100644
--- a/patches/api/0257-Add-PaperRegistry.patch
+++ b/patches/api/0256-Add-PaperRegistry.patch
diff --git a/patches/api/0258-Add-StructuresLocateEvent.patch b/patches/api/0257-Add-StructuresLocateEvent.patch
index 267a1b8045..267a1b8045 100644
--- a/patches/api/0258-Add-StructuresLocateEvent.patch
+++ b/patches/api/0257-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch
index ae5787045f..ae5787045f 100644
--- a/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0260-Add-BlockPreDispenseEvent.patch b/patches/api/0259-Add-BlockPreDispenseEvent.patch
index fb0b89a4ee..fb0b89a4ee 100644
--- a/patches/api/0260-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0259-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0261-Added-Vanilla-Entity-Tags.patch b/patches/api/0260-Added-Vanilla-Entity-Tags.patch
index 42d3ec2875..d7acec1bd1 100644
--- a/patches/api/0261-Added-Vanilla-Entity-Tags.patch
+++ b/patches/api/0260-Added-Vanilla-Entity-Tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added Vanilla Entity Tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 33f022a01e44e6b806e6d38eef003da161b6be53..9694b862d62afbaa831735a6f6d095315bcdf37c 100644
+index 60e98f0eb8028fc9dfb73320b2939a33435174c1..92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -811,6 +811,44 @@ public interface Tag<T extends Keyed> extends Keyed {
diff --git a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
index 4331e880bb..4331e880bb 100644
--- a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 9aed50ae84..f85f2a4f26 100644
--- a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -56,23 +56,23 @@ index a33986a0c437a673435206fc337031a7eebdab3b..e0e068799a1868c8e561869015f41f55
      @Override
      public HandlerList getHandlers() {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
-index cf78950b56d4977f6c4d9d98d183bfc5ba3bacc0..68eab1563caba1ee4f52b308f390e4e172667fc5 100644
+index 075af9c1c179bcc2f0e7cb4db4e0d54d6d58ce5c..d63bd62606763d0902ea800f0c35a1cfd07fc8ec 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
-@@ -13,8 +13,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc
+@@ -17,8 +17,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc
      private final Player player;
-     private boolean cancelled = false;
+     private final EquipmentSlot hand;
  
 +    // Paper start - drop leash variable
 +    @Deprecated
-     public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player) {
+     public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand) {
 -        super(entity, UnleashReason.PLAYER_UNLEASH);
-+        this(entity, player, false);
++        this(entity, player, hand, false);
 +    }
 +
-+    public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, boolean dropLeash) {
++    public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand, boolean dropLeash) {
 +        super(entity, UnleashReason.PLAYER_UNLEASH, dropLeash);
 +        // Paper end
          this.player = player;
+         this.hand = hand;
      }
- 
diff --git a/patches/api/0265-add-DragonEggFormEvent.patch b/patches/api/0264-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0265-add-DragonEggFormEvent.patch
+++ b/patches/api/0264-add-DragonEggFormEvent.patch
diff --git a/patches/api/0266-EntityMoveEvent.patch b/patches/api/0265-EntityMoveEvent.patch
index 2855c3bdef..2855c3bdef 100644
--- a/patches/api/0266-EntityMoveEvent.patch
+++ b/patches/api/0265-EntityMoveEvent.patch
diff --git a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index bbb81fdcf6..bbb81fdcf6 100644
--- a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0269-living-entity-allow-attribute-registration.patch b/patches/api/0268-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0269-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0268-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0270-Add-missing-effects.patch b/patches/api/0269-Add-missing-effects.patch
index 8f72589e1e..f00165350a 100644
--- a/patches/api/0270-Add-missing-effects.patch
+++ b/patches/api/0269-Add-missing-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing effects
 
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index cf6b94a52d7638a52337045c1b4e7677a3fbd824..5072c5ed2635f92a6d8048b6e019c8f36338b93c 100644
+index bf752c5a71bcafe740be281cb6ef5a756c839534..3f2fb26455f6a71e43281098a2291ccf25635348 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -307,7 +307,100 @@ public enum Effect {
diff --git a/patches/api/0271-Expose-Tracked-Players.patch b/patches/api/0270-Expose-Tracked-Players.patch
index 09aaa196fb..956218a778 100644
--- a/patches/api/0271-Expose-Tracked-Players.patch
+++ b/patches/api/0270-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0..fd9bc146a06e06d0967d9c45421aec460e49bab6 100644
+index f9b2251dbb7c9fe7dccc0fd28b4c00881124b6f3..2eb98be7095495f0e99d46b92ccc16d19bbc411b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -795,5 +795,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
index b7c79e9f76..b7c79e9f76 100644
--- a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0273-Add-worldborder-events.patch b/patches/api/0272-Add-worldborder-events.patch
index 09c3770e16..09c3770e16 100644
--- a/patches/api/0273-Add-worldborder-events.patch
+++ b/patches/api/0272-Add-worldborder-events.patch
diff --git a/patches/api/0274-added-PlayerNameEntityEvent.patch b/patches/api/0273-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0274-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0273-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0275-Add-recipe-to-cook-events.patch b/patches/api/0274-Add-recipe-to-cook-events.patch
index b0b34773c0..b0b34773c0 100644
--- a/patches/api/0275-Add-recipe-to-cook-events.patch
+++ b/patches/api/0274-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0276-Add-Block-isValidTool.patch b/patches/api/0275-Add-Block-isValidTool.patch
index 1ba9ed8d9a..1ba9ed8d9a 100644
--- a/patches/api/0276-Add-Block-isValidTool.patch
+++ b/patches/api/0275-Add-Block-isValidTool.patch
diff --git a/patches/api/0277-Expand-world-key-API.patch b/patches/api/0276-Expand-world-key-API.patch
index 3f046485fd..3f046485fd 100644
--- a/patches/api/0277-Expand-world-key-API.patch
+++ b/patches/api/0276-Expand-world-key-API.patch
diff --git a/patches/api/0278-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch
index ac6b1d001f..ac6b1d001f 100644
--- a/patches/api/0278-Item-Rarity-API.patch
+++ b/patches/api/0277-Item-Rarity-API.patch
diff --git a/patches/api/0279-Expose-protocol-version.patch b/patches/api/0278-Expose-protocol-version.patch
index c7d7976e04..c7d7976e04 100644
--- a/patches/api/0279-Expose-protocol-version.patch
+++ b/patches/api/0278-Expose-protocol-version.patch
diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch
index 85ca92bd05..85ca92bd05 100644
--- a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..6c8b681cd9 100644
--- a/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch
index c42542a195..c42542a195 100644
--- a/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0283-Added-PlayerDeepSleepEvent.patch b/patches/api/0282-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0283-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0282-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0284-More-World-API.patch b/patches/api/0283-More-World-API.patch
index e7575201c0..11fd4e80e2 100644
--- a/patches/api/0284-More-World-API.patch
+++ b/patches/api/0283-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 352a20da402b3b0182b7a0c69d94397f42054053..8b88146908288e7290952a6d8a9db1dbb3307f66 100644
+index 79b1015c56aab88ee8bf70cef0a2ab05c910d991..82eb04abe67e05f1bb6fd2a0350d5b2574a01d4b 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3709,6 +3709,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0285-Added-PlayerBedFailEnterEvent.patch b/patches/api/0284-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0285-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0284-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0285-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0285-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0287-PlayerMoveEvent-Improvements.patch b/patches/api/0286-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0287-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0286-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 3b5d058fcc..3b5d058fcc 100644
--- a/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0289-Add-more-WanderingTrader-API.patch b/patches/api/0288-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0289-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0288-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0289-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0289-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index bf487b87b1..bf487b87b1 100644
--- a/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0293-Inventory-close.patch b/patches/api/0292-Inventory-close.patch
index 74af8b6304..74af8b6304 100644
--- a/patches/api/0293-Inventory-close.patch
+++ b/patches/api/0292-Inventory-close.patch
diff --git a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 16cdba8016..16cdba8016 100644
--- a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0295-Add-basic-Datapack-API.patch b/patches/api/0294-Add-basic-Datapack-API.patch
index a1a8c84460..a1a8c84460 100644
--- a/patches/api/0295-Add-basic-Datapack-API.patch
+++ b/patches/api/0294-Add-basic-Datapack-API.patch
diff --git a/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0297-ItemStack-repair-check-API.patch b/patches/api/0296-ItemStack-repair-check-API.patch
index 4fb4ae3ebd..4fb4ae3ebd 100644
--- a/patches/api/0297-ItemStack-repair-check-API.patch
+++ b/patches/api/0296-ItemStack-repair-check-API.patch
diff --git a/patches/api/0298-More-Enchantment-API.patch b/patches/api/0297-More-Enchantment-API.patch
index 50fae967ae..50fae967ae 100644
--- a/patches/api/0298-More-Enchantment-API.patch
+++ b/patches/api/0297-More-Enchantment-API.patch
diff --git a/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0298-List-all-missing-hard-depends-not-just-first.patch
index 57e8999ff3..57e8999ff3 100644
--- a/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
+++ b/patches/api/0298-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0300-Add-Mob-lookAt-API.patch b/patches/api/0299-Add-Mob-lookAt-API.patch
index 80f5c58df3..0dd5126905 100644
--- a/patches/api/0300-Add-Mob-lookAt-API.patch
+++ b/patches/api/0299-Add-Mob-lookAt-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob#lookAt API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 4a7ffd617c2a660a4d2e9d10f54add2391f832b9..c6d8622fba3397cf3434726f1d7c49e95b887e46 100644
+index 7eee2e561346ac1d672f9652edb78e76c910fc9d..11b6d1aba7d1f6ae1f3c822193486f5a1478e105 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -27,6 +27,88 @@ public interface Mob extends LivingEntity, Lootable {
diff --git a/patches/api/0301-ItemStack-editMeta.patch b/patches/api/0300-ItemStack-editMeta.patch
index a6b2d88a10..a6b2d88a10 100644
--- a/patches/api/0301-ItemStack-editMeta.patch
+++ b/patches/api/0300-ItemStack-editMeta.patch
diff --git a/patches/api/0302-Add-EntityInsideBlockEvent.patch b/patches/api/0301-Add-EntityInsideBlockEvent.patch
index 26c188e7a0..26c188e7a0 100644
--- a/patches/api/0302-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0301-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0303-Attributes-API-for-item-defaults.patch b/patches/api/0302-Attributes-API-for-item-defaults.patch
index 16d608ad5c..16d608ad5c 100644
--- a/patches/api/0303-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0302-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0305-More-Lidded-Block-API.patch b/patches/api/0304-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0305-More-Lidded-Block-API.patch
+++ b/patches/api/0304-More-Lidded-Block-API.patch
diff --git a/patches/api/0306-Add-PlayerKickEvent-causes.patch b/patches/api/0305-Add-PlayerKickEvent-causes.patch
index 4b2bfc5a54..4b2bfc5a54 100644
--- a/patches/api/0306-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0305-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0307-Add-PufferFishStateChangeEvent.patch b/patches/api/0306-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0307-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0306-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0308-Add-BellRevealRaiderEvent.patch b/patches/api/0307-Add-BellRevealRaiderEvent.patch
index 8b0ee3e5b4..8b0ee3e5b4 100644
--- a/patches/api/0308-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0307-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0308-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0308-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/api/0309-Add-more-line-of-sight-methods.patch
index 3a53cfffbb..3a53cfffbb 100644
--- a/patches/api/0310-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0309-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0311-Add-more-LimitedRegion-API.patch b/patches/api/0310-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0311-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0310-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/api/0311-Missing-Entity-Behavior-API.patch
index 78378f8e51..78378f8e51 100644
--- a/patches/api/0312-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0311-Missing-Entity-Behavior-API.patch
diff --git a/patches/api/0313-Adds-PlayerArmSwingEvent.patch b/patches/api/0312-Adds-PlayerArmSwingEvent.patch
index 0a501495fe..0a501495fe 100644
--- a/patches/api/0313-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0312-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch
index fd095653a3..fd095653a3 100644
--- a/patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0315-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0314-fix-empty-array-elements-in-command-arguments.patch
index b6512f8f29..b6512f8f29 100644
--- a/patches/api/0315-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0314-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0316-Stinger-API.patch b/patches/api/0315-Stinger-API.patch
index 29eea0d3f0..29eea0d3f0 100644
--- a/patches/api/0316-Stinger-API.patch
+++ b/patches/api/0315-Stinger-API.patch
diff --git a/patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index a9319418e4..a9319418e4 100644
--- a/patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0318-Add-PlayerSetSpawnEvent.patch b/patches/api/0317-Add-PlayerSetSpawnEvent.patch
index 74772fd9d8..74772fd9d8 100644
--- a/patches/api/0318-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0317-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0319-Added-EntityDamageItemEvent.patch b/patches/api/0318-Added-EntityDamageItemEvent.patch
index 8bbe79f9f3..8bbe79f9f3 100644
--- a/patches/api/0319-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0318-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0320-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0319-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0320-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0319-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0322-Add-BlockBreakBlockEvent.patch b/patches/api/0321-Add-BlockBreakBlockEvent.patch
index dfd13b1355..dfd13b1355 100644
--- a/patches/api/0322-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0321-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 0a0b5515e3..0a0b5515e3 100644
--- a/patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0325-More-CommandBlock-API.patch b/patches/api/0324-More-CommandBlock-API.patch
index 242270eb12..242270eb12 100644
--- a/patches/api/0325-More-CommandBlock-API.patch
+++ b/patches/api/0324-More-CommandBlock-API.patch
diff --git a/patches/api/0326-Fix-plugin-provides-load-order.patch b/patches/api/0325-Fix-plugin-provides-load-order.patch
index 74b275da11..74b275da11 100644
--- a/patches/api/0326-Fix-plugin-provides-load-order.patch
+++ b/patches/api/0325-Fix-plugin-provides-load-order.patch
diff --git a/patches/api/0327-Add-missing-team-sidebar-display-slots.patch b/patches/api/0326-Add-missing-team-sidebar-display-slots.patch
index 1d9b731fb4..1d9b731fb4 100644
--- a/patches/api/0327-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0326-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0328-add-back-EntityPortalExitEvent.patch b/patches/api/0327-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0328-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0327-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch
index 90130a24da..bce5db5143 100644
--- a/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8b88146908288e7290952a6d8a9db1dbb3307f66..e47d0663d42fa38e5c6cd2611f99e23f8187c28f 100644
+index 82eb04abe67e05f1bb6fd2a0350d5b2574a01d4b..43d12399e807abd4c95ffec8c025373b6d344a36 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -749,6 +749,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0330-Get-entity-default-attributes.patch b/patches/api/0329-Get-entity-default-attributes.patch
index 72795452c0..72795452c0 100644
--- a/patches/api/0330-Get-entity-default-attributes.patch
+++ b/patches/api/0329-Get-entity-default-attributes.patch
diff --git a/patches/api/0331-Left-handed-API.patch b/patches/api/0330-Left-handed-API.patch
index f22529b07f..6b5d42a329 100644
--- a/patches/api/0331-Left-handed-API.patch
+++ b/patches/api/0330-Left-handed-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index c6d8622fba3397cf3434726f1d7c49e95b887e46..12ebceec3eb6f4c3325e6c6a592676795a988136 100644
+index 11b6d1aba7d1f6ae1f3c822193486f5a1478e105..d53de07b40d9cd63a9553d4b0ad442d526530b92 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -162,4 +162,20 @@ public interface Mob extends LivingEntity, Lootable {
diff --git a/patches/api/0332-Add-advancement-display-API.patch b/patches/api/0331-Add-advancement-display-API.patch
index e335bdcf96..e335bdcf96 100644
--- a/patches/api/0332-Add-advancement-display-API.patch
+++ b/patches/api/0331-Add-advancement-display-API.patch
diff --git a/patches/api/0333-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0332-Add-ItemFactory-getMonsterEgg-API.patch
index 972e376f18..972e376f18 100644
--- a/patches/api/0333-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/api/0332-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/api/0334-Add-critical-damage-API.patch b/patches/api/0333-Add-critical-damage-API.patch
index 3a9d1f8070..3a9d1f8070 100644
--- a/patches/api/0334-Add-critical-damage-API.patch
+++ b/patches/api/0333-Add-critical-damage-API.patch
diff --git a/patches/api/0335-Fix-issues-with-mob-conversion.patch b/patches/api/0334-Fix-issues-with-mob-conversion.patch
index 8ee1c49162..8ee1c49162 100644
--- a/patches/api/0335-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0334-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0336-Add-isCollidable-methods-to-various-places.patch b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch
index f3472664f7..f3472664f7 100644
--- a/patches/api/0336-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0337-Goat-ram-API.patch b/patches/api/0336-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0337-Goat-ram-API.patch
+++ b/patches/api/0336-Goat-ram-API.patch
diff --git a/patches/api/0338-Add-API-for-resetting-a-single-score.patch b/patches/api/0337-Add-API-for-resetting-a-single-score.patch
index 997ebf42f6..997ebf42f6 100644
--- a/patches/api/0338-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0337-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch
index 3d0663f68d..5e45eccee8 100644
--- a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,7 +24,7 @@ index be8d5c172b0a300648f21e2163ccf0a9cd7915ee..4fcafddf3792b66c618f91e04d102f37
       * Return the translation key for the Material, so the client can translate it into the active
       * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fd9bc146a06e06d0967d9c45421aec460e49bab6..f1cb02f7891e47b7c8328bfd62437deed93226b3 100644
+index 2eb98be7095495f0e99d46b92ccc16d19bbc411b..c15235b93f43746836eb4b7e136615fbc9308369 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -802,5 +802,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0340-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0339-Add-PlayerItemFrameChangeEvent.patch
index a62e452bb4..a62e452bb4 100644
--- a/patches/api/0340-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0339-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0341-Add-player-health-update-API.patch b/patches/api/0340-Add-player-health-update-API.patch
index 83a3545f84..83a3545f84 100644
--- a/patches/api/0341-Add-player-health-update-API.patch
+++ b/patches/api/0340-Add-player-health-update-API.patch
diff --git a/patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch
index 9012011468..9012011468 100644
--- a/patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0343-Add-more-Campfire-API.patch b/patches/api/0342-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0343-Add-more-Campfire-API.patch
+++ b/patches/api/0342-Add-more-Campfire-API.patch
diff --git a/patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch
index 8fa566d54a..8fa566d54a 100644
--- a/patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch
+++ b/patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0345-Improve-scoreboard-entries.patch b/patches/api/0344-Improve-scoreboard-entries.patch
index 0e34dd6072..0e34dd6072 100644
--- a/patches/api/0345-Improve-scoreboard-entries.patch
+++ b/patches/api/0344-Improve-scoreboard-entries.patch
diff --git a/patches/api/0346-Entity-powdered-snow-API.patch b/patches/api/0345-Entity-powdered-snow-API.patch
index a223c993a8..acb53c106f 100644
--- a/patches/api/0346-Entity-powdered-snow-API.patch
+++ b/patches/api/0345-Entity-powdered-snow-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity powdered snow API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f1cb02f7891e47b7c8328bfd62437deed93226b3..80140c8636c10553c1be741b7e4e5084007279e5 100644
+index c15235b93f43746836eb4b7e136615fbc9308369..9d6af05deead57a2df9663d76d89ccd8b8aab6d5 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -829,5 +829,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0347-Add-API-for-item-entity-health.patch b/patches/api/0346-Add-API-for-item-entity-health.patch
index 94373dbdf2..94373dbdf2 100644
--- a/patches/api/0347-Add-API-for-item-entity-health.patch
+++ b/patches/api/0346-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0349-Bucketable-API.patch b/patches/api/0348-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0349-Bucketable-API.patch
+++ b/patches/api/0348-Bucketable-API.patch
diff --git a/patches/api/0350-System-prop-for-default-config-comment-parsing.patch b/patches/api/0349-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0350-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0349-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0352-Remove-upstream-snakeyaml-fix.patch b/patches/api/0351-Remove-upstream-snakeyaml-fix.patch
index d64efcbe9d..d64efcbe9d 100644
--- a/patches/api/0352-Remove-upstream-snakeyaml-fix.patch
+++ b/patches/api/0351-Remove-upstream-snakeyaml-fix.patch
diff --git a/patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch
index 73c49a2fc8..73c49a2fc8 100644
--- a/patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0354-Multiple-Entries-with-Scoreboards.patch b/patches/api/0353-Multiple-Entries-with-Scoreboards.patch
index 2601f1c5a7..2601f1c5a7 100644
--- a/patches/api/0354-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0353-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 3f005c4a38..3f005c4a38 100644
--- a/patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0356-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0355-Warn-on-strange-EventHandler-return-types.patch
index 29026c1725..29026c1725 100644
--- a/patches/api/0356-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0355-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0357-Multi-Block-Change-API.patch b/patches/api/0356-Multi-Block-Change-API.patch
index 1d9a1f89d4..1d9a1f89d4 100644
--- a/patches/api/0357-Multi-Block-Change-API.patch
+++ b/patches/api/0356-Multi-Block-Change-API.patch
diff --git a/patches/api/0358-Fix-NotePlayEvent.patch b/patches/api/0357-Fix-NotePlayEvent.patch
index a474627df0..a474627df0 100644
--- a/patches/api/0358-Fix-NotePlayEvent.patch
+++ b/patches/api/0357-Fix-NotePlayEvent.patch
diff --git a/patches/api/0359-Freeze-Tick-Lock-API.patch b/patches/api/0358-Freeze-Tick-Lock-API.patch
index 5e471565ab..01344fbab1 100644
--- a/patches/api/0359-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0358-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 80140c8636c10553c1be741b7e4e5084007279e5..461e29a0abbb021c886bffec71c948e1edc3d222 100644
+index 9d6af05deead57a2df9663d76d89ccd8b8aab6d5..f9ca4b90f92f57288654d7006613531b139dcddc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0360-Dolphin-API.patch b/patches/api/0359-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0360-Dolphin-API.patch
+++ b/patches/api/0359-Dolphin-API.patch
diff --git a/patches/api/0361-More-PotionEffectType-API.patch b/patches/api/0360-More-PotionEffectType-API.patch
index aa6840470d..aa6840470d 100644
--- a/patches/api/0361-More-PotionEffectType-API.patch
+++ b/patches/api/0360-More-PotionEffectType-API.patch
diff --git a/patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch
index 95101a7000..95101a7000 100644
--- a/patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0363-Implement-regenerateChunk.patch b/patches/api/0362-Implement-regenerateChunk.patch
index 775ee50076..4cc4dda624 100644
--- a/patches/api/0363-Implement-regenerateChunk.patch
+++ b/patches/api/0362-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e47d0663d42fa38e5c6cd2611f99e23f8187c28f..e8c0c853eb52d1473c20231660355f77b1f7e016 100644
+index 43d12399e807abd4c95ffec8c025373b6d344a36..9e71e519cda72a1e2a01474f238b97015ec5115e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -498,8 +498,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch
index 497267bb52..497267bb52 100644
--- a/patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch
+++ b/patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch
diff --git a/patches/api/0365-Add-GameEvent-tags.patch b/patches/api/0364-Add-GameEvent-tags.patch
index ffef095e76..a3687657c0 100644
--- a/patches/api/0365-Add-GameEvent-tags.patch
+++ b/patches/api/0364-Add-GameEvent-tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add GameEvent tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 9694b862d62afbaa831735a6f6d095315bcdf37c..4749d4c01069f0e0cbe948ede1dd043baceaa97b 100644
+index 92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0..d999dae63e3796ce268b281d61b148dacacb3bad 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -848,6 +848,18 @@ public interface Tag<T extends Keyed> extends Keyed {
diff --git a/patches/api/0366-Furnace-RecipesUsed-API.patch b/patches/api/0365-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0366-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0365-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0367-Configurable-sculk-sensor-listener-range.patch b/patches/api/0366-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0367-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0366-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0368-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0367-Add-missing-block-data-mins-and-maxes.patch
index 600497b952..600497b952 100644
--- a/patches/api/0368-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0367-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0369-Custom-Potion-Mixes.patch b/patches/api/0368-Custom-Potion-Mixes.patch
index 260c044149..260c044149 100644
--- a/patches/api/0369-Custom-Potion-Mixes.patch
+++ b/patches/api/0368-Custom-Potion-Mixes.patch
diff --git a/patches/api/0370-Expose-furnace-minecart-push-values.patch b/patches/api/0369-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0370-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0369-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0371-More-Projectile-API.patch b/patches/api/0370-More-Projectile-API.patch
index 80f2397953..80f2397953 100644
--- a/patches/api/0371-More-Projectile-API.patch
+++ b/patches/api/0370-More-Projectile-API.patch
diff --git a/patches/api/0372-Add-getComputedBiome-API.patch b/patches/api/0371-Add-getComputedBiome-API.patch
index b192af7101..b192af7101 100644
--- a/patches/api/0372-Add-getComputedBiome-API.patch
+++ b/patches/api/0371-Add-getComputedBiome-API.patch
diff --git a/patches/api/0373-Add-enchantWithLevels-API.patch b/patches/api/0372-Add-enchantWithLevels-API.patch
index 394fcb62bf..394fcb62bf 100644
--- a/patches/api/0373-Add-enchantWithLevels-API.patch
+++ b/patches/api/0372-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0374-Add-TameableDeathMessageEvent.patch b/patches/api/0373-Add-TameableDeathMessageEvent.patch
index 6152eacbe6..6152eacbe6 100644
--- a/patches/api/0374-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0373-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch
index b86913ddbe..b86913ddbe 100644
--- a/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0377-Update-Folder-Uses-Plugin-Name.patch b/patches/api/0376-Update-Folder-Uses-Plugin-Name.patch
index a5c98762cf..a5c98762cf 100644
--- a/patches/api/0377-Update-Folder-Uses-Plugin-Name.patch
+++ b/patches/api/0376-Update-Folder-Uses-Plugin-Name.patch
diff --git a/patches/api/0378-WorldCreator-keepSpawnLoaded.patch b/patches/api/0377-WorldCreator-keepSpawnLoaded.patch
index c148a391f4..c148a391f4 100644
--- a/patches/api/0378-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0377-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 032a0872d1..032a0872d1 100644
--- a/patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0380-Add-PlayerStopUsingItemEvent.patch b/patches/api/0379-Add-PlayerStopUsingItemEvent.patch
index 0743d44ae1..0743d44ae1 100644
--- a/patches/api/0380-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0379-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0381-FallingBlock-auto-expire-setting.patch b/patches/api/0380-FallingBlock-auto-expire-setting.patch
index 90c104c7ce..90c104c7ce 100644
--- a/patches/api/0381-FallingBlock-auto-expire-setting.patch
+++ b/patches/api/0380-FallingBlock-auto-expire-setting.patch
diff --git a/patches/api/0382-Keyed-Cat-Type.patch b/patches/api/0381-Keyed-Cat-Type.patch
index b0797d78b7..b0797d78b7 100644
--- a/patches/api/0382-Keyed-Cat-Type.patch
+++ b/patches/api/0381-Keyed-Cat-Type.patch
diff --git a/patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch
index 10c607bbbc..10c607bbbc 100644
--- a/patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0384-Add-WardenAngerChangeEvent.patch b/patches/api/0383-Add-WardenAngerChangeEvent.patch
index acf45b5314..acf45b5314 100644
--- a/patches/api/0384-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0383-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0385-Nameable-Banner-API.patch b/patches/api/0384-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0385-Nameable-Banner-API.patch
+++ b/patches/api/0384-Nameable-Banner-API.patch
diff --git a/patches/api/0386-Add-Player-getFishHook.patch b/patches/api/0385-Add-Player-getFishHook.patch
index 9c96c813ae..9c96c813ae 100644
--- a/patches/api/0386-Add-Player-getFishHook.patch
+++ b/patches/api/0385-Add-Player-getFishHook.patch
diff --git a/patches/api/0387-More-Teleport-API.patch b/patches/api/0386-More-Teleport-API.patch
index 98b380b070..24f17beb8d 100644
--- a/patches/api/0387-More-Teleport-API.patch
+++ b/patches/api/0386-More-Teleport-API.patch
@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..0426ee8bd71142b6f933a479c0f2e5ef
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 461e29a0abbb021c886bffec71c948e1edc3d222..321f3ec6c7020ada38143832aea1c545850b9b21 100644
+index f9ca4b90f92f57288654d7006613531b139dcddc..8dd6c7bae8b5ce13e3b4d5847bb204dac5072da6 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -122,10 +122,77 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0388-Add-EntityPortalReadyEvent.patch b/patches/api/0387-Add-EntityPortalReadyEvent.patch
index 4b1b1f1e1f..4b1b1f1e1f 100644
--- a/patches/api/0388-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0387-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch
index 0afdd4aa9a..0afdd4aa9a 100644
--- a/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0390-Collision-API.patch b/patches/api/0389-Collision-API.patch
index 84c0fd74ca..834d79b866 100644
--- a/patches/api/0390-Collision-API.patch
+++ b/patches/api/0389-Collision-API.patch
@@ -25,7 +25,7 @@ index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 321f3ec6c7020ada38143832aea1c545850b9b21..6dd81f07ef4d6993187987d3352a01771ffb715e 100644
+index 8dd6c7bae8b5ce13e3b4d5847bb204dac5072da6..d00ce1de6f683777d6ccc10c4db1c28c571dbe75 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -924,4 +924,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0391-Block-Ticking-API.patch b/patches/api/0390-Block-Ticking-API.patch
index 7c077405ca..7c077405ca 100644
--- a/patches/api/0391-Block-Ticking-API.patch
+++ b/patches/api/0390-Block-Ticking-API.patch
diff --git a/patches/api/0392-Add-NamespacedKey-biome-methods.patch b/patches/api/0391-Add-NamespacedKey-biome-methods.patch
index fc1f5c4d7e..fc1f5c4d7e 100644
--- a/patches/api/0392-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0391-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index 31fa2bff14..31fa2bff14 100644
--- a/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/api/0394-Also-load-resources-from-LibraryLoader.patch b/patches/api/0393-Also-load-resources-from-LibraryLoader.patch
index 9843c45af2..9843c45af2 100644
--- a/patches/api/0394-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0393-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch
index 9c197fc52f..9c197fc52f 100644
--- a/patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index bec7a5d015..bec7a5d015 100644
--- a/patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index cbaa0fa6b5..7fe0223346 100644
--- a/patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
@@ -5,19 +5,6 @@ Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase
  default
 
 
-diff --git a/build.gradle.kts b/build.gradle.kts
-index ea41ad342b0b4b4504deffc216541580879197bf..428e7777906aa5177c5c6489838e6400349bb62f 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -26,7 +26,7 @@ dependencies {
-     api("com.google.guava:guava:31.0.1-jre")
-     api("com.google.code.gson:gson:2.8.9")
-     api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
--    api("org.yaml:snakeyaml:1.32")
-+    api("org.yaml:snakeyaml:1.33") // Paper
-     // Paper start
-     api("com.googlecode.json-simple:json-simple:1.1.1") {
-         isTransitive = false // includes junit
 diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
 index 0a03cefda788b1dc57ddd61914492a15788aa3d5..df98d2c12ef4867118aba3452c3aba1175faab4e 100644
 --- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
diff --git a/patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch b/patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch
index a4e596f91f..a4e596f91f 100644
--- a/patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch
+++ b/patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch
diff --git a/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
index ff9178837d..ff9178837d 100644
--- a/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
+++ b/patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch
index 35a7393050..a0d43a7b04 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/server/0009-Adventure.patch
@@ -3625,10 +3625,10 @@ index 75143ba3e1e8a001801455c9bf1235186833dbae..10a9a108448509ceb7d40a4bddb06738
      private final Player.Spigot spigot = new Player.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d0699be22411796174b58733cfb79b80c89f9769..97a614e2367439dbface4a258f966c0440ef965d 100644
+index 984dd8d3ce4da655f3f239aa5982eccba48c6de5..2766f670f7bbe03c23552eb2ccf71d6397cfb150 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -816,9 +816,9 @@ public class CraftEventFactory {
+@@ -820,9 +820,9 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -3640,7 +3640,7 @@ index d0699be22411796174b58733cfb79b80c89f9769..97a614e2367439dbface4a258f966c04
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
          org.bukkit.World world = entity.getWorld();
-@@ -843,7 +843,7 @@ public class CraftEventFactory {
+@@ -847,7 +847,7 @@ public class CraftEventFactory {
       * Server methods
       */
      public static ServerListPingEvent callServerListPingEvent(Server craftServer, InetAddress address, String motd, boolean shouldSendChatPreviews, int numPlayers, int maxPlayers) {
diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch
index 7d8b8c763c..4a91e5d9a4 100644
--- a/patches/server/0012-Timings-v2.patch
+++ b/patches/server/0012-Timings-v2.patch
@@ -1425,7 +1425,7 @@ index cdf8020194f2ec1fe7b65b22c8e1f5b1c23eaefa..2db27f5e3e3c1bb0502c055f78c4a81e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae8b29345f 100644
+index e283e8383a52c74cebd16fa7642a5e3993b2ed1a..8c2d76c27c784536c3b573bf4ae4f47c2c3c4b6b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1437,7 +1437,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
  
  public abstract class LivingEntity extends Entity {
  
-@@ -2817,7 +2817,6 @@ public abstract class LivingEntity extends Entity {
+@@ -2820,7 +2820,6 @@ public abstract class LivingEntity extends Entity {
  
      @Override
      public void tick() {
@@ -1445,7 +1445,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
          super.tick();
          this.updatingUsingItem();
          this.updateSwimAmount();
-@@ -2859,9 +2858,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2862,9 +2861,7 @@ public abstract class LivingEntity extends Entity {
          }
  
          if (!this.isRemoved()) {
@@ -1455,7 +1455,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
          }
  
          double d0 = this.getX() - this.xo;
-@@ -2943,8 +2940,6 @@ public abstract class LivingEntity extends Entity {
+@@ -2946,8 +2943,6 @@ public abstract class LivingEntity extends Entity {
          if (this.isSleeping()) {
              this.setXRot(0.0F);
          }
@@ -1464,7 +1464,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
      }
  
      public void detectEquipmentUpdates() {
-@@ -3126,7 +3121,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3129,7 +3124,6 @@ public abstract class LivingEntity extends Entity {
  
          this.setDeltaMovement(d4, d5, d6);
          this.level.getProfiler().push("ai");
@@ -1472,7 +1472,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
          if (this.isImmobile()) {
              this.jumping = false;
              this.xxa = 0.0F;
-@@ -3136,7 +3130,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3139,7 +3133,6 @@ public abstract class LivingEntity extends Entity {
              this.serverAiStep();
              this.level.getProfiler().pop();
          }
@@ -1480,7 +1480,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
  
          this.level.getProfiler().pop();
          this.level.getProfiler().push("jump");
-@@ -3171,9 +3164,9 @@ public abstract class LivingEntity extends Entity {
+@@ -3174,9 +3167,9 @@ public abstract class LivingEntity extends Entity {
          this.updateFallFlying();
          AABB axisalignedbb = this.getBoundingBox();
  
@@ -1492,7 +1492,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae
          this.level.getProfiler().pop();
          this.level.getProfiler().push("freezing");
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
-@@ -3202,9 +3195,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3205,9 +3198,7 @@ public abstract class LivingEntity extends Entity {
              this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
          }
  
diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/server/0059-Add-exception-reporting-event.patch
index 528721a007..9751038977 100644
--- a/patches/server/0059-Add-exception-reporting-event.patch
+++ b/patches/server/0059-Add-exception-reporting-event.patch
@@ -111,10 +111,10 @@ index 1473664f94f228abd81b8c654d105b8a76cc49e9..65fd3a3c1f0a55d034e6f91c4f222e64
              // Paper end
          }
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index b37e04a0c466dacf52e74a4d4fb0885511c2abc1..878fc7f57178bff0e42fd01434f0aaa2732f5a5b 100644
+index 992b1eb2e4151863ba7900c3f7eaa8e56c0de7fa..c6ba7427b53398ddc8f0c942a810fad6e24561b4 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -289,6 +289,7 @@ public final class NaturalSpawner {
+@@ -290,6 +290,7 @@ public final class NaturalSpawner {
              }
          } catch (Exception exception) {
              NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
@@ -122,7 +122,7 @@ index b37e04a0c466dacf52e74a4d4fb0885511c2abc1..878fc7f57178bff0e42fd01434f0aaa2
              return null;
          }
      }
-@@ -401,6 +402,7 @@ public final class NaturalSpawner {
+@@ -402,6 +403,7 @@ public final class NaturalSpawner {
                                      entity = biomesettingsmobs_c.type.create(world.getLevel());
                                  } catch (Exception exception) {
                                      NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0071-Custom-replacement-for-eaten-items.patch
index f241818165..62f3354374 100644
--- a/patches/server/0071-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0071-Custom-replacement-for-eaten-items.patch
@@ -5,22 +5,23 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec24fba80e 100644
+index f513e9abb929fbabe12e40bb56af708745ea1ad9..d038c65e8a3d4a0000465e9d3ac7c4915b1b1015 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3611,9 +3611,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3614,10 +3614,11 @@ public abstract class LivingEntity extends Entity {
                      this.triggerItemUseEffects(this.useItem, 16);
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
-+                PlayerItemConsumeEvent event = null; // Paper
++                    PlayerItemConsumeEvent event = null; // Paper
                      if (this instanceof ServerPlayer) {
                          org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem);
--                        PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
-+                    event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
+                         org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand);
+-                        PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand);
++                        event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper
                          level.getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {
-@@ -3627,6 +3628,13 @@ public abstract class LivingEntity extends Entity {
+@@ -3631,6 +3632,13 @@ public abstract class LivingEntity extends Entity {
                      } else {
                          itemstack = this.useItem.finishUsingItem(this.level, this);
                      }
@@ -34,7 +35,7 @@ index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec
                      // CraftBukkit end
  
                      if (itemstack != this.useItem) {
-@@ -3634,6 +3642,11 @@ public abstract class LivingEntity extends Entity {
+@@ -3638,6 +3646,11 @@ public abstract class LivingEntity extends Entity {
                      }
  
                      this.stopUsingItem();
diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 0313a6da1c..a32c66067a 100644
--- a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111541f766d 100644
+index d038c65e8a3d4a0000465e9d3ac7c4915b1b1015..2cf58d6e086c1d6cc86ed689eb0d1cdc89b69477 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -784,7 +784,13 @@ public abstract class LivingEntity extends Entity {
@@ -34,7 +34,7 @@ index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111
          // CraftBukkit start - Handle scaled health
          if (this instanceof ServerPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity();
-@@ -3444,7 +3454,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3447,7 +3457,7 @@ public abstract class LivingEntity extends Entity {
      }
  
      public void setAbsorptionAmount(float amount) {
@@ -44,7 +44,7 @@ index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 307c76b2d06b748304d28d6634e86bb91f3ded67..4b7e5996b8b49d96f14cbd0d2167a0a09b47f4ec 100644
+index 15257f9236d0c32c1c74a15ce4e7decf4d9f2f91..1e1deab4d8be5523a55daf072d7e12b08d36b560 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2011,6 +2011,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
index 545c1bc427..c713a5e65f 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/server/0109-Add-EntityZapEvent.patch
@@ -28,10 +28,10 @@ index 2a7c82be934a965ba26dc7bf1f60689360bda487..33d1a6b31afec4dbeb00dcabf50c5840
              entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
              entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 97a614e2367439dbface4a258f966c0440ef965d..a2e289ac5e3d0d04b65ec3bf03bebbaad585cc24 100644
+index 2766f670f7bbe03c23552eb2ccf71d6397cfb150..5ccaa797f0f794c71c9402c3b440c681defd0952 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1153,6 +1153,14 @@ public class CraftEventFactory {
+@@ -1157,6 +1157,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index e290b2ac51..09c8255560 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index dba0bc7dc8fd1993f45716a398b1ccf52d3d868b..b3433ce9c722bdab81848a6c2d121ca510c48509 100644
+index 7942338e300cf5c70cb52e6ddce32f8cf9163c27..63b57d47d7dbb7a8a655b1447241e20c67a3f9c2 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -247,7 +247,7 @@ public class ExperienceOrb extends Entity {
@@ -18,10 +18,10 @@ index dba0bc7dc8fd1993f45716a398b1ccf52d3d868b..b3433ce9c722bdab81848a6c2d121ca5
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a2e289ac5e3d0d04b65ec3bf03bebbaad585cc24..09a5c7a95f87e35c43d07974f5884e28833f9777 100644
+index 5ccaa797f0f794c71c9402c3b440c681defd0952..e74335de3685e90abc97fbefe91a0c5837ed0551 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1112,6 +1112,17 @@ public class CraftEventFactory {
+@@ -1116,6 +1116,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch
index 150e864a9e..8c5308cbe4 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0114-Add-ProjectileCollideEvent.patch
@@ -87,10 +87,10 @@ index 88181c59e604ba3b132b9e695cef5eaf5b836029..94d09b05737679b133ec462815b010b1
  
          this.checkInsideBlocks();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 09a5c7a95f87e35c43d07974f5884e28833f9777..e00f87e4a9384c60e5fe4c33a9f27541366ae81b 100644
+index e74335de3685e90abc97fbefe91a0c5837ed0551..b267e220e0b8fcd69f1b672db27273e76a46731a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1256,6 +1256,16 @@ public class CraftEventFactory {
+@@ -1260,6 +1260,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 6b19100733..59fc5fcbf3 100644
--- a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index bd0f3295932220e88dfd72b1719651b132a325f9..def35ca400cb315a9eea035026412b69ec51b1a8 100644
+index 3869aae0bcf3d4fb53009b314f8b869198e26ce5..58882569595a21b0499921dfddcbc9d01248cf1c 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -91,6 +91,7 @@ public class ArmorStand extends LivingEntity {
@@ -16,7 +16,7 @@ index bd0f3295932220e88dfd72b1719651b132a325f9..def35ca400cb315a9eea035026412b69
  
      public ArmorStand(EntityType<? extends ArmorStand> type, Level world) {
          super(type, world);
-@@ -925,4 +926,13 @@ public class ArmorStand extends LivingEntity {
+@@ -926,4 +927,13 @@ public class ArmorStand extends LivingEntity {
      public boolean canBeSeenByAnyone() {
          return !this.isInvisible() && !this.isMarker();
      }
diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 40dfa4dd65..9efb14a80f 100644
--- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,7 +21,7 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef3bfeb43e 100644
+index 63b57d47d7dbb7a8a655b1447241e20c67a3f9c2..0c19aa68dc444373bf1a9bd3b349d12df7d8dd9d 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -37,13 +37,65 @@ public class ExperienceOrb extends Entity {
@@ -131,10 +131,10 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 707a7fc783973d4806e10f59eb6202e408991223..45b76070d6a178ffb5cd378cbeb12342eab4f360 100644
+index 37076ea1f07108db37dd67f5f7d4466534994a9f..3e2dd4a1fb1e2a99da88d392457d92eb9087c430 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1723,7 +1723,8 @@ public abstract class LivingEntity extends Entity {
+@@ -1726,7 +1726,8 @@ public abstract class LivingEntity extends Entity {
      protected void dropExperience() {
          // CraftBukkit start - Update getExpReward() above if the removed if() changes!
          if (true && !(this instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon)) { // CraftBukkit - SPIGOT-2420: Special case ender dragon will drop the xp over time
diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/server/0129-Cap-Entity-Collisions.patch
index 6aa10f4072..53b175e41e 100644
--- a/patches/server/0129-Cap-Entity-Collisions.patch
+++ b/patches/server/0129-Cap-Entity-Collisions.patch
@@ -24,10 +24,10 @@ index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf649
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 45b76070d6a178ffb5cd378cbeb12342eab4f360..e711c02279ff48e76038a6281bbe8060e34d900b 100644
+index 3e2dd4a1fb1e2a99da88d392457d92eb9087c430..2e006451768f08998dfae3999f28429ef0b491af 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3286,8 +3286,11 @@ public abstract class LivingEntity extends Entity {
+@@ -3289,8 +3289,11 @@ public abstract class LivingEntity extends Entity {
                  }
              }
  
diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/server/0131-Do-not-let-armorstands-drown.patch
index 948bf3a496..a248b55fa2 100644
--- a/patches/server/0131-Do-not-let-armorstands-drown.patch
+++ b/patches/server/0131-Do-not-let-armorstands-drown.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index def35ca400cb315a9eea035026412b69ec51b1a8..ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559 100644
+index 58882569595a21b0499921dfddcbc9d01248cf1c..4398a33df4e0f0e9d28c51af3d48e41d957d7c9e 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -934,5 +934,12 @@ public class ArmorStand extends LivingEntity {
+@@ -935,5 +935,12 @@ public class ArmorStand extends LivingEntity {
              super.move(type, movement);
          }
      }
diff --git a/patches/server/0163-Add-PlayerArmorChangeEvent.patch b/patches/server/0163-Add-PlayerArmorChangeEvent.patch
index fe028a5f3e..cb61894887 100644
--- a/patches/server/0163-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0163-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e711c02279ff48e76038a6281bbe8060e34d900b..2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2 100644
+index 2e006451768f08998dfae3999f28429ef0b491af..b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index e711c02279ff48e76038a6281bbe8060e34d900b..2eb002d6231dcb2a4bf4b1eb96ca4ecd
  import com.google.common.base.Objects;
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableMap;
-@@ -2999,6 +3000,13 @@ public abstract class LivingEntity extends Entity {
+@@ -3002,6 +3003,13 @@ public abstract class LivingEntity extends Entity {
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
  
              if (!ItemStack.matches(itemstack1, itemstack)) {
diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
index 4adad63f75..01a9b6f752 100644
--- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dd86f2055af67f35a5d265b78e99b12e7b7926ad..9f959cbb6e8685dacccec1d8df68d4a8a94ab81e 100644
+index 6dd5deecd404a3b9858e63da6837caf2d5d382f0..a08c03bb984d27ded2979353f207693fb79d4256 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1444,7 +1444,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -32,7 +32,7 @@ index dd86f2055af67f35a5d265b78e99b12e7b7926ad..9f959cbb6e8685dacccec1d8df68d4a8
 +            orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
 +
 +            int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
-+            org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, i);
++            org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i);
 +            i = event.getRepairAmount();
 +            orb.discard();
 +            if (!event.isCancelled()) {
diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0173-PreCreatureSpawnEvent.patch
index 82fc009561..69bfbb5b34 100644
--- a/patches/server/0173-PreCreatureSpawnEvent.patch
+++ b/patches/server/0173-PreCreatureSpawnEvent.patch
@@ -129,7 +129,7 @@ index ac767d107ea0d856f3f8caccfe6f79b14e933005..ffb7a0b7c1ae53e1340f2cdb7840ee2c
                          Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> {
                              entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot());
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 878fc7f57178bff0e42fd01434f0aaa2732f5a5b..ec6fcfc94b34d2b523c011b197e6484d13517c36 100644
+index c6ba7427b53398ddc8f0c942a810fad6e24561b4..08340299538f1adacddc6d5022482a5307c06f78 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -212,7 +212,13 @@ public final class NaturalSpawner {
@@ -147,7 +147,7 @@ index 878fc7f57178bff0e42fd01434f0aaa2732f5a5b..ec6fcfc94b34d2b523c011b197e6484d
                                          Mob entityinsentient = NaturalSpawner.getMobForSpawn(world, biomesettingsmobs_c.type);
  
                                          if (entityinsentient == null) {
-@@ -259,9 +265,25 @@ public final class NaturalSpawner {
+@@ -260,9 +266,25 @@ public final class NaturalSpawner {
          return squaredDistance <= 576.0D ? false : (world.getSharedSpawnPos().closerToCenterThan(new Vec3((double) pos.getX() + 0.5D, (double) pos.getY(), (double) pos.getZ() + 0.5D), 24.0D) ? false : Objects.equals(new ChunkPos(pos), chunk.getPos()) || world.isNaturalSpawningAllowed((BlockPos) pos));
      }
  
diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/server/0208-Make-shield-blocking-delay-configurable.patch
index a1c2cf0105..7908d769f8 100644
--- a/patches/server/0208-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0208-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2..3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc 100644
+index b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d..dee8ae99220c84b969be18dd7e1ef05ce088b937 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3722,12 +3722,24 @@ public abstract class LivingEntity extends Entity {
+@@ -3726,12 +3726,24 @@ public abstract class LivingEntity extends Entity {
          if (this.isUsingItem() && !this.useItem.isEmpty()) {
              Item item = this.useItem.getItem();
  
diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch
index e1f1a50195..8fffb8f4b8 100644
--- a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e172764ec 100644
+index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa1eaa243a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e
      }
  
      private boolean checkTotemDeathProtection(DamageSource source) {
-@@ -1757,6 +1757,11 @@ public abstract class LivingEntity extends Entity {
+@@ -1760,6 +1760,11 @@ public abstract class LivingEntity extends Entity {
      }
  
      public void knockback(double strength, double x, double z) {
@@ -39,7 +39,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e
          strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
          if (strength > 0.0D) {
              this.hasImpulse = true;
-@@ -1764,6 +1769,15 @@ public abstract class LivingEntity extends Entity {
+@@ -1767,6 +1772,15 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength);
  
              this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);
@@ -56,7 +56,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 6d0d194aaababd91a26dffc07f547d60eadd098e..ea836c55bad8b897e0fe0cad6d297b9b52209d69 100644
+index f0123009b27a763cee6761c46ecae354d3e54d65..8fdba296673def1e8f69d48c35b07e355a74c9a3 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1579,7 +1579,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
index e4bf599387..b85784bc57 100644
--- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
@@ -173,7 +173,7 @@ index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cf967ce377aab7fd00bd096d68ef0b66697817bf..eb6ead27924cdad9362d350e6257c5995e17b005 100644
+index 98741b2595ef9946e190dd8af4a4c07103e383b7..58a1e433b0bd7c093c964a9dfcbb7287b5988af4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1158,7 +1158,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -186,10 +186,10 @@ index cf967ce377aab7fd00bd096d68ef0b66697817bf..eb6ead27924cdad9362d350e6257c599
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e00f87e4a9384c60e5fe4c33a9f27541366ae81b..479835a1fb087e18a1098438f6a3d71cd5589001 100644
+index b267e220e0b8fcd69f1b672db27273e76a46731a..14e67b85e570e942c19f8fcafcb74c32f5f4fc37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1225,7 +1225,7 @@ public class CraftEventFactory {
+@@ -1229,7 +1229,7 @@ public class CraftEventFactory {
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
@@ -198,7 +198,7 @@ index e00f87e4a9384c60e5fe4c33a9f27541366ae81b..479835a1fb087e18a1098438f6a3d71c
          }
  
          CraftServer server = player.level.getCraftServer();
-@@ -1391,8 +1391,18 @@ public class CraftEventFactory {
+@@ -1395,8 +1395,18 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/server/0228-Vanished-players-don-t-have-rights.patch
index 51ce5f79dc..cd8b1d5888 100644
--- a/patches/server/0228-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0228-Vanished-players-don-t-have-rights.patch
@@ -99,10 +99,10 @@ index f6ea7b5929f2affec914730c92d1bde48f218acf..f4249ee3259a95b9f079a75c78ccf96a
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 479835a1fb087e18a1098438f6a3d71cd5589001..1bc3edad4fa79b2efb34e92b4af492769a8fcf83 100644
+index 14e67b85e570e942c19f8fcafcb74c32f5f4fc37..f16ab4b673f79a8f2b50caa2eefd7e55474ef28b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1261,6 +1261,14 @@ public class CraftEventFactory {
+@@ -1265,6 +1265,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
index 8c8a8d1532..7d29dc99e7 100644
--- a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0b669ee0d 100644
+index 3488c882c654a2cb7a470ed84066bcc0bbbbf9c4..f70f75867a8f03d42f240a0d007d2221269f2fdb 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -92,9 +92,16 @@ public class ArmorStand extends LivingEntity {
@@ -54,7 +54,7 @@ index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0
          CompoundTag nbttagcompound1 = nbt.getCompound("Pose");
  
          this.readPose(nbttagcompound1);
-@@ -651,7 +666,29 @@ public class ArmorStand extends LivingEntity {
+@@ -652,7 +667,29 @@ public class ArmorStand extends LivingEntity {
  
      @Override
      public void tick() {
@@ -84,7 +84,7 @@ index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0
          Rotations vector3f = (Rotations) this.entityData.get(ArmorStand.DATA_HEAD_POSE);
  
          if (!this.headPose.equals(vector3f)) {
-@@ -775,31 +812,37 @@ public class ArmorStand extends LivingEntity {
+@@ -776,31 +813,37 @@ public class ArmorStand extends LivingEntity {
      public void setHeadPose(Rotations angle) {
          this.headPose = angle;
          this.entityData.set(ArmorStand.DATA_HEAD_POSE, angle);
diff --git a/patches/server/0235-Add-TNTPrimeEvent.patch b/patches/server/0234-Add-TNTPrimeEvent.patch
index 95c3a89f2f..95c3a89f2f 100644
--- a/patches/server/0235-Add-TNTPrimeEvent.patch
+++ b/patches/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0234-Add-hand-to-bucket-events.patch b/patches/server/0234-Add-hand-to-bucket-events.patch
deleted file mode 100644
index b514aa8def..0000000000
--- a/patches/server/0234-Add-hand-to-bucket-events.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <[email protected]>
-Date: Thu, 2 Aug 2018 08:44:35 -0500
-Subject: [PATCH] Add hand to bucket events
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 0f601ad4629bda75ec90612ad27fdec9ce62f83d..425c6da0de40983b0870c9fd1b53f16b6a11c34c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -87,7 +87,7 @@ public class Cow extends Animal {
- 
-         if (itemstack.is(Items.BUCKET) && !this.isBaby()) {
-             // CraftBukkit start - Got milk?
--            org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET);
-+            org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, hand); // Paper - add enumHand
- 
-             if (event.isCancelled()) {
-                 return InteractionResult.PASS;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index bfd81531cb5f3e7335e4b75cba31371450a9e731..1935db7bd6d0976fd0bb9e482cd8044b79b0a452 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -199,7 +199,7 @@ public class Goat extends Animal {
- 
-         if (itemstack.is(Items.BUCKET) && !this.isBaby()) {
-             // CraftBukkit start - Got milk?
--            org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET);
-+            org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, hand); // Paper - add enumHand
- 
-             if (event.isCancelled()) {
-                 return InteractionResult.PASS;
-diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 90c8ef9995e834c245cc33f5e59ffdabd5a0b8cd..7c6c928da4e0f3ac54fa9b9ddce7b0e0bf3cce4b 100644
---- a/src/main/java/net/minecraft/world/item/BucketItem.java
-+++ b/src/main/java/net/minecraft/world/item/BucketItem.java
-@@ -71,7 +71,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-                         // CraftBukkit start
-                         ItemStack dummyFluid = ifluidsource.pickupBlock(DummyGeneratorAccess.INSTANCE, blockposition, iblockdata);
-                         if (dummyFluid.isEmpty()) return InteractionResultHolder.fail(itemstack); // Don't fire event if the bucket won't be filled.
--                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) world, user, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem());
-+                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) world, user, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem(), hand); // Paper - add enumhand
- 
-                         if (event.isCancelled()) {
-                             ((ServerPlayer) user).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager)
-@@ -102,7 +102,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-                     iblockdata = world.getBlockState(blockposition);
-                     BlockPos blockposition2 = iblockdata.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER ? blockposition : blockposition1;
- 
--                    if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack)) { // CraftBukkit
-+                    if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack, hand)) { // CraftBukkit // Paper - add enumhand
-                         this.checkExtraContent(user, world, itemstack, blockposition2);
-                         if (user instanceof ServerPlayer) {
-                             CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) user, blockposition2, itemstack);
-@@ -129,10 +129,12 @@ public class BucketItem extends Item implements DispensibleContainerItem {
- 
-     @Override
-     public boolean emptyContents(@Nullable Player player, Level world, BlockPos pos, @Nullable BlockHitResult hitResult) {
--        return this.emptyContents(player, world, pos, hitResult, null, null, null);
-+        // Paper start - add enumHand
-+        return emptyContents(player, world, pos, hitResult, null, null, null, null);
-     }
- 
--    public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack) {
-+    public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack, InteractionHand enumhand) {
-+        // Paper end
-         // CraftBukkit end
-         if (!(this.content instanceof FlowingFluid)) {
-             return false;
-@@ -145,7 +147,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
- 
-             // CraftBukkit start
-             if (flag1 && entityhuman != null) {
--                PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((ServerLevel) world, entityhuman, blockposition, clicked, enumdirection, itemstack);
-+                PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((ServerLevel) world, entityhuman, blockposition, clicked, enumdirection, itemstack, enumhand); // Paper - add enumhand
-                 if (event.isCancelled()) {
-                     ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-4238: needed when looking through entity
-                     ((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
-@@ -154,7 +156,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-             }
-             // CraftBukkit end
-             if (!flag1) {
--                return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack); // CraftBukkit
-+                return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit // Paper
-             } else if (world.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER)) {
-                 int i = blockposition.getX();
-                 int j = blockposition.getY();
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1bc3edad4fa79b2efb34e92b4af492769a8fcf83..518e44f783f5062ce53e9907501bd3a54c8014bb 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -422,6 +422,20 @@ public class CraftEventFactory {
-     }
- 
-     private static PlayerEvent getPlayerBucketEvent(boolean isFilling, ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item) {
-+        // Paper start - add enumHand
-+        return getPlayerBucketEvent(isFilling, world, who, changed, clicked, clickedFace, itemstack, item, null);
-+    }
-+
-+    public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, InteractionHand enumHand) {
-+        return (PlayerBucketEmptyEvent) getPlayerBucketEvent(false, world, who, changed, clicked, clickedFace, itemstack, Items.BUCKET, enumHand);
-+    }
-+
-+    public static PlayerBucketFillEvent callPlayerBucketFillEvent(ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemInHand, net.minecraft.world.item.Item bucket, InteractionHand enumHand) {
-+        return (PlayerBucketFillEvent) getPlayerBucketEvent(true, world, who, clicked, changed, clickedFace, itemInHand, bucket, enumHand);
-+    }
-+
-+    private static PlayerEvent getPlayerBucketEvent(boolean isFilling, ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item, InteractionHand enumHand) {
-+        // Paper end
-         Player player = (Player) who.getBukkitEntity();
-         CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
-         Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -434,10 +448,10 @@ public class CraftEventFactory {
- 
-         PlayerEvent event;
-         if (isFilling) {
--            event = new PlayerBucketFillEvent(player, block, blockClicked, blockFace, bucket, itemInHand);
-+            event = new PlayerBucketFillEvent(player, block, blockClicked, blockFace, bucket, itemInHand, enumHand == null ? null : enumHand == InteractionHand.OFF_HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); // Paper - add enumHand
-             ((PlayerBucketFillEvent) event).setCancelled(!CraftEventFactory.canBuild(world, player, changed.getX(), changed.getZ()));
-         } else {
--            event = new PlayerBucketEmptyEvent(player, block, blockClicked, blockFace, bucket, itemInHand);
-+            event = new PlayerBucketEmptyEvent(player, block, blockClicked, blockFace, bucket, itemInHand, enumHand == null ? null : enumHand == InteractionHand.OFF_HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); // Paper - add enumHand
-             ((PlayerBucketEmptyEvent) event).setCancelled(!CraftEventFactory.canBuild(world, player, changed.getX(), changed.getZ()));
-         }
- 
diff --git a/patches/server/0236-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
index c211462524..c211462524 100644
--- a/patches/server/0236-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0237-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
index 8248a48e4a..009e8580ee 100644
--- a/patches/server/0237-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 80f4dfdbc410aa3346897e2ca63272a081712b6e..d6527396939d9a1dd2f1cfb6cb66dc64fa0e5332 100644
+index 2fead19c1c4b04f94999887b196ceaee025edd99..2d1228670696224452cb432e0279456d8c5fe710 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -286,7 +286,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0238-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
index 88a7a7fd0c..88a7a7fd0c 100644
--- a/patches/server/0238-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0239-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 5183fa7c7a..44af4248a6 100644
--- a/patches/server/0239-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index ea9f536efd4c76b421f6e02f93f16fae115840d8..d1af0aca0237ee86acd86fea3255ddea
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6ad79090c0c186394f1635d420884a5b34c7c952..f85692e588c022a1f0cc5e3cde001d968eea59c8 100644
+index 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a94d05b164 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,6 +216,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0240-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
index f58b929289..672248547f 100644
--- a/patches/server/0240-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 65b9dfa62a7785b4889d8edac0000487f3fc5367..d79ac1e7a1301e3e5d4e6caecc95bf320e5203e5 100644
+index d65423b8d7b69db79de05587efba13008602f743..afce3acc552df092636b205964e06b399b7db8e2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0241-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
index af29490ae2..af29490ae2 100644
--- a/patches/server/0241-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0242-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
index a36e37c417..a36e37c417 100644
--- a/patches/server/0242-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0243-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 005af7afb2..005af7afb2 100644
--- a/patches/server/0243-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0244-Optimize-BlockPosition-helper-methods.patch b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
index 3fe5135a6b..3fe5135a6b 100644
--- a/patches/server/0244-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0245-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index e10d949eea..e10d949eea 100644
--- a/patches/server/0245-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0246-Slime-Pathfinder-Events.patch b/patches/server/0245-Slime-Pathfinder-Events.patch
index e6984e42ea..e6984e42ea 100644
--- a/patches/server/0246-Slime-Pathfinder-Events.patch
+++ b/patches/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0247-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
index 05e4b14d22..05e4b14d22 100644
--- a/patches/server/0247-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0248-Optimize-CraftBlockData-Creation.patch b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
index f069170285..f069170285 100644
--- a/patches/server/0248-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0249-Optimize-MappedRegistry.patch b/patches/server/0248-Optimize-MappedRegistry.patch
index 70684ff905..70684ff905 100644
--- a/patches/server/0249-Optimize-MappedRegistry.patch
+++ b/patches/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0250-Add-PhantomPreSpawnEvent.patch b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
index f4862ce10d..f4862ce10d 100644
--- a/patches/server/0250-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0251-Add-More-Creeper-API.patch b/patches/server/0250-Add-More-Creeper-API.patch
index 701306ca69..701306ca69 100644
--- a/patches/server/0251-Add-More-Creeper-API.patch
+++ b/patches/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0252-Inventory-removeItemAnySlot.patch b/patches/server/0251-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0252-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0253-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 2761673c5a..2761673c5a 100644
--- a/patches/server/0253-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
index 08c18ed736..b9856e2e2e 100644
--- a/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -28,10 +28,10 @@ index e98276943e1690572b8f7bc54a259aa8340bae41..c9b43d077727c22a9eca738e9a75e7f1
          switch (enumDirection) {
              case DOWN:
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 84b6c2f73e0f6f3ad3969e7d51f6617e172764ec..a6010e8ddf640a7045f95be04dfce26918d9cd3e 100644
+index 30983979f3501c693c7d1f96c47d9cfa1eaa243a..28a49c15c078b7afe1d3c9693c548f6a7b1d2f0a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3743,6 +3743,23 @@ public abstract class LivingEntity extends Entity {
+@@ -3747,6 +3747,23 @@ public abstract class LivingEntity extends Entity {
      }
  
      // Paper start
diff --git a/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 1e3495ddf8..83097c5d73 100644
--- a/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eb6ead27924cdad9362d350e6257c5995e17b005..04b329bf2a71f600debfbac193c0d1f49afff692 100644
+index 58a1e433b0bd7c093c964a9dfcbb7287b5988af4..cea4285095979f0656821e897659c7b91d237e82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2589,6 +2589,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0256-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch
index 28accbc187..ac2145d58d 100644
--- a/patches/server/0256-Improve-death-events.patch
+++ b/patches/server/0255-Improve-death-events.patch
@@ -70,7 +70,7 @@ index 1a3f9d09df6b6d8c6a84f7f62e142f341d74c6c1..645012ea3590a46773e2bb14e9cafd9e
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef91591681b 100644
+index 28a49c15c078b7afe1d3c9693c548f6a7b1d2f0a..1189ddcab5011d34a66356cde561fe7e2cecbfdd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity {
@@ -99,7 +99,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
                  }
              } else if (flag1) {
                  this.playHurtSound(source);
-@@ -1620,7 +1620,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1623,7 +1623,7 @@ public abstract class LivingEntity extends Entity {
          if (!this.isRemoved() && !this.dead) {
              Entity entity = damageSource.getEntity();
              LivingEntity entityliving = this.getKillCredit();
@@ -108,7 +108,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
              if (this.deathScore >= 0 && entityliving != null) {
                  entityliving.awardKillScore(this, this.deathScore, damageSource);
              }
-@@ -1632,20 +1632,53 @@ public abstract class LivingEntity extends Entity {
+@@ -1635,20 +1635,53 @@ public abstract class LivingEntity extends Entity {
              if (!this.level.isClientSide && this.hasCustomName()) {
                  if (org.spigotmc.SpigotConfig.logNamedDeaths) LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot
              }
@@ -168,7 +168,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
          }
      }
  
-@@ -1653,7 +1686,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1656,7 +1689,7 @@ public abstract class LivingEntity extends Entity {
          if (!this.level.isClientSide) {
              boolean flag = false;
  
@@ -177,7 +177,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
                  if (this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
                      BlockPos blockposition = this.blockPosition();
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
-@@ -1682,7 +1715,11 @@ public abstract class LivingEntity extends Entity {
+@@ -1685,7 +1718,11 @@ public abstract class LivingEntity extends Entity {
          }
      }
  
@@ -190,7 +190,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
          Entity entity = source.getEntity();
          int i;
  
-@@ -1697,18 +1734,27 @@ public abstract class LivingEntity extends Entity {
+@@ -1700,18 +1737,27 @@ public abstract class LivingEntity extends Entity {
          this.dropEquipment(); // CraftBukkit - from below
          if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
              this.dropFromLootTable(source, flag);
@@ -220,7 +220,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9
      // CraftBukkit start
      public int getExpReward() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ea836c55bad8b897e0fe0cad6d297b9b52209d69..37102e8cdaeb558e80889ff553656f14eaaeb650 100644
+index 8fdba296673def1e8f69d48c35b07e355a74c9a3..7b3ce253e76cf411768af4961abd148f242f4bb4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1018,7 +1018,13 @@ public abstract class Mob extends LivingEntity {
@@ -296,10 +296,10 @@ index c47884bab387647d99ed842b46f1c078ef9b6995..a3f3e06679cef10f50346e9cc6672ec9
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index f94a74728bd7c02a7f8245c92e7916f0b669ee0d..cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13 100644
+index f70f75867a8f03d42f240a0d007d2221269f2fdb..e463ae13ce6f65675c2b6d553ecf91db5a047dbc 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -752,7 +752,8 @@ public class ArmorStand extends LivingEntity {
+@@ -753,7 +753,8 @@ public class ArmorStand extends LivingEntity {
  
      @Override
      public void kill() {
@@ -310,7 +310,7 @@ index f94a74728bd7c02a7f8245c92e7916f0b669ee0d..cd54fa8f7bbcb6036e90f4ef7cdc01d7
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04b329bf2a71f600debfbac193c0d1f49afff692..8676067be5cbb149a6a50a9582a22b69ebcfb61b 100644
+index cea4285095979f0656821e897659c7b91d237e82..0e9538a433e8ef721f29cc7b9f8fac914b876956 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2153,7 +2153,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -330,10 +330,10 @@ index 04b329bf2a71f600debfbac193c0d1f49afff692..8676067be5cbb149a6a50a9582a22b69
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062ddba2738f 100644
+index f16ab4b673f79a8f2b50caa2eefd7e55474ef28b..b86ba1b6e49128f50d3940708ec3b59580cbfde8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -816,9 +816,16 @@ public class CraftEventFactory {
+@@ -806,9 +806,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -350,7 +350,7 @@ index 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062d
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -835,8 +842,15 @@ public class CraftEventFactory {
+@@ -825,8 +832,15 @@ public class CraftEventFactory {
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage, stringDeathMessage); // Paper - Adventure
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
@@ -366,7 +366,7 @@ index 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062d
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -853,6 +867,31 @@ public class CraftEventFactory {
+@@ -843,6 +857,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
index e03ccbcd5a..e03ccbcd5a 100644
--- a/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0258-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch
index 517909c69b..517909c69b 100644
--- a/patches/server/0258-Mob-Pathfinding-API.patch
+++ b/patches/server/0257-Mob-Pathfinding-API.patch
diff --git a/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 4ae690f9d8..4ae690f9d8 100644
--- a/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8e59eff59d..8e59eff59d 100644
--- a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 12a3938c2d..12a3938c2d 100644
--- a/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 7c943a7345..7ae2338341 100644
--- a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index ec6fcfc94b34d2b523c011b197e6484d13517c36..31b330e140d71d9b017e68eab531a59d4f2ed9a2 100644
+index 08340299538f1adacddc6d5022482a5307c06f78..ac5fa1d9e4e8f9057e3c3780fda3660bb7795295 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -169,9 +169,9 @@ public final class NaturalSpawner {
diff --git a/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
index ef1f41e68e..ef1f41e68e 100644
--- a/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
index d823af9154..d823af9154 100644
--- a/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0265-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch
index 3c2db99373..3c2db99373 100644
--- a/patches/server/0265-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0264-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0266-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch
index 388accb3aa..388accb3aa 100644
--- a/patches/server/0266-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0265-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0267-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
index a3aff98067..a3aff98067 100644
--- a/patches/server/0267-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0268-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch
index ad93f9fbae..ad93f9fbae 100644
--- a/patches/server/0268-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0267-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
index 938905a7ca..2842a11a1c 100644
--- a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 15af85ec11e40337338696c51083aef91591681b..369b2d92dbae896824b2e54cf30f8a607c43d451 100644
+index 1189ddcab5011d34a66356cde561fe7e2cecbfdd..8155421080761734c519042e1c24dd2e765d6e75 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
@@ -16,7 +16,7 @@ index 15af85ec11e40337338696c51083aef91591681b..369b2d92dbae896824b2e54cf30f8a60
  import net.minecraft.world.phys.HitResult;
  import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.scores.PlayerTeam;
-@@ -3806,6 +3807,38 @@ public abstract class LivingEntity extends Entity {
+@@ -3810,6 +3811,38 @@ public abstract class LivingEntity extends Entity {
          return level.clip(raytrace);
      }
  
diff --git a/patches/server/0270-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch
index 1d2375d79d..1d2375d79d 100644
--- a/patches/server/0270-Add-sun-related-API.patch
+++ b/patches/server/0269-Add-sun-related-API.patch
diff --git a/patches/server/0271-Turtle-API.patch b/patches/server/0270-Turtle-API.patch
index 1bc6544713..1bc6544713 100644
--- a/patches/server/0271-Turtle-API.patch
+++ b/patches/server/0270-Turtle-API.patch
diff --git a/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
index f5bd1e340c..f5bd1e340c 100644
--- a/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index b766300549..b766300549 100644
--- a/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/server/0273-Add-more-Witch-API.patch
index 4fdcae61a9..4fdcae61a9 100644
--- a/patches/server/0274-Add-more-Witch-API.patch
+++ b/patches/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
index ec62c27d6f..ec62c27d6f 100644
--- a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
index bbb6841159..bbb6841159 100644
--- a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
index 9eb908fdd0..9eb908fdd0 100644
--- a/patches/server/0277-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 40ed8205d2..fdb06e3b52 100644
--- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -58,7 +58,7 @@ index 336a26733b5bf73455f8ec10347c1e08b8e866f7..4fce18c52c8144460ebf0c1e336dce71
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d79ac1e7a1301e3e5d4e6caecc95bf320e5203e5..2860bdf9d155b694fe605886a9f99cd956559f3c 100644
+index afce3acc552df092636b205964e06b399b7db8e2..5e1a0ab40d9d03844c6e0b962bb15d3b4b40d229 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0280-Optimize-World-Time-Updates.patch b/patches/server/0279-Optimize-World-Time-Updates.patch
index 0f02b1a821..0f02b1a821 100644
--- a/patches/server/0280-Optimize-World-Time-Updates.patch
+++ b/patches/server/0279-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0281-Restore-custom-InventoryHolder-support.patch b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
index b6b1612284..b6b1612284 100644
--- a/patches/server/0281-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
index 9fde4a8e53..9fde4a8e53 100644
--- a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
index a527364310..a527364310 100644
--- a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
index c43ce48361..c43ce48361 100644
--- a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0285-Make-the-default-permission-message-configurable.patch b/patches/server/0284-Make-the-default-permission-message-configurable.patch
index fd099d736c..fd099d736c 100644
--- a/patches/server/0285-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0284-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
index dd9d69d953..dd9d69d953 100644
--- a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
index 9dfbdc7448..9dfbdc7448 100644
--- a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0288-force-entity-dismount-during-teleportation.patch b/patches/server/0287-force-entity-dismount-during-teleportation.patch
index 60fb79c846..dec93561ac 100644
--- a/patches/server/0288-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0287-force-entity-dismount-during-teleportation.patch
@@ -93,10 +93,10 @@ index 0e632f9eabd0d55a4eaacff54abaf637660528dd..e6fa82b942ec176288aaca080e3d9c8d
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 369b2d92dbae896824b2e54cf30f8a607c43d451..1b907ca310ee217c9496f1b9a63d9cc694c177f0 100644
+index 8155421080761734c519042e1c24dd2e765d6e75..4e490415e31fcd1a5d780a085ac916cbfc54bb12 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3404,9 +3404,15 @@ public abstract class LivingEntity extends Entity {
+@@ -3407,9 +3407,15 @@ public abstract class LivingEntity extends Entity {
  
      @Override
      public void stopRiding() {
diff --git a/patches/server/0289-Add-more-Zombie-API.patch b/patches/server/0288-Add-more-Zombie-API.patch
index d4683e84c2..d4683e84c2 100644
--- a/patches/server/0289-Add-more-Zombie-API.patch
+++ b/patches/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0290-Book-Size-Limits.patch b/patches/server/0289-Book-Size-Limits.patch
index 406e5f0f43..406e5f0f43 100644
--- a/patches/server/0290-Book-Size-Limits.patch
+++ b/patches/server/0289-Book-Size-Limits.patch
diff --git a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
index eade64b652..eade64b652 100644
--- a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
index 0eadb94123..0eadb94123 100644
--- a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 44b74e5833..7dc332cd8a 100644
--- a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03de
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8676067be5cbb149a6a50a9582a22b69ebcfb61b..1b708fc4990e92815f2ad56aba52bf85e5ddea7f 100644
+index 0e9538a433e8ef721f29cc7b9f8fac914b876956..e31de5e408b01c2e67d2feec4020796fa74b24d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -174,6 +174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 699bb74caa..699bb74caa 100644
--- a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index 93b2e112ed..485c11dffb 100644
--- a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1b708fc4990e92815f2ad56aba52bf85e5ddea7f..aebe500d3d0947536d19286195a0c7f5798e862e 100644
+index e31de5e408b01c2e67d2feec4020796fa74b24d8..cdc4ef88c8369b3bd1c607ff5301fc1b04ec4582 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2636,6 +2636,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0296-BlockDestroyEvent.patch b/patches/server/0295-BlockDestroyEvent.patch
index 507652f6ac..507652f6ac 100644
--- a/patches/server/0296-BlockDestroyEvent.patch
+++ b/patches/server/0295-BlockDestroyEvent.patch
diff --git a/patches/server/0297-Async-command-map-building.patch b/patches/server/0296-Async-command-map-building.patch
index 44b58ce867..0e9bd3560b 100644
--- a/patches/server/0297-Async-command-map-building.patch
+++ b/patches/server/0296-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 2bf67468a6c745bc6243c65210477ba129bfcb07..c4315531f93f4ed68b4621157b025728
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f78117189ed56acb9c49450825855dd03ab81ae..0a6a91aba56554ec813fffacbdd8e30591eb1602 100644
+index 44b70cef867093979e5481bee4d60676bdca6d47..acc9f22a1284cea2e29f3616598f8388f0a0e6f6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -889,6 +889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0298-Implement-Brigadier-Mojang-API.patch b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
index f8a40cc922..f8a40cc922 100644
--- a/patches/server/0298-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0300-Limit-Client-Sign-length-more.patch b/patches/server/0299-Limit-Client-Sign-length-more.patch
index f357b73ac8..f357b73ac8 100644
--- a/patches/server/0300-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0299-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 0d3af0b6f8..0d3af0b6f8 100644
--- a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 0d594b9746..0d594b9746 100644
--- a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
index bcaddcfede..bcaddcfede 100644
--- a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 6c82126b25..6c82126b25 100644
--- a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 90510e0728..90510e0728 100644
--- a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0306-Entity-getEntitySpawnReason.patch b/patches/server/0305-Entity-getEntitySpawnReason.patch
index e43c04d70a..8b9a1f882b 100644
--- a/patches/server/0306-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0305-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f85692e588c022a1f0cc5e3cde001d968eea59c8..91b0bc73534bec202ba39d6a8386248db1b4da30 100644
+index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe9644a1ce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1250,6 +1250,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
index 3ddc7c5d06..3ddc7c5d06 100644
--- a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0308-Fire-event-on-GS4-query.patch b/patches/server/0307-Fire-event-on-GS4-query.patch
index 445725e8b8..445725e8b8 100644
--- a/patches/server/0308-Fire-event-on-GS4-query.patch
+++ b/patches/server/0307-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
index d4f88880bf..d4f88880bf 100644
--- a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 94aa72db11..94aa72db11 100644
--- a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0311-Server-Tick-Events.patch b/patches/server/0310-Server-Tick-Events.patch
index 5feb5afd52..5feb5afd52 100644
--- a/patches/server/0311-Server-Tick-Events.patch
+++ b/patches/server/0310-Server-Tick-Events.patch
diff --git a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
index 9f5f2c75f1..9f5f2c75f1 100644
--- a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
index 2aea08c36b..2aea08c36b 100644
--- a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0314-Add-Heightmap-API.patch b/patches/server/0313-Add-Heightmap-API.patch
index 2f3dd5b25e..2f3dd5b25e 100644
--- a/patches/server/0314-Add-Heightmap-API.patch
+++ b/patches/server/0313-Add-Heightmap-API.patch
diff --git a/patches/server/0315-Mob-Spawner-API-Enhancements.patch b/patches/server/0314-Mob-Spawner-API-Enhancements.patch
index 0947d35c6f..0947d35c6f 100644
--- a/patches/server/0315-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0314-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
index 1b53a26930..1b53a26930 100644
--- a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8f80e7c151..8f80e7c151 100644
--- a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0318-Implement-CraftBlockSoundGroup.patch b/patches/server/0317-Implement-CraftBlockSoundGroup.patch
index a62be7b054..a62be7b054 100644
--- a/patches/server/0318-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0317-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0318-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 15997374b4..700270f158 100644
--- a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0318-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cfdaf510f8a1ff5bd31f8bc2c60b7b63041a3125..e05d17f96d70ff909f2b37b8390ddd112115fcf3 100644
+index f9a96a11764b66709a0d74122f9ecc06d0365a93..d6ca6ef7262e25620aceda589d21363193c70310 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -729,31 +729,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -64,7 +64,7 @@ index cfdaf510f8a1ff5bd31f8bc2c60b7b63041a3125..e05d17f96d70ff909f2b37b8390ddd11
          // CraftBukkit start
          // this.updateMobSpawningFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 91b0bc73534bec202ba39d6a8386248db1b4da30..c998741c3b84829590a555f9ed53f0b379b6e4d7 100644
+index 84eeb8787c389a3c66b23d567f6c2ebe9644a1ce..a9acb6bd32609489e7442188209f3b7c771eb52f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
diff --git a/patches/server/0320-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0319-Allow-Saving-of-Oversized-Chunks.patch
index d1923d7fc8..d1923d7fc8 100644
--- a/patches/server/0320-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0319-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0321-Expose-the-internal-current-tick.patch b/patches/server/0320-Expose-the-internal-current-tick.patch
index d4a0f4b4f8..d4a0f4b4f8 100644
--- a/patches/server/0321-Expose-the-internal-current-tick.patch
+++ b/patches/server/0320-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0322-Fix-World-isChunkGenerated-calls.patch b/patches/server/0321-Fix-World-isChunkGenerated-calls.patch
index 973a7c6ae7..973a7c6ae7 100644
--- a/patches/server/0322-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0321-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0323-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0322-Show-blockstate-location-if-we-failed-to-read-it.patch
index f593178909..f593178909 100644
--- a/patches/server/0323-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0322-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0324-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0323-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a181d9b9ad..564ab73bbf 100644
--- a/patches/server/0324-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0323-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 31b330e140d71d9b017e68eab531a59d4f2ed9a2..b4098068e674b639e82c07e5d60e4e2120b4305b 100644
+index ac5fa1d9e4e8f9057e3c3780fda3660bb7795295..eb4d06cb115f9b923b0441c341523d0df0392049 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -87,6 +87,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0325-Configurable-projectile-relative-velocity.patch b/patches/server/0324-Configurable-projectile-relative-velocity.patch
index 024876f999..024876f999 100644
--- a/patches/server/0325-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0324-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0326-offset-item-frame-ticking.patch b/patches/server/0325-offset-item-frame-ticking.patch
index d20777b4c1..d20777b4c1 100644
--- a/patches/server/0326-offset-item-frame-ticking.patch
+++ b/patches/server/0325-offset-item-frame-ticking.patch
diff --git a/patches/server/0327-Fix-MC-158900.patch b/patches/server/0326-Fix-MC-158900.patch
index 02f255d75a..02f255d75a 100644
--- a/patches/server/0327-Fix-MC-158900.patch
+++ b/patches/server/0326-Fix-MC-158900.patch
diff --git a/patches/server/0328-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0327-Prevent-consuming-the-wrong-itemstack.patch
index 6074727c03..299ef07206 100644
--- a/patches/server/0328-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0327-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1b907ca310ee217c9496f1b9a63d9cc694c177f0..df35685a016376fa056a8ecbfda2c01b38350b3c 100644
+index 4e490415e31fcd1a5d780a085ac916cbfc54bb12..b85b98aaa1148c23232a633447c815003373c7c3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3621,9 +3621,14 @@ public abstract class LivingEntity extends Entity {
+@@ -3624,9 +3624,14 @@ public abstract class LivingEntity extends Entity {
      }
  
      public void startUsingItem(InteractionHand hand) {
@@ -24,7 +24,7 @@ index 1b907ca310ee217c9496f1b9a63d9cc694c177f0..df35685a016376fa056a8ecbfda2c01b
              this.useItem = itemstack;
              this.useItemRemaining = itemstack.getUseDuration();
              if (!this.level.isClientSide) {
-@@ -3703,6 +3708,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3706,6 +3711,7 @@ public abstract class LivingEntity extends Entity {
                  this.releaseUsingItem();
              } else {
                  if (!this.useItem.isEmpty() && this.isUsingItem()) {
@@ -32,7 +32,7 @@ index 1b907ca310ee217c9496f1b9a63d9cc694c177f0..df35685a016376fa056a8ecbfda2c01b
                      this.triggerItemUseEffects(this.useItem, 16);
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
-@@ -3737,8 +3743,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3741,8 +3747,8 @@ public abstract class LivingEntity extends Entity {
                      }
  
                      this.stopUsingItem();
diff --git a/patches/server/0329-Dont-send-unnecessary-sign-update.patch b/patches/server/0328-Dont-send-unnecessary-sign-update.patch
index 4d63dfa58a..4d63dfa58a 100644
--- a/patches/server/0329-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0328-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0330-Add-option-to-disable-pillager-patrols.patch b/patches/server/0329-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0330-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0329-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0331-Flat-bedrock-generator-settings.patch b/patches/server/0330-Flat-bedrock-generator-settings.patch
index a234199fa8..a234199fa8 100644
--- a/patches/server/0331-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0330-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0332-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0331-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index ea3c47b7b2..ea3c47b7b2 100644
--- a/patches/server/0332-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0331-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0333-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0332-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 44844fef0d..44844fef0d 100644
--- a/patches/server/0333-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0332-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0334-Duplicate-UUID-Resolve-Option.patch b/patches/server/0333-Duplicate-UUID-Resolve-Option.patch
index 1bdfb97dc5..1bdfb97dc5 100644
--- a/patches/server/0334-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0333-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0335-Optimize-Hoppers.patch b/patches/server/0334-Optimize-Hoppers.patch
index e390a98062..e390a98062 100644
--- a/patches/server/0335-Optimize-Hoppers.patch
+++ b/patches/server/0334-Optimize-Hoppers.patch
diff --git a/patches/server/0336-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0335-PlayerDeathEvent-shouldDropExperience.patch
index d97c9ef24c..d97c9ef24c 100644
--- a/patches/server/0336-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0335-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0337-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0336-Prevent-bees-loading-chunks-checking-hive-position.patch
index 3e8d451777..3e8d451777 100644
--- a/patches/server/0337-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0336-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0338-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0337-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0338-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0337-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0339-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0338-Guard-against-serializing-mismatching-chunk-coordina.patch
index 7018c6fabf..7018c6fabf 100644
--- a/patches/server/0339-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0338-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0340-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0339-Optimise-IEntityAccess-getPlayerByUUID.patch
index 7f70d29289..d35f424d78 100644
--- a/patches/server/0340-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0339-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c998741c3b84829590a555f9ed53f0b379b6e4d7..cdb04f32d61590a2a23903de26bab0a4b334569d 100644
+index a9acb6bd32609489e7442188209f3b7c771eb52f..faee1edda215fa72f5b7e1bdbbeb01004d019b0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -423,6 +423,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0341-Fix-items-not-falling-correctly.patch b/patches/server/0340-Fix-items-not-falling-correctly.patch
index 559c7d740b..559c7d740b 100644
--- a/patches/server/0341-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0340-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0342-Lag-compensate-eating.patch b/patches/server/0341-Lag-compensate-eating.patch
index 2619ab0fc9..7a36d29de2 100644
--- a/patches/server/0342-Lag-compensate-eating.patch
+++ b/patches/server/0341-Lag-compensate-eating.patch
@@ -7,10 +7,10 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab0e85c69a 100644
+index b85b98aaa1148c23232a633447c815003373c7c3..345b2d91cd7ac1746fb70bf28b596cce6746a693 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3564,6 +3564,11 @@ public abstract class LivingEntity extends Entity {
+@@ -3567,6 +3567,11 @@ public abstract class LivingEntity extends Entity {
          return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
      }
  
@@ -22,7 +22,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab
      private void updatingUsingItem() {
          if (this.isUsingItem()) {
              if (ItemStack.isSameIgnoreDurability(this.getItemInHand(this.getUsedItemHand()), this.useItem)) {
-@@ -3581,8 +3586,12 @@ public abstract class LivingEntity extends Entity {
+@@ -3584,8 +3589,12 @@ public abstract class LivingEntity extends Entity {
          if (this.shouldTriggerItemUseEffects()) {
              this.triggerItemUseEffects(stack, 5);
          }
@@ -37,7 +37,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab
              this.completeUsingItem();
          }
  
-@@ -3630,7 +3639,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3633,7 +3642,10 @@ public abstract class LivingEntity extends Entity {
  
          if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag
              this.useItem = itemstack;
@@ -49,7 +49,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab
              if (!this.level.isClientSide) {
                  this.setLivingEntityFlag(1, true);
                  this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND);
-@@ -3655,7 +3667,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3658,7 +3670,10 @@ public abstract class LivingEntity extends Entity {
                  }
              } else if (!this.isUsingItem() && !this.useItem.isEmpty()) {
                  this.useItem = ItemStack.EMPTY;
@@ -61,7 +61,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab
              }
          }
  
-@@ -3788,7 +3803,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3792,7 +3807,10 @@ public abstract class LivingEntity extends Entity {
          }
  
          this.useItem = ItemStack.EMPTY;
diff --git a/patches/server/0343-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch
index 952f1fc45d..952f1fc45d 100644
--- a/patches/server/0343-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 448854642c..448854642c 100644
--- a/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0345-Add-effect-to-block-break-naturally.patch b/patches/server/0344-Add-effect-to-block-break-naturally.patch
index b911824bb1..b911824bb1 100644
--- a/patches/server/0345-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0344-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0346-Entity-Activation-Range-2.0.patch b/patches/server/0345-Entity-Activation-Range-2.0.patch
index c223b23f30..a17d561fe8 100644
--- a/patches/server/0346-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0345-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cdb04f32d61590a2a23903de26bab0a4b334569d..28922059f1a58ae98282ab59b0a9e9014127b12a 100644
+index faee1edda215fa72f5b7e1bdbbeb01004d019b0d..4a06da72c8b769c683e9eb03817bd9381a0cf099 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -144,7 +144,7 @@ index fa128e7f8089339f932e19edf95a8d5c0cc14046..c5b1d2e4b577a3f4ad352dc6a8436c04
              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 37102e8cdaeb558e80889ff553656f14eaaeb650..d7b137a84deea68c75ee0b3c99b089b8dff25947 100644
+index 7b3ce253e76cf411768af4961abd148f242f4bb4..2ae973d77d0b088cf7dc7a2338b8b7461e585dca 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -210,6 +210,19 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0347-Increase-Light-Queue-Size.patch b/patches/server/0346-Increase-Light-Queue-Size.patch
index d6d29e6daa..280ab17dc9 100644
--- a/patches/server/0347-Increase-Light-Queue-Size.patch
+++ b/patches/server/0346-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b81a1e63205011c3f968b29daeb0180ded02b629..836d01ec14f37cc83807a30eda9a1dd7d209dbf6 100644
+index aa52b644b7af9261fdec06b29b7daa7ad8f89b3a..668d7479bb9a56f710ead272166abd615b9463cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0348-Anti-Xray.patch b/patches/server/0347-Anti-Xray.patch
index 73faf243e0..73faf243e0 100644
--- a/patches/server/0348-Anti-Xray.patch
+++ b/patches/server/0347-Anti-Xray.patch
diff --git a/patches/server/0349-Implement-alternative-item-despawn-rate.patch b/patches/server/0348-Implement-alternative-item-despawn-rate.patch
index db8d53f699..db8d53f699 100644
--- a/patches/server/0349-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0348-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0350-Tracking-Range-Improvements.patch b/patches/server/0349-Tracking-Range-Improvements.patch
index 8a6f1b8071..8a6f1b8071 100644
--- a/patches/server/0350-Tracking-Range-Improvements.patch
+++ b/patches/server/0349-Tracking-Range-Improvements.patch
diff --git a/patches/server/0351-Fix-items-vanishing-through-end-portal.patch b/patches/server/0350-Fix-items-vanishing-through-end-portal.patch
index d3fd369c6d..d3fd369c6d 100644
--- a/patches/server/0351-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0350-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0352-implement-optional-per-player-mob-spawns.patch b/patches/server/0351-implement-optional-per-player-mob-spawns.patch
index 04f628363c..b75773f8f5 100644
--- a/patches/server/0352-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0351-implement-optional-per-player-mob-spawns.patch
@@ -386,7 +386,7 @@ index 9cae5379d60c8d20ae6966850f7f13640742f9b7..f2808d62c15c586dff0313e6d27ef92d
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index b4098068e674b639e82c07e5d60e4e2120b4305b..fa23e9c476d4edc6176d8b8a6cb13c52d2f66a87 100644
+index eb4d06cb115f9b923b0441c341523d0df0392049..9fdaf0aecb3c850be63ae9aae0879cb5584c5472 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -69,6 +69,12 @@ public final class NaturalSpawner {
@@ -519,7 +519,7 @@ index b4098068e674b639e82c07e5d60e4e2120b4305b..fa23e9c476d4edc6176d8b8a6cb13c52
                                          }
  
                                          entityinsentient.moveTo(d0, (double) i, d1, world.random.nextFloat() * 360.0F, 0.0F);
-@@ -241,10 +288,15 @@ public final class NaturalSpawner {
+@@ -242,10 +289,15 @@ public final class NaturalSpawner {
                                                  ++j;
                                                  ++k1;
                                                  runner.run(entityinsentient, chunk);
@@ -537,7 +537,7 @@ index b4098068e674b639e82c07e5d60e4e2120b4305b..fa23e9c476d4edc6176d8b8a6cb13c52
                                              }
  
                                              if (entityinsentient.isMaxGroupSizeReached(k1)) {
-@@ -266,6 +318,7 @@ public final class NaturalSpawner {
+@@ -267,6 +319,7 @@ public final class NaturalSpawner {
              }
  
          }
@@ -545,7 +545,7 @@ index b4098068e674b639e82c07e5d60e4e2120b4305b..fa23e9c476d4edc6176d8b8a6cb13c52
      }
  
      private static boolean isRightDistanceToPlayerAndSpawnPoint(ServerLevel world, ChunkAccess chunk, BlockPos.MutableBlockPos pos, double squaredDistance) {
-@@ -551,7 +604,7 @@ public final class NaturalSpawner {
+@@ -552,7 +605,7 @@ public final class NaturalSpawner {
              MobCategory enumcreaturetype = entitytypes.getCategory();
  
              this.mobCategoryCounts.addTo(enumcreaturetype, 1);
@@ -554,7 +554,7 @@ index b4098068e674b639e82c07e5d60e4e2120b4305b..fa23e9c476d4edc6176d8b8a6cb13c52
          }
  
          public int getSpawnableChunkCount() {
-@@ -567,6 +620,7 @@ public final class NaturalSpawner {
+@@ -568,6 +621,7 @@ public final class NaturalSpawner {
              int i = limit * this.spawnableChunkCount / NaturalSpawner.MAGIC_NUMBER;
              // CraftBukkit end
  
diff --git a/patches/server/0353-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0352-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 2b398af935..2b398af935 100644
--- a/patches/server/0353-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0352-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0354-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0353-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 04dd0e4e33..04dd0e4e33 100644
--- a/patches/server/0354-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0353-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0355-Add-debug-for-sync-chunk-loads.patch b/patches/server/0354-Add-debug-for-sync-chunk-loads.patch
index c26522f512..9e6db8a2a9 100644
--- a/patches/server/0355-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0354-Add-debug-for-sync-chunk-loads.patch
@@ -310,7 +310,7 @@ index f3375712ae25ef1503a030b3059477f350d922da..60264feb656861d5a9474fe4285ac69d
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dadfd5781bf3dea8f68c184e0059d477d2d27036..923526d1a04f4a5999b63ddf26bbf51c9192494e 100644
+index b8ac1df1f2e2114a16d417b31fbbbc734074b2b6..d23c04ce96d12c0ec11c97433c9fa4dca53d3e6e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -421,6 +421,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0356-Remove-garbage-Java-version-check.patch b/patches/server/0355-Remove-garbage-Java-version-check.patch
index f2867bfa7d..f2867bfa7d 100644
--- a/patches/server/0356-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0355-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0357-Add-ThrownEggHatchEvent.patch b/patches/server/0356-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0357-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0356-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0358-Entity-Jump-API.patch b/patches/server/0357-Entity-Jump-API.patch
index eb51ab24b2..b7387454a3 100644
--- a/patches/server/0358-Entity-Jump-API.patch
+++ b/patches/server/0357-Entity-Jump-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7e7128973153f4c3a737c1e956e41bab0e85c69a..a5b532a6051f9313bb5042bf61712015768b5426 100644
+index 345b2d91cd7ac1746fb70bf28b596cce6746a693..24a16dbfc0852a566dd527639974fcba44bd43fe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3240,8 +3240,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3243,8 +3243,10 @@ public abstract class LivingEntity extends Entity {
              } else if (this.isInLava() && (!this.onGround || d7 > d8)) {
                  this.jumpInLiquid(FluidTags.LAVA);
              } else if ((this.onGround || flag && d7 <= d8) && this.noJumpDelay == 0) {
diff --git a/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 7e248d9bd6..7e248d9bd6 100644
--- a/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0360-Make-the-GUI-graph-fancier.patch b/patches/server/0359-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0360-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0359-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0361-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch
index 486014f2be..7f64696d43 100644
--- a/patches/server/0361-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 64cd5b2bc4032bfb0c917cc33884062ddba2738f..3aa82c7d26ef9fed3d4b670ac330204b55609396 100644
+index b86ba1b6e49128f50d3940708ec3b59580cbfde8..118d7068700bbd4aeaf766ee8d3984b474c6bf9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -345,13 +345,18 @@ public class CraftEventFactory {
+@@ -348,13 +348,18 @@ public class CraftEventFactory {
          }
  
          org.bukkit.inventory.ItemStack item;
diff --git a/patches/server/0362-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0361-Validate-tripwire-hook-placement-before-update.patch
index fd8a74807c..fd8a74807c 100644
--- a/patches/server/0362-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0361-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0363-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index f058d157d0..f058d157d0 100644
--- a/patches/server/0363-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0364-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch
index ce51b7964c..ce51b7964c 100644
--- a/patches/server/0364-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0365-Optimise-Chunk-getFluid.patch b/patches/server/0364-Optimise-Chunk-getFluid.patch
index 1d78a740b0..1d78a740b0 100644
--- a/patches/server/0365-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0364-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0366-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 45ea278818..45ea278818 100644
--- a/patches/server/0366-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0367-Add-tick-times-API-and-mspt-command.patch b/patches/server/0366-Add-tick-times-API-and-mspt-command.patch
index 4fe85cbca3..4fe85cbca3 100644
--- a/patches/server/0367-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0366-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0368-Expose-MinecraftServer-isRunning.patch b/patches/server/0367-Expose-MinecraftServer-isRunning.patch
index 263db14d03..263db14d03 100644
--- a/patches/server/0368-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0367-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0369-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch
index fb799bc57d..fb799bc57d 100644
--- a/patches/server/0369-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0370-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 3a8c274b7e..3a8c274b7e 100644
--- a/patches/server/0370-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0371-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index be6afe3eed..be6afe3eed 100644
--- a/patches/server/0371-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0372-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index aa61dfee66..aa61dfee66 100644
--- a/patches/server/0372-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0373-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 6c7add7f00..6c7add7f00 100644
--- a/patches/server/0373-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0374-Don-t-tick-dead-players.patch b/patches/server/0373-Don-t-tick-dead-players.patch
index b5386f7c8d..b5386f7c8d 100644
--- a/patches/server/0374-Don-t-tick-dead-players.patch
+++ b/patches/server/0373-Don-t-tick-dead-players.patch
diff --git a/patches/server/0375-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 83aebd18e6..83aebd18e6 100644
--- a/patches/server/0375-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0376-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0375-Optimize-Collision-to-not-load-chunks.patch
index 1296dd9549..1296dd9549 100644
--- a/patches/server/0376-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0375-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0377-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch
index bc2a400726..bc2a400726 100644
--- a/patches/server/0377-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0378-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1e856d6671..1e856d6671 100644
--- a/patches/server/0378-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0379-Improved-Watchdog-Support.patch b/patches/server/0378-Improved-Watchdog-Support.patch
index 96f8055ba4..96f8055ba4 100644
--- a/patches/server/0379-Improved-Watchdog-Support.patch
+++ b/patches/server/0378-Improved-Watchdog-Support.patch
diff --git a/patches/server/0380-Optimize-Pathfinding.patch b/patches/server/0379-Optimize-Pathfinding.patch
index d39cf83257..d39cf83257 100644
--- a/patches/server/0380-Optimize-Pathfinding.patch
+++ b/patches/server/0379-Optimize-Pathfinding.patch
diff --git a/patches/server/0381-Reduce-Either-Optional-allocation.patch b/patches/server/0380-Reduce-Either-Optional-allocation.patch
index eb7237e52a..eb7237e52a 100644
--- a/patches/server/0381-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0380-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0382-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch
index 7848f60c2c..7848f60c2c 100644
--- a/patches/server/0382-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0383-Prevent-opening-inventories-when-frozen.patch b/patches/server/0382-Prevent-opening-inventories-when-frozen.patch
index a16f3603df..a16f3603df 100644
--- a/patches/server/0383-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0382-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0384-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch
index 11403f5b9a..7ecdb13e6d 100644
--- a/patches/server/0384-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a5b532a6051f9313bb5042bf61712015768b5426..9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed 100644
+index 24a16dbfc0852a566dd527639974fcba44bd43fe..8de0a71566d2b095e74c8f8cf15dfac26a5a31c2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3337,10 +3337,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3340,10 +3340,16 @@ public abstract class LivingEntity extends Entity {
      protected void serverAiStep() {}
  
      protected void pushEntities() {
diff --git a/patches/server/0385-Implement-Player-Client-Options-API.patch b/patches/server/0384-Implement-Player-Client-Options-API.patch
index 01c8e8989c..46129fcaca 100644
--- a/patches/server/0385-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0384-Implement-Player-Client-Options-API.patch
@@ -97,7 +97,7 @@ index baff31a9dd003eef6191b59598523e387bc759a1..867deadfc38e069931211a2b0db4350a
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aebe500d3d0947536d19286195a0c7f5798e862e..c75f919617f60fb353583d6541beaa604efe045a 100644
+index cdc4ef88c8369b3bd1c607ff5301fc1b04ec4582..5338f9245c00366c68e208a1e0c780c7ca362548 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -615,6 +615,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0386-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index db4ff86838..1b01295738 100644
--- a/patches/server/0386-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from
 I suspect it deals with teleporting as it uses players current x/y/z
 
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index 773ec6ee0f48ee626d7ec8e4c67212327adfe023..5e4140c8f6a201d47eafa086f1047953ab5c1b0e 100644
+index ffa1e457decf8502c3283352bf5be94d419ff165..d3c3db919e9b0507e8543313d9028394e5163673 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -153,8 +153,8 @@ public abstract class DistanceManager {
diff --git a/patches/server/0387-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 044449f5f3..c1fdec6ff1 100644
--- a/patches/server/0387-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 35d68b46732471b66f33b568d447b6fac9591dac..f84d7dcfab4a636baada92ac9af03fe5a3dc2e9a 100644
+index de5caa032685787fb04172ec5c05a022d99827c1..46bec088294c7500c9021103587a80e29de4b54b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1027,6 +1027,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0388-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch
index e2569d8445..38078f50e3 100644
--- a/patches/server/0388-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Load Chunks for Login Asynchronously
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d3cf5554eb1d4d3d28b95abab43419a5efec8596..99df84ed9cda3be5f521bc7ed7bf82a297aa8bdf 100644
+index 5a2797104d43d5981fe0d4599c0abbbf8658f153..c0e17bbf04723da76ea6952d9558dd4d34b00f6c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -170,6 +170,7 @@ import org.bukkit.event.world.GenericGameEvent;
@@ -81,7 +81,7 @@ index 3af9f2d86cf2a9566e22865689101245647d05a5..fe722106e20e199eb914a09f8dbc1409
          this.server.getProfiler().push("keepAlive");
          // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ef09f5f42a89f767060f015af27269ad496d08c7..984324767cf8afc31fccc0b7add10645aa0925cf 100644
+index 6fd0e5a97d0ed9155b12dac94c075e1225a22e93..c16cb8ebe28987f1630fe659dfa437264bd236e1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -90,7 +90,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0389-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 9d590b1ffa..9d590b1ffa 100644
--- a/patches/server/0389-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0390-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch
index 9c571cf10f..90feeaf645 100644
--- a/patches/server/0390-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed..e3d686ea473c1bd38af9ed181020110ee3d94f64 100644
+index 8de0a71566d2b095e74c8f8cf15dfac26a5a31c2..d6071df933506bf3d55fc827483b33ecc5174834 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2112,7 +2112,16 @@ public abstract class LivingEntity extends Entity {
+@@ -2115,7 +2115,16 @@ public abstract class LivingEntity extends Entity {
  
              EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
              if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) {
diff --git a/patches/server/0391-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch
index b9aecc5313..b9aecc5313 100644
--- a/patches/server/0391-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0392-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch
index 3b9eaafdbf..3b9eaafdbf 100644
--- a/patches/server/0392-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0393-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 8bc975b5bc..2ba2d42e65 100644
--- a/patches/server/0393-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -80,10 +80,10 @@ index 457471f4e5621b312714dcbad733c23d528131d7..ae76b3404e4251e7705269b2e5706815
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe37597c94fe2 100644
+index d6071df933506bf3d55fc827483b33ecc5174834..03194c5acd46f6014f0a1d964d079b114f86c951 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1643,9 +1643,9 @@ public abstract class LivingEntity extends Entity {
+@@ -1646,9 +1646,9 @@ public abstract class LivingEntity extends Entity {
                  // Paper start
                  org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(damageSource);
                  if (deathEvent == null || !deathEvent.isCancelled()) {
@@ -96,7 +96,7 @@ index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe375
                      // Paper start - clear equipment if event is not cancelled
                      if (this instanceof Mob) {
                          for (EquipmentSlot slot : this.clearedEquipmentSlots) {
-@@ -1743,8 +1743,13 @@ public abstract class LivingEntity extends Entity {
+@@ -1746,8 +1746,13 @@ public abstract class LivingEntity extends Entity {
              this.dropCustomDeathLoot(source, i, flag);
              this.clearEquipmentSlots = prev; // Paper
          }
@@ -113,10 +113,10 @@ index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe375
          this.drops = new ArrayList<>();
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3d4d81b7f 100644
+index e463ae13ce6f65675c2b6d553ecf91db5a047dbc..7ff1e7e4d493770bfdbc0ad5e8f10387cefc42d2 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -608,7 +608,7 @@ public class ArmorStand extends LivingEntity {
+@@ -609,7 +609,7 @@ public class ArmorStand extends LivingEntity {
          for (i = 0; i < this.handItems.size(); ++i) {
              itemstack = (ItemStack) this.handItems.get(i);
              if (!itemstack.isEmpty()) {
@@ -125,7 +125,7 @@ index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3
                  this.handItems.set(i, ItemStack.EMPTY);
              }
          }
-@@ -616,7 +616,7 @@ public class ArmorStand extends LivingEntity {
+@@ -617,7 +617,7 @@ public class ArmorStand extends LivingEntity {
          for (i = 0; i < this.armorItems.size(); ++i) {
              itemstack = (ItemStack) this.armorItems.get(i);
              if (!itemstack.isEmpty()) {
@@ -135,10 +135,10 @@ index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3aa82c7d26ef9fed3d4b670ac330204b55609396..22da112f45ddb20d113550eae67ac08eb2fcb727 100644
+index 118d7068700bbd4aeaf766ee8d3984b474c6bf9a..751f376e175881d9e9f750c90143a7c39431ce6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -819,6 +819,11 @@ public class CraftEventFactory {
+@@ -809,6 +809,11 @@ public class CraftEventFactory {
      }
  
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
@@ -150,7 +150,7 @@ index 3aa82c7d26ef9fed3d4b670ac330204b55609396..22da112f45ddb20d113550eae67ac08e
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
          populateFields(victim, event); // Paper - make cancellable
-@@ -832,11 +837,13 @@ public class CraftEventFactory {
+@@ -822,11 +827,13 @@ public class CraftEventFactory {
          playDeathSound(victim, event);
          // Paper end
          victim.expToDrop = event.getDroppedExp();
diff --git a/patches/server/0394-Villager-Restocks-API.patch b/patches/server/0393-Villager-Restocks-API.patch
index d4af2305a8..d4af2305a8 100644
--- a/patches/server/0394-Villager-Restocks-API.patch
+++ b/patches/server/0393-Villager-Restocks-API.patch
diff --git a/patches/server/0395-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch
index a84ea8c5a4..a84ea8c5a4 100644
--- a/patches/server/0395-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0396-Expose-game-version.patch b/patches/server/0395-Expose-game-version.patch
index 87d1ff120a..87d1ff120a 100644
--- a/patches/server/0396-Expose-game-version.patch
+++ b/patches/server/0395-Expose-game-version.patch
diff --git a/patches/server/0397-Optimize-Voxel-Shape-Merging.patch b/patches/server/0396-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0397-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0396-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0398-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 6e0cb176e9..6e0cb176e9 100644
--- a/patches/server/0398-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0399-misc-debugging-dumps.patch b/patches/server/0398-misc-debugging-dumps.patch
index f440f324b4..85246cbec8 100644
--- a/patches/server/0399-misc-debugging-dumps.patch
+++ b/patches/server/0398-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9083f00c7da96c977bd6efa7971cd896bd0cdd5..2fa1a4e453ac908848053ef80f6401764b0bb7f9 100644
+index 1205d5f7d2bee68f6b3cd8e2ccbcd3d056963d8e..b3231076683e5a63602ff1293765c5d76c36bfef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -881,6 +881,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -58,7 +58,7 @@ index b9083f00c7da96c977bd6efa7971cd896bd0cdd5..2fa1a4e453ac908848053ef80f640176
          this.running = false;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 984324767cf8afc31fccc0b7add10645aa0925cf..e62bfb9d0803c16e8b34c56c8a61fcafde05dcc8 100644
+index c16cb8ebe28987f1630fe659dfa437264bd236e1..4d501687f46722f2dcb51a8715a0be9ca4905d5f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -203,6 +203,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0400-Prevent-teleporting-dead-entities.patch b/patches/server/0399-Prevent-teleporting-dead-entities.patch
index bce03a0bd0..bce03a0bd0 100644
--- a/patches/server/0400-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0399-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0401-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0400-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 5968dd9be8..5968dd9be8 100644
--- a/patches/server/0401-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0400-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0402-Implement-Mob-Goal-API.patch b/patches/server/0401-Implement-Mob-Goal-API.patch
index 35ff8b0f2a..35ff8b0f2a 100644
--- a/patches/server/0402-Implement-Mob-Goal-API.patch
+++ b/patches/server/0401-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0403-Add-villager-reputation-API.patch b/patches/server/0402-Add-villager-reputation-API.patch
index 4c38780334..4c38780334 100644
--- a/patches/server/0403-Add-villager-reputation-API.patch
+++ b/patches/server/0402-Add-villager-reputation-API.patch
diff --git a/patches/server/0404-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0403-Option-for-maximum-exp-value-when-merging-orbs.patch
index 4239e066f4..206989dbdd 100644
--- a/patches/server/0404-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0403-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ 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 22da112f45ddb20d113550eae67ac08eb2fcb727..f80bdb38cf377684382bb817fedbeb8d5aae4704 100644
+index 751f376e175881d9e9f750c90143a7c39431ce6c..2dde21dea012f4531e737586752ae1b1f5023d99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -640,16 +640,30 @@ public class CraftEventFactory {
+@@ -630,16 +630,30 @@ public class CraftEventFactory {
              net.minecraft.world.entity.ExperienceOrb xp = (net.minecraft.world.entity.ExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/patches/server/0405-ExperienceOrbMergeEvent.patch b/patches/server/0404-ExperienceOrbMergeEvent.patch
index 1ff06b6779..bfca9b565e 100644
--- a/patches/server/0405-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0404-ExperienceOrbMergeEvent.patch
@@ -9,10 +9,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 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 f80bdb38cf377684382bb817fedbeb8d5aae4704..9b94df9940040f51fdcc1af5c7da96117af9017e 100644
+index 2dde21dea012f4531e737586752ae1b1f5023d99..359964cd8820b8ef8b8dba5501119164cebcf743 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -650,7 +650,7 @@ public class CraftEventFactory {
+@@ -640,7 +640,7 @@ public class CraftEventFactory {
                      if (e instanceof net.minecraft.world.entity.ExperienceOrb) {
                          net.minecraft.world.entity.ExperienceOrb loopItem = (net.minecraft.world.entity.ExperienceOrb) e;
                          // Paper start
diff --git a/patches/server/0406-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch
index 1091a96abf..1091a96abf 100644
--- a/patches/server/0406-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0407-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0406-Optimize-brigadier-child-sorting-performance.patch
index 3651f34b15..3651f34b15 100644
--- a/patches/server/0407-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/server/0406-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0408-Potential-bed-API.patch b/patches/server/0407-Potential-bed-API.patch
index 633d9baf8a..633d9baf8a 100644
--- a/patches/server/0408-Potential-bed-API.patch
+++ b/patches/server/0407-Potential-bed-API.patch
diff --git a/patches/server/0409-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch
index ba50c6bb9e..918e5417b2 100644
--- a/patches/server/0409-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2fa1a4e453ac908848053ef80f6401764b0bb7f9..3c7154e85c4543a01a4e95b9f574f5d803a59e6c 100644
+index b3231076683e5a63602ff1293765c5d76c36bfef..057c335b15123061ed239f9559aad137e2c97982 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -921,6 +921,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0410-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 94dbb79f58..94dbb79f58 100644
--- a/patches/server/0410-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0411-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0410-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 7c01a4e8b6..7c01a4e8b6 100644
--- a/patches/server/0411-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0410-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0412-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0411-Reduce-MutableInt-allocations-from-light-engine.patch
index 1a92be0a01..1a92be0a01 100644
--- a/patches/server/0412-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/server/0411-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0413-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0412-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 7669a4d452..b8308d2766 100644
--- a/patches/server/0413-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0412-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index 3167f5c6be39757e3cc42cbb17ab0cf13a2fe470..3768a71491ef7836b9739bdaec7a077c
      private static long encode(double value) {
          return Mth.lfloor(value * 4096.0D);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f84d7dcfab4a636baada92ac9af03fe5a3dc2e9a..84a702dd49d2bbf53410146c2942d4c1d896d40d 100644
+index 46bec088294c7500c9021103587a80e29de4b54b..8dce24ae70057115feff193a1307eb2437e16773 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1305,9 +1305,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0414-Ensure-safe-gateway-teleport.patch b/patches/server/0413-Ensure-safe-gateway-teleport.patch
index 6d352f74a8..6d352f74a8 100644
--- a/patches/server/0414-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0413-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0415-Add-option-for-console-having-all-permissions.patch b/patches/server/0414-Add-option-for-console-having-all-permissions.patch
index d1e3317d94..d1e3317d94 100644
--- a/patches/server/0415-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0414-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0416-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0415-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 90f095a707..90f095a707 100644
--- a/patches/server/0416-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0415-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0417-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0416-Use-distance-map-to-optimise-entity-tracker.patch
index d9a8bf3d29..d9a8bf3d29 100644
--- a/patches/server/0417-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0416-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0418-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0417-Fix-villager-trading-demand-MC-163962.patch
index fb5e330854..fb5e330854 100644
--- a/patches/server/0418-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0417-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0419-Maps-shouldn-t-load-chunks.patch b/patches/server/0418-Maps-shouldn-t-load-chunks.patch
index 3ab19f357a..3ab19f357a 100644
--- a/patches/server/0419-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0418-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0420-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0419-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 9ed5e37d35..9ed5e37d35 100644
--- a/patches/server/0420-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0419-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0421-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0420-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0421-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0420-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0422-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0421-Fix-piston-physics-inconsistency-MC-188840.patch
index dcc303244a..dcc303244a 100644
--- a/patches/server/0422-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0421-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0423-Fix-sand-duping.patch b/patches/server/0422-Fix-sand-duping.patch
index 5780d77de8..5780d77de8 100644
--- a/patches/server/0423-Fix-sand-duping.patch
+++ b/patches/server/0422-Fix-sand-duping.patch
diff --git a/patches/server/0424-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0423-Fix-missing-chunks-due-to-integer-overflow.patch
index 94b8d07c3a..94b8d07c3a 100644
--- a/patches/server/0424-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0423-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0425-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0424-Prevent-position-desync-in-playerconnection-causing-.patch
index ba844e85b3..ba844e85b3 100644
--- a/patches/server/0425-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0424-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0426-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0425-Inventory-getHolder-method-without-block-snapshot.patch
index 9ed9fe0826..9ed9fe0826 100644
--- a/patches/server/0426-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0425-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0427-Improve-Arrow-API.patch b/patches/server/0426-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0427-Improve-Arrow-API.patch
+++ b/patches/server/0426-Improve-Arrow-API.patch
diff --git a/patches/server/0428-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0427-Add-and-implement-PlayerRecipeBookClickEvent.patch
index c067c44ca1..c067c44ca1 100644
--- a/patches/server/0428-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0427-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0429-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0428-Hide-sync-chunk-writes-behind-flag.patch
index 1d9e0f2b56..1d9e0f2b56 100644
--- a/patches/server/0429-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0428-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0430-Add-permission-for-command-blocks.patch b/patches/server/0429-Add-permission-for-command-blocks.patch
index a0bcd3db18..a0bcd3db18 100644
--- a/patches/server/0430-Add-permission-for-command-blocks.patch
+++ b/patches/server/0429-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0431-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0430-Ensure-Entity-AABB-s-are-never-invalid.patch
index 04d761dfc7..04d761dfc7 100644
--- a/patches/server/0431-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0430-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0432-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0431-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 308b3b8c69..308b3b8c69 100644
--- a/patches/server/0432-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0431-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0433-Paper-dumpitem-command.patch b/patches/server/0432-Paper-dumpitem-command.patch
index 77cf770637..77cf770637 100644
--- a/patches/server/0433-Paper-dumpitem-command.patch
+++ b/patches/server/0432-Paper-dumpitem-command.patch
diff --git a/patches/server/0434-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0433-Don-t-allow-null-UUID-s-for-chat.patch
index 9c92814826..9c92814826 100644
--- a/patches/server/0434-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/0433-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0435-Improve-Legacy-Component-serialization-size.patch b/patches/server/0434-Improve-Legacy-Component-serialization-size.patch
index 866302739f..866302739f 100644
--- a/patches/server/0435-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0434-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0436-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0435-Optimize-Bit-Operations-by-inlining.patch
index c1cce4278a..c1cce4278a 100644
--- a/patches/server/0436-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0435-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0437-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0436-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index a7cfa15425..a7cfa15425 100644
--- a/patches/server/0437-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0436-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0438-incremental-chunk-and-player-saving.patch b/patches/server/0437-incremental-chunk-and-player-saving.patch
index b53d082bfa..b53d082bfa 100644
--- a/patches/server/0438-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0437-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0439-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0438-Stop-copy-on-write-operations-for-updating-light-dat.patch
index c13f70aec1..c13f70aec1 100644
--- a/patches/server/0439-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0438-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0440-Support-old-UUID-format-for-NBT.patch b/patches/server/0439-Support-old-UUID-format-for-NBT.patch
index 04f6394d7a..04f6394d7a 100644
--- a/patches/server/0440-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0439-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0441-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0440-Clean-up-duplicated-GameProfile-Properties.patch
index 25554ddf57..25554ddf57 100644
--- a/patches/server/0441-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0440-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0442-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0441-Convert-legacy-attributes-in-Item-Meta.patch
index b949a9e873..b949a9e873 100644
--- a/patches/server/0442-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0441-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0443-Remove-some-streams-from-structures.patch b/patches/server/0442-Remove-some-streams-from-structures.patch
index d535ed9e91..d535ed9e91 100644
--- a/patches/server/0443-Remove-some-streams-from-structures.patch
+++ b/patches/server/0442-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0444-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0443-Remove-streams-from-classes-related-villager-gossip.patch
index b70ae30d26..b70ae30d26 100644
--- a/patches/server/0444-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0443-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0445-Support-components-in-ItemMeta.patch b/patches/server/0444-Support-components-in-ItemMeta.patch
index 05ab3c1898..05ab3c1898 100644
--- a/patches/server/0445-Support-components-in-ItemMeta.patch
+++ b/patches/server/0444-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0446-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0445-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 68a10afd43..68a10afd43 100644
--- a/patches/server/0446-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/server/0445-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0447-Add-entity-liquid-API.patch b/patches/server/0446-Add-entity-liquid-API.patch
index 57a97d8edd..57a97d8edd 100644
--- a/patches/server/0447-Add-entity-liquid-API.patch
+++ b/patches/server/0446-Add-entity-liquid-API.patch
diff --git a/patches/server/0448-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0447-Update-itemstack-legacy-name-and-lore.patch
index b354241c07..b354241c07 100644
--- a/patches/server/0448-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0447-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0449-Spawn-player-in-correct-world-on-login.patch b/patches/server/0448-Spawn-player-in-correct-world-on-login.patch
index a5a6a1cf19..a5a6a1cf19 100644
--- a/patches/server/0449-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0448-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0450-Add-PrepareResultEvent.patch b/patches/server/0449-Add-PrepareResultEvent.patch
index 415d9409c8..89497733ce 100644
--- a/patches/server/0450-Add-PrepareResultEvent.patch
+++ b/patches/server/0449-Add-PrepareResultEvent.patch
@@ -94,10 +94,10 @@ index cdebd0cdf6eb901464cf4c16089b10ea0147b54d..b47dc7671fab2117b989d647d7e8e36d
  
      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 9b94df9940040f51fdcc1af5c7da96117af9017e..c2eefe215f47e36cc2b8476750ae00ec88f826a6 100644
+index 359964cd8820b8ef8b8dba5501119164cebcf743..2809ec8fcd43d096a187fc2fbda042a81d301c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1594,19 +1594,44 @@ public class CraftEventFactory {
+@@ -1584,19 +1584,44 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0451-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0450-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 0319fe7f46..172119ea73 100644
--- a/patches/server/0451-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0450-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,10 +5,10 @@ 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 37d51104a7d38c2d16ae38a9adcbe37597c94fe2..049d4422136a342556951dc0114435f6c2ede946 100644
+index 03194c5acd46f6014f0a1d964d079b114f86c951..8910fed602d6055911d87eb3d12e1d707b5e8ea9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3435,7 +3435,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3438,7 +3438,7 @@ public abstract class LivingEntity extends Entity {
          Entity entity = this.getVehicle();
  
          super.stopRiding(suppressCancellation); // Paper - suppress
diff --git a/patches/server/0452-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0451-Optimize-NetworkManager-Exception-Handling.patch
index cf2905d1ed..cf2905d1ed 100644
--- a/patches/server/0452-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0451-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0453-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0452-Optimize-the-advancement-data-player-iteration-to-be.patch
index 0763953dd5..0763953dd5 100644
--- a/patches/server/0453-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0452-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0454-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0453-Fix-arrows-never-despawning-MC-125757.patch
index 8bdc8589fd..8bdc8589fd 100644
--- a/patches/server/0454-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0453-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0455-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0454-Thread-Safe-Vanilla-Command-permission-checking.patch
index 09b482e662..0f7af24acc 100644
--- a/patches/server/0455-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0454-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -26,7 +26,7 @@ index 20a7cdf87f307878d66922aaac0c60cff218e46c..39844531b03eb8a6c70700b4ecbf0ff1
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index aadddbc16aa719677c3b6fc4969b6145b9b9ee0b..6fdbe747645eb83f31b56bca77a9d7962237aed8 100644
+index fa258155b1cbdd8efde15ec59986d0ab56245ddd..90d5d1de2f00be97e3ea0ff50caa7e7ba9438408 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -59,7 +59,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
diff --git a/patches/server/0456-Fix-SPIGOT-5989.patch b/patches/server/0455-Fix-SPIGOT-5989.patch
index 5136ee4fc5..5136ee4fc5 100644
--- a/patches/server/0456-Fix-SPIGOT-5989.patch
+++ b/patches/server/0455-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0457-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0456-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index c7303d0b5c..c7303d0b5c 100644
--- a/patches/server/0457-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0456-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0458-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0457-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5010bc5bf1..5010bc5bf1 100644
--- a/patches/server/0458-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0457-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0459-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0458-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index da7194a954..da7194a954 100644
--- a/patches/server/0459-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0458-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0460-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0459-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 15a24cf922..15a24cf922 100644
--- a/patches/server/0460-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0459-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0461-Fix-some-rails-connecting-improperly.patch b/patches/server/0460-Fix-some-rails-connecting-improperly.patch
index f612612b1c..f612612b1c 100644
--- a/patches/server/0461-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0460-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0462-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0461-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0462-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0461-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0463-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0462-Do-not-let-the-server-load-chunks-from-newer-version.patch
index efa8bf5dc9..efa8bf5dc9 100644
--- a/patches/server/0463-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0462-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0464-Brand-support.patch b/patches/server/0463-Brand-support.patch
index 7fb99e9a34..7c7631222c 100644
--- a/patches/server/0464-Brand-support.patch
+++ b/patches/server/0463-Brand-support.patch
@@ -56,7 +56,7 @@ index c59e90ba0de83eeda3719b6303bee9796b4a1af0..da6a0171bd63ac68635de1c23fc9eafa
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c75f919617f60fb353583d6541beaa604efe045a..9a9c87ff97fe1d1020b41746270b5e39ac2bdc72 100644
+index 5338f9245c00366c68e208a1e0c780c7ca362548..f90ea94c8bf6fe167698501f670d1e1f10799005 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2760,6 +2760,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0465-Add-setMaxPlayers-API.patch b/patches/server/0464-Add-setMaxPlayers-API.patch
index 70a4396a97..70a4396a97 100644
--- a/patches/server/0465-Add-setMaxPlayers-API.patch
+++ b/patches/server/0464-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0466-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0465-Add-playPickupItemAnimation-to-LivingEntity.patch
index 93c4be55ff..93c4be55ff 100644
--- a/patches/server/0466-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0465-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0467-Don-t-require-FACING-data.patch b/patches/server/0466-Don-t-require-FACING-data.patch
index fd2ab14906..fd2ab14906 100644
--- a/patches/server/0467-Don-t-require-FACING-data.patch
+++ b/patches/server/0466-Don-t-require-FACING-data.patch
diff --git a/patches/server/0468-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0467-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 0da67efccf..2af5296372 100644
--- a/patches/server/0468-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0467-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5fdf4d9fdc31174dc141bef3fb478e8c0fe65f1c..bcf74fc7ec97a4e8e0f78eecd64dd508841e080b 100644
+index fc3e5068473e1586024e87fee3eeeb6cf5124923..e18ee5ec984cb8d8aaa8a40714fc9a0381b04317 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1890,6 +1890,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0469-Add-moon-phase-API.patch b/patches/server/0468-Add-moon-phase-API.patch
index c400ce80c7..c400ce80c7 100644
--- a/patches/server/0469-Add-moon-phase-API.patch
+++ b/patches/server/0468-Add-moon-phase-API.patch
diff --git a/patches/server/0470-Prevent-headless-pistons-from-being-created.patch b/patches/server/0469-Prevent-headless-pistons-from-being-created.patch
index b31a2a9b3a..b31a2a9b3a 100644
--- a/patches/server/0470-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0469-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0471-Add-BellRingEvent.patch b/patches/server/0470-Add-BellRingEvent.patch
index e6528721cf..e6528721cf 100644
--- a/patches/server/0471-Add-BellRingEvent.patch
+++ b/patches/server/0470-Add-BellRingEvent.patch
diff --git a/patches/server/0472-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0471-Add-zombie-targets-turtle-egg-config.patch
index a92287451d..a92287451d 100644
--- a/patches/server/0472-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0471-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0473-Buffer-joins-to-world.patch b/patches/server/0472-Buffer-joins-to-world.patch
index d0f7588047..d0f7588047 100644
--- a/patches/server/0473-Buffer-joins-to-world.patch
+++ b/patches/server/0472-Buffer-joins-to-world.patch
diff --git a/patches/server/0474-Eigencraft-redstone-implementation.patch b/patches/server/0473-Eigencraft-redstone-implementation.patch
index e4a4e5398a..e4a4e5398a 100644
--- a/patches/server/0474-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0473-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0475-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0474-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 3c5a150c0e..ddc5e5e453 100644
--- a/patches/server/0475-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0474-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,7 +25,7 @@ index 43759cdf3da0796d7969c6504ac9a6986c0f0518..750fef0f5b908b776a7306e54653eba4
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index e62bfb9d0803c16e8b34c56c8a61fcafde05dcc8..1f311f84f8f291228a3b52471835d33c220db849 100644
+index 4d501687f46722f2dcb51a8715a0be9ca4905d5f..8a2fdfb701ec663310c8f3f86607b6df1f2e01a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -108,7 +108,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0476-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0475-PortalCreateEvent-needs-to-know-its-entity.patch
index 9630b4e364..9630b4e364 100644
--- a/patches/server/0476-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0475-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0477-Fix-CraftTeam-null-check.patch b/patches/server/0476-Fix-CraftTeam-null-check.patch
index fc8ca37076..fc8ca37076 100644
--- a/patches/server/0477-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0476-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0478-Add-more-Evoker-API.patch b/patches/server/0477-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0478-Add-more-Evoker-API.patch
+++ b/patches/server/0477-Add-more-Evoker-API.patch
diff --git a/patches/server/0479-Add-methods-to-get-translation-keys.patch b/patches/server/0478-Add-methods-to-get-translation-keys.patch
index 5a5b0a4cd6..5a5b0a4cd6 100644
--- a/patches/server/0479-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0478-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0480-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0479-Create-HoverEvent-from-ItemStack-Entity.patch
index 238466b430..238466b430 100644
--- a/patches/server/0480-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0479-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0481-Cache-block-data-strings.patch b/patches/server/0480-Cache-block-data-strings.patch
index 06987a2b52..06987a2b52 100644
--- a/patches/server/0481-Cache-block-data-strings.patch
+++ b/patches/server/0480-Cache-block-data-strings.patch
diff --git a/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0481-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 898fc4db4e..898fc4db4e 100644
--- a/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0481-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0483-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0482-Add-additional-open-container-api-to-HumanEntity.patch
index 1c28c3f9cd..1c28c3f9cd 100644
--- a/patches/server/0483-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0482-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0484-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0483-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 602cc3a878..602cc3a878 100644
--- a/patches/server/0484-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0483-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0485-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0484-Extend-block-drop-capture-to-capture-all-items-added.patch
index 1517704ce1..39e77c9ccf 100644
--- a/patches/server/0485-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0484-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bcf74fc7ec97a4e8e0f78eecd64dd508841e080b..af06eb25172ff4ea3fdf2757ce17622e7f4075ae 100644
+index e18ee5ec984cb8d8aaa8a40714fc9a0381b04317..da8a708d24611bd0580ae0132cac277a6580b0ea 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1327,6 +1327,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0486-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0485-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index fa83ed6181..fa83ed6181 100644
--- a/patches/server/0486-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0485-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0487-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0486-Lazily-track-plugin-scoreboards-by-default.patch
index bb0fe1c990..bb0fe1c990 100644
--- a/patches/server/0487-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0486-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0488-Entity-isTicking.patch b/patches/server/0487-Entity-isTicking.patch
index e423ab7c13..e423ab7c13 100644
--- a/patches/server/0488-Entity-isTicking.patch
+++ b/patches/server/0487-Entity-isTicking.patch
diff --git a/patches/server/0489-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0488-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 6788d38d97..6788d38d97 100644
--- a/patches/server/0489-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0488-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0490-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0489-Fix-Concurrency-issue-in-ShufflingList.patch
index 5b3dba224c..5b3dba224c 100644
--- a/patches/server/0490-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0489-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0491-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0490-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 31cde5ee93..31cde5ee93 100644
--- a/patches/server/0491-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0490-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0492-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0491-Fix-for-large-move-vectors-crashing-server.patch
index ab6165f75a..ab6165f75a 100644
--- a/patches/server/0492-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0491-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0493-Optimise-getType-calls.patch b/patches/server/0492-Optimise-getType-calls.patch
index 9d9946c038..9d9946c038 100644
--- a/patches/server/0493-Optimise-getType-calls.patch
+++ b/patches/server/0492-Optimise-getType-calls.patch
diff --git a/patches/server/0494-Villager-resetOffers.patch b/patches/server/0493-Villager-resetOffers.patch
index 7448270230..7448270230 100644
--- a/patches/server/0494-Villager-resetOffers.patch
+++ b/patches/server/0493-Villager-resetOffers.patch
diff --git a/patches/server/0495-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0494-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 43999ba919..43999ba919 100644
--- a/patches/server/0495-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0494-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0496-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0495-Retain-block-place-order-when-capturing-blockstates.patch
index a316317a3e..a316317a3e 100644
--- a/patches/server/0496-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0495-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0497-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0496-Reduce-blockpos-allocation-from-pathfinding.patch
index a6a02f3817..a6a02f3817 100644
--- a/patches/server/0497-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0496-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0498-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0497-Fix-item-locations-dropped-from-campfires.patch
index df944d4a66..df944d4a66 100644
--- a/patches/server/0498-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0497-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0499-Player-elytra-boost-API.patch b/patches/server/0498-Player-elytra-boost-API.patch
index f9baa97df3..40addd6dcf 100644
--- a/patches/server/0499-Player-elytra-boost-API.patch
+++ b/patches/server/0498-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9a9c87ff97fe1d1020b41746270b5e39ac2bdc72..edc8ab5551a13e4a0cf326a2d2bc376b586abbc0 100644
+index f90ea94c8bf6fe167698501f670d1e1f10799005..2d111c46fcc705b8f161f4b5d83ac66c1ffbb05f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -633,6 +633,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0500-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0499-Fixed-TileEntityBell-memory-leak.patch
index 09d0b77f4a..09d0b77f4a 100644
--- a/patches/server/0500-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0499-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0501-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0500-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index f48528d0b5..f48528d0b5 100644
--- a/patches/server/0501-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0500-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0502-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0501-Add-getOfflinePlayerIfCached-String.patch
index 2139494956..2139494956 100644
--- a/patches/server/0502-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0501-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0503-Add-ignore-discounts-API.patch b/patches/server/0502-Add-ignore-discounts-API.patch
index e77eb448c9..b1916987d7 100644
--- a/patches/server/0503-Add-ignore-discounts-API.patch
+++ b/patches/server/0502-Add-ignore-discounts-API.patch
@@ -91,12 +91,12 @@ index 8b46e494ecd0cce5ab0b2bf8e50cf50dc7e2a7e5..8a9a701baabdaf066cd9b28c05430f67
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
-index 07462b77107541aed2e29d04da33831ac113b450..0f038f6152c90e707cb633dffcab0a1c5b99d260 100644
+index 335d65c22efc2b8fd53476e3efd6e74fce5609cf..c48f67f4202e32d9793b462609bd3b95c9765bbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
 @@ -18,11 +18,19 @@ public class CraftMerchantRecipe extends MerchantRecipe {
-     }
  
+     @Deprecated
      public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier) {
 -        this(result, uses, maxUses, experienceReward, experience, priceMultiplier, 0, 0);
 +        // Paper start - add ignoreDiscounts param
@@ -147,8 +147,8 @@ index 07462b77107541aed2e29d04da33831ac113b450..0f038f6152c90e707cb633dffcab0a1c
          if (recipe instanceof CraftMerchantRecipe) {
              return (CraftMerchantRecipe) recipe;
          } else {
--            CraftMerchantRecipe craft = new CraftMerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier());
-+            CraftMerchantRecipe craft = new CraftMerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier(), recipe.shouldIgnoreDiscounts()); // Paper - shouldIgnoreDiscounts
+-            CraftMerchantRecipe craft = new CraftMerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier(), recipe.getDemand(), recipe.getSpecialPrice());
++            CraftMerchantRecipe craft = new CraftMerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier(), recipe.getDemand(), recipe.getSpecialPrice(), recipe.shouldIgnoreDiscounts()); // Paper - shouldIgnoreDiscounts
              craft.setIngredients(recipe.getIngredients());
  
              return craft;
diff --git a/patches/server/0504-Toggle-for-removing-existing-dragon.patch b/patches/server/0503-Toggle-for-removing-existing-dragon.patch
index 157073f779..157073f779 100644
--- a/patches/server/0504-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0503-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0505-Fix-client-lag-on-advancement-loading.patch b/patches/server/0504-Fix-client-lag-on-advancement-loading.patch
index 3c62dff076..3c62dff076 100644
--- a/patches/server/0505-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0504-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0506-Item-no-age-no-player-pickup.patch b/patches/server/0505-Item-no-age-no-player-pickup.patch
index 13b456555a..13b456555a 100644
--- a/patches/server/0506-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0505-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0507-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0506-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 91c966567f..91c966567f 100644
--- a/patches/server/0507-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0506-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0508-Beacon-API-custom-effect-ranges.patch b/patches/server/0507-Beacon-API-custom-effect-ranges.patch
index 42125ab17d..42125ab17d 100644
--- a/patches/server/0508-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0507-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0509-Add-API-for-quit-reason.patch b/patches/server/0508-Add-API-for-quit-reason.patch
index 253d09a0be..253d09a0be 100644
--- a/patches/server/0509-Add-API-for-quit-reason.patch
+++ b/patches/server/0508-Add-API-for-quit-reason.patch
diff --git a/patches/server/0510-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0509-Add-Wandering-Trader-spawn-rate-config-options.patch
index a5adffed4f..a5adffed4f 100644
--- a/patches/server/0510-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0509-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0511-Expose-world-spawn-angle.patch b/patches/server/0510-Expose-world-spawn-angle.patch
index c14ae7ba25..c14ae7ba25 100644
--- a/patches/server/0511-Expose-world-spawn-angle.patch
+++ b/patches/server/0510-Expose-world-spawn-angle.patch
diff --git a/patches/server/0512-Add-Destroy-Speed-API.patch b/patches/server/0511-Add-Destroy-Speed-API.patch
index a2b7640fee..a2b7640fee 100644
--- a/patches/server/0512-Add-Destroy-Speed-API.patch
+++ b/patches/server/0511-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0513-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0512-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index b8e82c83ac..55786c88dd 100644
--- a/patches/server/0513-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0512-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 edc8ab5551a13e4a0cf326a2d2bc376b586abbc0..3719f891dfb1e12d68443aa5050b408de3b65f4a 100644
+index 2d111c46fcc705b8f161f4b5d83ac66c1ffbb05f..87938df67f0d52081f6052b5670313adc7d5d988 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2342,7 +2342,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0514-Add-LivingEntity-clearActiveItem.patch b/patches/server/0513-Add-LivingEntity-clearActiveItem.patch
index 2eb3c37c50..2eb3c37c50 100644
--- a/patches/server/0514-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0513-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0515-Add-PlayerItemCooldownEvent.patch b/patches/server/0514-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0515-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0514-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0516-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0515-Significantly-improve-performance-of-the-end-generat.patch
index c223e5c115..c223e5c115 100644
--- a/patches/server/0516-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0515-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0517-More-lightning-API.patch b/patches/server/0516-More-lightning-API.patch
index 142479579e..142479579e 100644
--- a/patches/server/0517-More-lightning-API.patch
+++ b/patches/server/0516-More-lightning-API.patch
diff --git a/patches/server/0518-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0517-Climbing-should-not-bypass-cramming-gamerule.patch
index 05a32ec667..9c7bd5b80a 100644
--- a/patches/server/0518-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0517-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,10 +45,10 @@ index 22f36cd3df49160f1b6668befdd05c2268edaa49..e39965c2e50bc8ee424ea07819346e06
              } 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 049d4422136a342556951dc0114435f6c2ede946..d6ad8cfb509920c448fc51ec02e867b1552730df 100644
+index 8910fed602d6055911d87eb3d12e1d707b5e8ea9..0896cbe04be6a5471088c321296506415fccbed6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3357,7 +3357,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3360,7 +3360,7 @@ public abstract class LivingEntity extends Entity {
              return;
          }
          // Paper end - don't run getEntities if we're not going to use its result
@@ -57,7 +57,7 @@ index 049d4422136a342556951dc0114435f6c2ede946..d6ad8cfb509920c448fc51ec02e867b1
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -3520,9 +3520,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3523,9 +3523,16 @@ public abstract class LivingEntity extends Entity {
          return !this.isRemoved() && this.collides; // CraftBukkit
      }
  
@@ -117,7 +117,7 @@ index 119ee27ceb873c67d1d0904da903401e216eb450..04a119e6641898454253e2478bc1b4df
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 808e564789d826c1778c053ab91038e3d4d81b7f..150afceb491cfd254c0f1b84800e6df14cf26676 100644
+index 7ff1e7e4d493770bfdbc0ad5e8f10387cefc42d2..b136cdc13d94bc34c998a1986e0c93525356ac5c 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -342,7 +342,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0519-Added-missing-default-perms-for-commands.patch b/patches/server/0518-Added-missing-default-perms-for-commands.patch
index ddaf0c6aec..ddaf0c6aec 100644
--- a/patches/server/0519-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0518-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0520-Add-PlayerShearBlockEvent.patch b/patches/server/0519-Add-PlayerShearBlockEvent.patch
index 4004036b95..4004036b95 100644
--- a/patches/server/0520-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0519-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0521-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0520-Fix-curing-zombie-villager-discount-exploit.patch
index c6cb27bebe..c6cb27bebe 100644
--- a/patches/server/0521-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0520-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0522-Limit-recipe-packets.patch b/patches/server/0521-Limit-recipe-packets.patch
index f40301fce3..f40301fce3 100644
--- a/patches/server/0522-Limit-recipe-packets.patch
+++ b/patches/server/0521-Limit-recipe-packets.patch
diff --git a/patches/server/0523-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0522-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0523-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0522-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0524-Player-Chunk-Load-Unload-Events.patch b/patches/server/0523-Player-Chunk-Load-Unload-Events.patch
index a18b7e1b50..a18b7e1b50 100644
--- a/patches/server/0524-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0523-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0525-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0524-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0525-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0524-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0526-Expose-LivingEntity-hurt-direction.patch b/patches/server/0525-Expose-LivingEntity-hurt-direction.patch
index ff8defb04b..ff8defb04b 100644
--- a/patches/server/0526-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0525-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0527-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0526-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 5c4a714385..50d1f220a7 100644
--- a/patches/server/0527-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0526-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,10 +5,10 @@ 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 c2eefe215f47e36cc2b8476750ae00ec88f826a6..7f8dbc94ad04ff58e0ee7591b42e268ee4b75576 100644
+index 2809ec8fcd43d096a187fc2fbda042a81d301c0c..311f38cc6f64339089ffeb899c4f421e74b44602 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -263,6 +263,10 @@ public class CraftEventFactory {
+@@ -264,6 +264,10 @@ public class CraftEventFactory {
                          return BedEnterResult.TOO_FAR_AWAY;
                      case NOT_SAFE:
                          return BedEnterResult.NOT_SAFE;
diff --git a/patches/server/0528-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0527-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index a66e8fc14d..a66e8fc14d 100644
--- a/patches/server/0528-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0527-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0529-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0528-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 339a34391b..339a34391b 100644
--- a/patches/server/0529-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0528-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0530-Implement-TargetHitEvent.patch b/patches/server/0529-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0530-Implement-TargetHitEvent.patch
+++ b/patches/server/0529-Implement-TargetHitEvent.patch
diff --git a/patches/server/0531-MC-4-Fix-item-position-desync.patch b/patches/server/0530-MC-4-Fix-item-position-desync.patch
index 92072f73f2..92072f73f2 100644
--- a/patches/server/0531-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0530-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0532-Additional-Block-Material-API-s.patch b/patches/server/0531-Additional-Block-Material-API-s.patch
index e93239aae5..e93239aae5 100644
--- a/patches/server/0532-Additional-Block-Material-API-s.patch
+++ b/patches/server/0531-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0533-Fix-harming-potion-dupe.patch b/patches/server/0532-Fix-harming-potion-dupe.patch
index d131d6c979..d131d6c979 100644
--- a/patches/server/0533-Fix-harming-potion-dupe.patch
+++ b/patches/server/0532-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0534-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index b68431ed82..b68431ed82 100644
--- a/patches/server/0534-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0535-Cache-burn-durations.patch b/patches/server/0534-Cache-burn-durations.patch
index 35387cbe57..35387cbe57 100644
--- a/patches/server/0535-Cache-burn-durations.patch
+++ b/patches/server/0534-Cache-burn-durations.patch
diff --git a/patches/server/0536-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0535-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index b11735c5d7..b11735c5d7 100644
--- a/patches/server/0536-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0535-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0537-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0536-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..8967f3f735 100644
--- a/patches/server/0537-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0536-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0538-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0537-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0538-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0537-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0539-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0538-Fix-interact-event-not-being-called-in-adventure.patch
index 8cd15192dc..8cd15192dc 100644
--- a/patches/server/0539-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0538-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0540-Zombie-API-breaking-doors.patch b/patches/server/0539-Zombie-API-breaking-doors.patch
index b89994b417..b89994b417 100644
--- a/patches/server/0540-Zombie-API-breaking-doors.patch
+++ b/patches/server/0539-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0541-Fix-nerfed-slime-when-splitting.patch b/patches/server/0540-Fix-nerfed-slime-when-splitting.patch
index 726d362dff..726d362dff 100644
--- a/patches/server/0541-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0540-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0542-Add-EntityLoadCrossbowEvent.patch b/patches/server/0541-Add-EntityLoadCrossbowEvent.patch
index 6ffab47e6e..6ffab47e6e 100644
--- a/patches/server/0542-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0541-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0543-Guardian-beam-workaround.patch b/patches/server/0542-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0543-Guardian-beam-workaround.patch
+++ b/patches/server/0542-Guardian-beam-workaround.patch
diff --git a/patches/server/0544-Added-WorldGameRuleChangeEvent.patch b/patches/server/0543-Added-WorldGameRuleChangeEvent.patch
index 98de18415c..98de18415c 100644
--- a/patches/server/0544-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0543-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0545-Added-ServerResourcesReloadedEvent.patch b/patches/server/0544-Added-ServerResourcesReloadedEvent.patch
index 08c7e91119..08c7e91119 100644
--- a/patches/server/0545-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0544-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0546-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0545-Added-world-settings-for-mobs-picking-up-loot.patch
index 4c1e7b2549..4c1e7b2549 100644
--- a/patches/server/0546-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0545-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0547-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0546-Implemented-BlockFailedDispenseEvent.patch
index 9c14300d5a..19ca380c40 100644
--- a/patches/server/0547-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0546-Implemented-BlockFailedDispenseEvent.patch
@@ -32,10 +32,10 @@ index 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7
          } 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 7f8dbc94ad04ff58e0ee7591b42e268ee4b75576..5162109ea1f8284f0302306f8dac3048ce0b7010 100644
+index 311f38cc6f64339089ffeb899c4f421e74b44602..2b480c1de5487febc9033fd96ed3eaffc0179fed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1868,4 +1868,12 @@ public class CraftEventFactory {
+@@ -1858,4 +1858,12 @@ public class CraftEventFactory {
          EntitiesUnloadEvent event = new EntitiesUnloadEvent(new CraftChunk((ServerLevel) world, coords.x, coords.z), bukkitEntities);
          Bukkit.getPluginManager().callEvent(event);
      }
diff --git a/patches/server/0548-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0547-Added-PlayerLecternPageChangeEvent.patch
index d8fd03b1c7..d8fd03b1c7 100644
--- a/patches/server/0548-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0547-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0549-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0548-Added-PlayerLoomPatternSelectEvent.patch
index a99d30af29..a99d30af29 100644
--- a/patches/server/0549-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0548-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0550-Configurable-door-breaking-difficulty.patch b/patches/server/0549-Configurable-door-breaking-difficulty.patch
index 45e5e3e168..45e5e3e168 100644
--- a/patches/server/0550-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0549-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0551-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0550-Empty-commands-shall-not-be-dispatched.patch
index 1c382dc0f6..1c382dc0f6 100644
--- a/patches/server/0551-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0550-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0552-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0551-Implement-API-to-expose-exact-interaction-point.patch
index 0ede6bf153..a7f9d15f9f 100644
--- a/patches/server/0552-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0551-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index 1b45c1483a7ebad47162483b51036f9dfcdf62f6..32746dfbc2fdfc150583676b1bf07623
          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 5162109ea1f8284f0302306f8dac3048ce0b7010..7bafab016aeb3b1177b23f44696e7178f25d414a 100644
+index 2b480c1de5487febc9033fd96ed3eaffc0179fed..37e89f7103c1e28028ee3892e1b0123bf3dedd3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
@@ -31,7 +31,7 @@ index 5162109ea1f8284f0302306f8dac3048ce0b7010..7bafab016aeb3b1177b23f44696e7178
  import org.bukkit.Material;
  import org.bukkit.NamespacedKey;
  import org.bukkit.Server;
-@@ -483,7 +485,13 @@ public class CraftEventFactory {
+@@ -473,7 +475,13 @@ public class CraftEventFactory {
          return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand);
      }
  
@@ -45,7 +45,7 @@ index 5162109ea1f8284f0302306f8dac3048ce0b7010..7bafab016aeb3b1177b23f44696e7178
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
  
-@@ -509,7 +517,10 @@ public class CraftEventFactory {
+@@ -499,7 +507,10 @@ public class CraftEventFactory {
              itemInHand = null;
          }
  
diff --git a/patches/server/0553-Remove-stale-POIs.patch b/patches/server/0552-Remove-stale-POIs.patch
index 19074bf113..49aa970c17 100644
--- a/patches/server/0553-Remove-stale-POIs.patch
+++ b/patches/server/0552-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af06eb25172ff4ea3fdf2757ce17622e7f4075ae..13eab90d911eccdd6f0a4f4c3608ca94a942c95e 100644
+index da8a708d24611bd0580ae0132cac277a6580b0ea..944719180fff8ac34682330ecf456fa90a4e95f2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1955,6 +1955,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0554-Fix-villager-boat-exploit.patch b/patches/server/0553-Fix-villager-boat-exploit.patch
index 59a1fd1acc..59a1fd1acc 100644
--- a/patches/server/0554-Fix-villager-boat-exploit.patch
+++ b/patches/server/0553-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0555-Add-sendOpLevel-API.patch b/patches/server/0554-Add-sendOpLevel-API.patch
index 6aef8b6924..64112fd9bd 100644
--- a/patches/server/0555-Add-sendOpLevel-API.patch
+++ b/patches/server/0554-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 2732af0971dcac3fab8043b1e1ae2a57925699a2..a199dee07c67e4e66bbdccd2c5f77223
  
      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 3719f891dfb1e12d68443aa5050b408de3b65f4a..0f523f688a607cc4ff91f2b18be896f64b8d36bd 100644
+index 87938df67f0d52081f6052b5670313adc7d5d988..41167d0da3d88466d4251c0adc56b4fd215c3bce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -647,6 +647,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0556-Add-PaperRegistry.patch b/patches/server/0555-Add-PaperRegistry.patch
index 172e03c5a5..172e03c5a5 100644
--- a/patches/server/0556-Add-PaperRegistry.patch
+++ b/patches/server/0555-Add-PaperRegistry.patch
diff --git a/patches/server/0557-Add-StructuresLocateEvent.patch b/patches/server/0556-Add-StructuresLocateEvent.patch
index 42d31007ce..42d31007ce 100644
--- a/patches/server/0557-Add-StructuresLocateEvent.patch
+++ b/patches/server/0556-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0558-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0557-Collision-option-for-requiring-a-player-participant.patch
index 6c436a789b..6c436a789b 100644
--- a/patches/server/0558-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0557-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0559-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0558-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 1af8b9fb5e..1af8b9fb5e 100644
--- a/patches/server/0559-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0558-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0560-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0559-Return-chat-component-with-empty-text-instead-of-thr.patch
index b83b5915fd..b83b5915fd 100644
--- a/patches/server/0560-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0559-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0561-Make-schedule-command-per-world.patch b/patches/server/0560-Make-schedule-command-per-world.patch
index 60f5d1fc66..60f5d1fc66 100644
--- a/patches/server/0561-Make-schedule-command-per-world.patch
+++ b/patches/server/0560-Make-schedule-command-per-world.patch
diff --git a/patches/server/0562-Configurable-max-leash-distance.patch b/patches/server/0561-Configurable-max-leash-distance.patch
index ba76f79b7f..ba76f79b7f 100644
--- a/patches/server/0562-Configurable-max-leash-distance.patch
+++ b/patches/server/0561-Configurable-max-leash-distance.patch
diff --git a/patches/server/0563-Implement-BlockPreDispenseEvent.patch b/patches/server/0562-Implement-BlockPreDispenseEvent.patch
index 34982b77cc..14852682e6 100644
--- a/patches/server/0563-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0562-Implement-BlockPreDispenseEvent.patch
@@ -17,10 +17,10 @@ index 85c5319837295bd2f85baebfe8d6660b267f1d5f..8f55d0753fa26924235c943595f0d1a0
                  tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7bafab016aeb3b1177b23f44696e7178f25d414a..2c45c71274e026936c0e1c91e1b0555f21a7a611 100644
+index 37e89f7103c1e28028ee3892e1b0123bf3dedd3f..81490d62c49c0fc4aba6ec50aa4eafaf103c8ee6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1886,5 +1886,11 @@ public class CraftEventFactory {
+@@ -1876,5 +1876,11 @@ public class CraftEventFactory {
          io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
          return event.callEvent();
      }
diff --git a/patches/server/0564-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0563-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 2f90dea41c..2f90dea41c 100644
--- a/patches/server/0564-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0563-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0565-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0564-Add-toggle-for-always-placing-the-dragon-egg.patch
index caffaecf90..caffaecf90 100644
--- a/patches/server/0565-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0564-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0566-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0565-Added-PlayerStonecutterRecipeSelectEvent.patch
index 1c6497d193..1c6497d193 100644
--- a/patches/server/0566-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0565-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0567-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0566-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 1ab6c748f8..134418ef42 100644
--- a/patches/server/0567-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0566-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d7b137a84deea68c75ee0b3c99b089b8dff25947..e08d69af81f4ca0535be522eef4792e4127f454c 100644
+index 2ae973d77d0b088cf7dc7a2338b8b7461e585dca..513bfbd0775ee0a880a031baaaf1bfe1f3788dc3 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1248,12 +1248,15 @@ public abstract class Mob extends LivingEntity {
              return InteractionResult.PASS;
          } else if (this.getLeashHolder() == player) {
              // CraftBukkit start - fire PlayerUnleashEntityEvent
--            if (CraftEventFactory.callPlayerUnleashEntityEvent(this, player).isCancelled()) {
+-            if (CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand).isCancelled()) {
 +            // Paper start - drop leash variable
-+            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild);
++            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.getAbilities().instabuild);
 +            if (event.isCancelled()) {
 +                // Paper end
                  ((ServerPlayer) player).connection.send(new ClientboundSetEntityLinkPacket(this, this.getLeashHolder()));
@@ -101,16 +101,16 @@ index 15f56707a1f06f5c33f231a15a6c5f4b4a85cb4e..f5cb3576aa2560c86f4a1df9d51d8ecd
              } else if (f > 6.0F) {
                  double d0 = (entity.getX() - this.getX()) / (double) f;
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
-index 7eb315aac7737cf443c693147c2cfd871f201724..03de59302041b0bc13922ec129501417804df915 100644
+index bbfd099634c6cceb0afcc7bbe2f26b872a1506c3..c076a2e42579b94c1667654913f722f5cc57a27f 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
 @@ -122,11 +122,14 @@ public class LeashFenceKnotEntity extends HangingEntity {
                          entityinsentient = (Mob) iterator.next();
                          if (entityinsentient.isLeashed() && entityinsentient.getLeashHolder() == this) {
                              // CraftBukkit start
--                            if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player).isCancelled()) {
+-                            if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, hand).isCancelled()) {
 +                            // Paper start - drop leash variable
-+                            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, !player.getAbilities().instabuild);
++                            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, hand, !player.getAbilities().instabuild);
 +                            if (event.isCancelled()) {
 +                                // Paper end
                                  die = false;
@@ -122,18 +122,18 @@ index 7eb315aac7737cf443c693147c2cfd871f201724..03de59302041b0bc13922ec129501417
                          }
                      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2c45c71274e026936c0e1c91e1b0555f21a7a611..9ccfe52a61b72addfa675af797ea4bafbff30bdb 100644
+index 81490d62c49c0fc4aba6ec50aa4eafaf103c8ee6..bf0e01bdcce6e5b682518f35f0239b97e57713ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1527,8 +1527,10 @@ public class CraftEventFactory {
+@@ -1517,8 +1517,10 @@ public class CraftEventFactory {
          return itemInHand;
      }
  
--    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player) {
--        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity());
+-    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand) {
+-        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand));
 +    // Paper start - drop leash variable
-+    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, boolean dropLeash) {
-+        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), dropLeash);
++    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand, boolean dropLeash) {
++        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand), dropLeash);
 +        // Paper end
          entity.level.getCraftServer().getPluginManager().callEvent(event);
          return event;
diff --git a/patches/server/0568-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0567-Reset-shield-blocking-on-dimension-change.patch
index d43e9466ff..d43e9466ff 100644
--- a/patches/server/0568-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0567-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0569-add-DragonEggFormEvent.patch b/patches/server/0568-add-DragonEggFormEvent.patch
index 40273bbb47..40273bbb47 100644
--- a/patches/server/0569-add-DragonEggFormEvent.patch
+++ b/patches/server/0568-add-DragonEggFormEvent.patch
diff --git a/patches/server/0570-EntityMoveEvent.patch b/patches/server/0569-EntityMoveEvent.patch
index 1961bd23da..cdb6134eca 100644
--- a/patches/server/0570-EntityMoveEvent.patch
+++ b/patches/server/0569-EntityMoveEvent.patch
@@ -29,10 +29,10 @@ index 944719180fff8ac34682330ecf456fa90a4e95f2..8ccc21373bb52a80d76c62cf875963da
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6ad8cfb509920c448fc51ec02e867b1552730df..f774d25eaaa1b7966b16251619da80a2d5c9228c 100644
+index 0896cbe04be6a5471088c321296506415fccbed6..cc930b8a22b3e3540b9fb24c6eaa329895c075cb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3303,6 +3303,20 @@ public abstract class LivingEntity extends Entity {
+@@ -3306,6 +3306,20 @@ public abstract class LivingEntity extends Entity {
  
          this.pushEntities();
          this.level.getProfiler().pop();
diff --git a/patches/server/0571-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch
index 5fc269d9a0..ec7b45a19d 100644
--- a/patches/server/0571-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ef4b5ff8f5163effd9526c67e3d9750e8a3f561b..60e86357327f7bd7141d421b2d6d52d433118f1f 100644
+index 8ccc21373bb52a80d76c62cf875963da8d25b247..961d24e1e0d5ee8429ab558893a356d175b31d39 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1529,6 +1529,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0572-Inline-shift-direction-fields.patch b/patches/server/0571-Inline-shift-direction-fields.patch
index d4353368a2..d4353368a2 100644
--- a/patches/server/0572-Inline-shift-direction-fields.patch
+++ b/patches/server/0571-Inline-shift-direction-fields.patch
diff --git a/patches/server/0573-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch
index e71e9cff71..9dc2ff3234 100644
--- a/patches/server/0573-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,10 +5,10 @@ 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 9ccfe52a61b72addfa675af797ea4bafbff30bdb..82d8a8c2199673315c7b52e694f798cc59c5f96c 100644
+index bf0e01bdcce6e5b682518f35f0239b97e57713ae..2faefc58ac600fb6b374ef87c6f8f378d3883594 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -396,13 +396,30 @@ public class CraftEventFactory {
+@@ -399,13 +399,30 @@ public class CraftEventFactory {
      }
  
      public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
diff --git a/patches/server/0574-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0574-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0575-living-entity-allow-attribute-registration.patch b/patches/server/0574-living-entity-allow-attribute-registration.patch
index 8b29222bec..8b29222bec 100644
--- a/patches/server/0575-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0574-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0576-fix-dead-slime-setSize-invincibility.patch b/patches/server/0575-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0576-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0575-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0577-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0577-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0578-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0577-Add-support-for-hex-color-codes-in-console.patch
index e17cdae98b..e17cdae98b 100644
--- a/patches/server/0578-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0577-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0579-Expose-Tracked-Players.patch b/patches/server/0578-Expose-Tracked-Players.patch
index e3f023c819..e3f023c819 100644
--- a/patches/server/0579-Expose-Tracked-Players.patch
+++ b/patches/server/0578-Expose-Tracked-Players.patch
diff --git a/patches/server/0580-Remove-streams-from-SensorNearest.patch b/patches/server/0579-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0580-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0579-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0581-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0581-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0582-Improve-ServerGUI.patch b/patches/server/0581-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0582-Improve-ServerGUI.patch
+++ b/patches/server/0581-Improve-ServerGUI.patch
diff --git a/patches/server/0583-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0583-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0584-fix-converting-txt-to-json-file.patch b/patches/server/0583-fix-converting-txt-to-json-file.patch
index f43088ff63..f43088ff63 100644
--- a/patches/server/0584-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0583-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0585-Add-worldborder-events.patch b/patches/server/0584-Add-worldborder-events.patch
index af0cf2d370..af0cf2d370 100644
--- a/patches/server/0585-Add-worldborder-events.patch
+++ b/patches/server/0584-Add-worldborder-events.patch
diff --git a/patches/server/0586-added-PlayerNameEntityEvent.patch b/patches/server/0585-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0586-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0585-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0587-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0586-Prevent-grindstones-from-overstacking-items.patch
index 3e79faf014..3e79faf014 100644
--- a/patches/server/0587-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0586-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0588-Add-recipe-to-cook-events.patch b/patches/server/0587-Add-recipe-to-cook-events.patch
index 61023ab91c..61023ab91c 100644
--- a/patches/server/0588-Add-recipe-to-cook-events.patch
+++ b/patches/server/0587-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0589-Add-Block-isValidTool.patch b/patches/server/0588-Add-Block-isValidTool.patch
index 95bf6c3432..95bf6c3432 100644
--- a/patches/server/0589-Add-Block-isValidTool.patch
+++ b/patches/server/0588-Add-Block-isValidTool.patch
diff --git a/patches/server/0590-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0589-Allow-using-signs-inside-spawn-protection.patch
index e2dfe62f54..e2dfe62f54 100644
--- a/patches/server/0590-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0589-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0591-Expand-world-key-API.patch b/patches/server/0590-Expand-world-key-API.patch
index 8ba278c90f..8ba278c90f 100644
--- a/patches/server/0591-Expand-world-key-API.patch
+++ b/patches/server/0590-Expand-world-key-API.patch
diff --git a/patches/server/0592-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0592-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0593-Item-Rarity-API.patch b/patches/server/0592-Item-Rarity-API.patch
index e3e4b42355..e3e4b42355 100644
--- a/patches/server/0593-Item-Rarity-API.patch
+++ b/patches/server/0592-Item-Rarity-API.patch
diff --git a/patches/server/0594-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index a8810d8bca..a8810d8bca 100644
--- a/patches/server/0594-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0595-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0594-copy-TESign-isEditable-from-snapshots.patch
index 766607080f..766607080f 100644
--- a/patches/server/0595-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0594-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0596-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch
index 04925bb087..04925bb087 100644
--- a/patches/server/0596-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0597-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0596-forced-whitelist-use-configurable-kick-message.patch
index cf1f9f3caf..cf1f9f3caf 100644
--- a/patches/server/0597-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0596-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0598-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 661e62955f..661e62955f 100644
--- a/patches/server/0598-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0599-Entity-load-save-limit-per-chunk.patch b/patches/server/0598-Entity-load-save-limit-per-chunk.patch
index 3aaa2613fc..3aaa2613fc 100644
--- a/patches/server/0599-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0598-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0600-Expose-protocol-version.patch b/patches/server/0599-Expose-protocol-version.patch
index d01a192416..d01a192416 100644
--- a/patches/server/0600-Expose-protocol-version.patch
+++ b/patches/server/0599-Expose-protocol-version.patch
diff --git a/patches/server/0601-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch
index f20da4badc..f20da4badc 100644
--- a/patches/server/0601-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 419a5f5e50..d9d623aa35 100644
--- a/patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,10 +9,10 @@ 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 f774d25eaaa1b7966b16251619da80a2d5c9228c..d427cd90177b14062ea56dcf6fa5fedddcdbb624 100644
+index cc930b8a22b3e3540b9fb24c6eaa329895c075cb..93ba2f0bc5fec094933f0fa25e084df2998e0949 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3777,6 +3777,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3781,6 +3781,7 @@ public abstract class LivingEntity extends Entity {
                          level.getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {
diff --git a/patches/server/0603-Add-bypass-host-check.patch b/patches/server/0602-Add-bypass-host-check.patch
index 85854dc71d..85854dc71d 100644
--- a/patches/server/0603-Add-bypass-host-check.patch
+++ b/patches/server/0602-Add-bypass-host-check.patch
diff --git a/patches/server/0604-Set-area-affect-cloud-rotation.patch b/patches/server/0603-Set-area-affect-cloud-rotation.patch
index 08e992b45c..08e992b45c 100644
--- a/patches/server/0604-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0603-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0605-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch
index 23d24c3698..23d24c3698 100644
--- a/patches/server/0605-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0606-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch
index 0c37516dd7..0c37516dd7 100644
--- a/patches/server/0606-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0607-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0607-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0608-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch
index df4e7b0b17..df4e7b0b17 100644
--- a/patches/server/0608-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0609-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0609-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0610-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch
index 3840306aa1..3840306aa1 100644
--- a/patches/server/0610-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0611-Added-PlayerDeepSleepEvent.patch b/patches/server/0610-Added-PlayerDeepSleepEvent.patch
index b7989ecad1..b7989ecad1 100644
--- a/patches/server/0611-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0610-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0612-More-World-API.patch b/patches/server/0611-More-World-API.patch
index 23edd9b83c..23edd9b83c 100644
--- a/patches/server/0612-More-World-API.patch
+++ b/patches/server/0611-More-World-API.patch
diff --git a/patches/server/0613-Added-PlayerBedFailEnterEvent.patch b/patches/server/0612-Added-PlayerBedFailEnterEvent.patch
index ad6eaeb223..ad6eaeb223 100644
--- a/patches/server/0613-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0612-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0614-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch
index 361b5a010c..361b5a010c 100644
--- a/patches/server/0614-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0615-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index cace3debb8..cace3debb8 100644
--- a/patches/server/0615-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0616-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0615-Introduce-beacon-activation-deactivation-events.patch
index b3f265d709..b3f265d709 100644
--- a/patches/server/0616-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0615-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0617-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch
index b58233b00a..b58233b00a 100644
--- a/patches/server/0617-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0618-Add-Channel-initialization-listeners.patch b/patches/server/0617-Add-Channel-initialization-listeners.patch
index bbb1c7c21d..bbb1c7c21d 100644
--- a/patches/server/0618-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0617-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0619-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch
index e31efa98f9..e31efa98f9 100644
--- a/patches/server/0619-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0620-Add-more-WanderingTrader-API.patch b/patches/server/0619-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0620-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0619-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0621-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0620-Add-EntityBlockStorage-clearEntities.patch
index 2bd0ddfa38..2bd0ddfa38 100644
--- a/patches/server/0621-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0620-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0622-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 4169ad0754..4169ad0754 100644
--- a/patches/server/0622-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0623-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index e0d7dfa858..091df9dbd5 100644
--- a/patches/server/0623-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1f311f84f8f291228a3b52471835d33c220db849..76d6572429548d90b5efa3029f33923a81f54c3f 100644
+index 8a2fdfb701ec663310c8f3f86607b6df1f2e01a4..fdd64b7bf24314a0d01444f0b074019b2031efdc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -371,12 +371,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0624-Inventory-close.patch b/patches/server/0623-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0624-Inventory-close.patch
+++ b/patches/server/0623-Inventory-close.patch
diff --git a/patches/server/0625-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch
index 69d7b501e2..69d7b501e2 100644
--- a/patches/server/0625-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0626-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 15c8339c99..15c8339c99 100644
--- a/patches/server/0626-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0627-Fix-CraftPotionBrewer-cache.patch b/patches/server/0626-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0627-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0626-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0628-Add-basic-Datapack-API.patch b/patches/server/0627-Add-basic-Datapack-API.patch
index 5bcb6e081e..5bcb6e081e 100644
--- a/patches/server/0628-Add-basic-Datapack-API.patch
+++ b/patches/server/0627-Add-basic-Datapack-API.patch
diff --git a/patches/server/0629-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0628-Add-environment-variable-to-disable-server-gui.patch
index 49bb358278..49bb358278 100644
--- a/patches/server/0629-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0628-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0630-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch
index f5024d9728..ee9b3d0f02 100644
--- a/patches/server/0630-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch
@@ -139,7 +139,7 @@ index 161b5d6f0d420ac7b6ed112d1b03d42c3aaec421..de4c3849cc60151de8f3a873adad2bc3
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0f523f688a607cc4ff91f2b18be896f64b8d36bd..64c6a35ab369a19924dba94018c361dc2d24be82 100644
+index 41167d0da3d88466d4251c0adc56b4fd215c3bce..3be62930b3f69fda6ab8b21eae43e2544b2706cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1465,7 +1465,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0631-ItemStack-repair-check-API.patch b/patches/server/0630-ItemStack-repair-check-API.patch
index 136bbcb302..136bbcb302 100644
--- a/patches/server/0631-ItemStack-repair-check-API.patch
+++ b/patches/server/0630-ItemStack-repair-check-API.patch
diff --git a/patches/server/0632-More-Enchantment-API.patch b/patches/server/0631-More-Enchantment-API.patch
index 538c746f7e..538c746f7e 100644
--- a/patches/server/0632-More-Enchantment-API.patch
+++ b/patches/server/0631-More-Enchantment-API.patch
diff --git a/patches/server/0633-Move-range-check-for-block-placing-up.patch b/patches/server/0632-Move-range-check-for-block-placing-up.patch
index f4a82e33e1..f4a82e33e1 100644
--- a/patches/server/0633-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0632-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0634-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch
index 7466f77f39..98096691c6 100644
--- a/patches/server/0634-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch
@@ -272,7 +272,7 @@ index 2f82002c52af7304ff6b2d6fe8f094314daf0bba..5962f7a2b185d7d54a0f9e341a4fdf6e
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6758b78d1d780de3fecd6818f0ef83855fb82eef..a61a0a61ee5c96de68521ae3d01fd9f75526502c 100644
+index ac5119577debc7262fc5d1bdb746a2e31a0d901b..b108b4ce54570a841086adffac542d8f7f2f2c6d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -545,11 +545,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0635-Add-Mob-lookAt-API.patch b/patches/server/0634-Add-Mob-lookAt-API.patch
index 2179be5193..2179be5193 100644
--- a/patches/server/0635-Add-Mob-lookAt-API.patch
+++ b/patches/server/0634-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0636-Add-Unix-domain-socket-support.patch b/patches/server/0635-Add-Unix-domain-socket-support.patch
index e9f8538eff..e9f8538eff 100644
--- a/patches/server/0636-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0635-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0637-Add-EntityInsideBlockEvent.patch b/patches/server/0636-Add-EntityInsideBlockEvent.patch
index 0ca02bfa9a..e9906dfffc 100644
--- a/patches/server/0637-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0636-Add-EntityInsideBlockEvent.patch
@@ -197,7 +197,7 @@ index 47f54002654d198a56a85884de34e305e545eb4b..518d3832c36c9ecf1ed9267ffc1f926d
              entity.makeStuckInBlock(state, new Vec3(0.8999999761581421D, 1.5D, 0.8999999761581421D));
              if (world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-index 272ec85b1bde4b7a9439ab8fbb2711f3adb65b55..1d28810f697565e34d59ffc8dbf55173c2a671ea 100644
+index 1eddae82b9a438eefa49add5e3706aba755ccf45..1561be49f3a2761ce48bb16ea2dffbf1c37d0536 100644
 --- a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
 @@ -77,6 +77,7 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
diff --git a/patches/server/0638-Attributes-API-for-item-defaults.patch b/patches/server/0637-Attributes-API-for-item-defaults.patch
index 882921f7c0..882921f7c0 100644
--- a/patches/server/0638-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0637-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0639-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0638-Add-cause-to-Weather-ThunderChangeEvents.patch
index 73bdb8eb2b..fb693d3e31 100644
--- a/patches/server/0639-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0638-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 60e86357327f7bd7141d421b2d6d52d433118f1f..cb4e720d25cd71c4094e476732b519a0a6ff2b27 100644
+index 961d24e1e0d5ee8429ab558893a356d175b31d39..81f47264c48a7838d6045b062cbc884cd703ed5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -528,8 +528,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0640-More-Lidded-Block-API.patch b/patches/server/0639-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0640-More-Lidded-Block-API.patch
+++ b/patches/server/0639-More-Lidded-Block-API.patch
diff --git a/patches/server/0641-Limit-item-frame-cursors-on-maps.patch b/patches/server/0640-Limit-item-frame-cursors-on-maps.patch
index 4e2cd3bfa2..4e2cd3bfa2 100644
--- a/patches/server/0641-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0640-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0642-Add-PlayerKickEvent-causes.patch b/patches/server/0641-Add-PlayerKickEvent-causes.patch
index 77f684e693..e9f648dfa6 100644
--- a/patches/server/0642-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0641-Add-PlayerKickEvent-causes.patch
@@ -391,7 +391,7 @@ index 4c2c495d936cb84d85fb3e9f91e101a0fd796026..e316acab310fcf689f7a31f73bb3bc2b
          // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 64c6a35ab369a19924dba94018c361dc2d24be82..a979998b235dcd219f16a3d9c9f56a40cef12cfa 100644
+index 3be62930b3f69fda6ab8b21eae43e2544b2706cf..9aa34da34b3a71c4c685ad5059f0bc69ce8352a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -597,7 +597,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0643-Add-PufferFishStateChangeEvent.patch b/patches/server/0642-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0643-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0642-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0644-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0643-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 0ebe5f6ad9..d66d11a86d 100644
--- a/patches/server/0644-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0643-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix PlayerBucketEmptyEvent result itemstack
 Fixes SPIGOT-2560: https://hub.spigotmc.org/jira/projects/SPIGOT/issues/SPIGOT-2560
 
 diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 7c6c928da4e0f3ac54fa9b9ddce7b0e0bf3cce4b..73f1211470d9626c82c8345037da19aed9db3f23 100644
+index f165b6e83a76d837257d5c30fa6ea838889cfc72..5c6aa9c464784ad5ee366412d080c72d3d22a76f 100644
 --- a/src/main/java/net/minecraft/world/item/BucketItem.java
 +++ b/src/main/java/net/minecraft/world/item/BucketItem.java
 @@ -40,6 +40,8 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
@@ -32,7 +32,7 @@ index 7c6c928da4e0f3ac54fa9b9ddce7b0e0bf3cce4b..73f1211470d9626c82c8345037da19ae
          return !player.getAbilities().instabuild ? new ItemStack(Items.BUCKET) : stack;
      }
  
-@@ -153,6 +162,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
+@@ -152,6 +161,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
                      ((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
                      return false;
                  }
diff --git a/patches/server/0645-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0644-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 4fd0ff61f2..4fd0ff61f2 100644
--- a/patches/server/0645-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0644-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0646-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0645-Add-option-to-fix-items-merging-through-walls.patch
index 0c6f1b92fc..0c6f1b92fc 100644
--- a/patches/server/0646-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0645-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0647-Add-BellRevealRaiderEvent.patch b/patches/server/0646-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0647-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0646-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0648-Fix-invulnerable-end-crystals.patch b/patches/server/0647-Fix-invulnerable-end-crystals.patch
index e5ce326afa..e5ce326afa 100644
--- a/patches/server/0648-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0647-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0649-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0648-Add-ElderGuardianAppearanceEvent.patch
index 13c35cf8b6..13c35cf8b6 100644
--- a/patches/server/0649-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0648-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0650-Fix-dangerous-end-portal-logic.patch b/patches/server/0649-Fix-dangerous-end-portal-logic.patch
index 949aa844ce..949aa844ce 100644
--- a/patches/server/0650-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0649-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0651-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0650-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c46f8fbb65..c46f8fbb65 100644
--- a/patches/server/0651-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0650-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0652-Make-item-validations-configurable.patch b/patches/server/0651-Make-item-validations-configurable.patch
index d079cc7ed2..d079cc7ed2 100644
--- a/patches/server/0652-Make-item-validations-configurable.patch
+++ b/patches/server/0651-Make-item-validations-configurable.patch
diff --git a/patches/server/0653-Line-Of-Sight-Changes.patch b/patches/server/0652-Line-Of-Sight-Changes.patch
index 80cd9d95ac..604f928ae1 100644
--- a/patches/server/0653-Line-Of-Sight-Changes.patch
+++ b/patches/server/0652-Line-Of-Sight-Changes.patch
@@ -5,10 +5,10 @@ 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 d427cd90177b14062ea56dcf6fa5fedddcdbb624..4dee04c8012245b94191454943d68ee20fae887a 100644
+index 93ba2f0bc5fec094933f0fa25e084df2998e0949..914fa03592e006c86c35c4ef1f3879130ad6ee00 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3506,7 +3506,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3509,7 +3509,8 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
diff --git a/patches/server/0654-add-per-world-spawn-limits.patch b/patches/server/0653-add-per-world-spawn-limits.patch
index 252b1ab32b..252b1ab32b 100644
--- a/patches/server/0654-add-per-world-spawn-limits.patch
+++ b/patches/server/0653-add-per-world-spawn-limits.patch
diff --git a/patches/server/0655-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0654-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0655-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0654-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0656-Add-more-LimitedRegion-API.patch b/patches/server/0655-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0656-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0655-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0657-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0656-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 77f6b6fccb..77f6b6fccb 100644
--- a/patches/server/0657-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0656-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0658-Missing-Entity-Behavior-API.patch b/patches/server/0657-Missing-Entity-Behavior-API.patch
index fecc136bbf..fecc136bbf 100644
--- a/patches/server/0658-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0657-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0659-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0658-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index a2ab09f58e..a2ab09f58e 100644
--- a/patches/server/0659-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0658-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0660-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0659-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 863796fe03..863796fe03 100644
--- a/patches/server/0660-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0659-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0660-Use-getChunkIfLoadedImmediately-in-places.patch
index aabc626bc4..c34f64e7e9 100644
--- a/patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0660-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cb4e720d25cd71c4094e476732b519a0a6ff2b27..10abc211d4b5688de95066caccc7486acafd2858 100644
+index 81f47264c48a7838d6045b062cbc884cd703ed5d..619105bd19d5aa78efc6527371646ee79caf2015 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,7 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0662-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0661-Fix-commands-from-signs-not-firing-command-events.patch
index c66c6d829d..c66c6d829d 100644
--- a/patches/server/0662-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0661-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0663-Adds-PlayerArmSwingEvent.patch b/patches/server/0662-Adds-PlayerArmSwingEvent.patch
index a21292ebf2..a21292ebf2 100644
--- a/patches/server/0663-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0662-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0664-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0663-Fixes-kick-event-leave-message-not-being-sent.patch
index 4bf0b330d1..4bf0b330d1 100644
--- a/patches/server/0664-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0663-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0665-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0664-Add-config-for-mobs-immune-to-default-effects.patch
index 40f29a68fc..fe187880f1 100644
--- a/patches/server/0665-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0664-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4dee04c8012245b94191454943d68ee20fae887a..6e2301f58f103b70b491fd59d5a6657593ac94b7 100644
+index 914fa03592e006c86c35c4ef1f3879130ad6ee00..cba73b4bf817a164726863aecada7c05c5975591 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1153,7 +1153,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0666-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0665-Fix-incorrect-message-for-outdated-client.patch
index 7f39718ca5..7f39718ca5 100644
--- a/patches/server/0666-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0665-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0667-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0666-Don-t-apply-cramming-damage-to-players.patch
index 6487e17c55..6487e17c55 100644
--- a/patches/server/0667-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0666-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0668-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0667-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 30867e6cf9..30867e6cf9 100644
--- a/patches/server/0668-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0667-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0669-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0668-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 34628f8969..34628f8969 100644
--- a/patches/server/0669-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0668-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0670-Stinger-API.patch b/patches/server/0669-Stinger-API.patch
index bfa434970f..bfa434970f 100644
--- a/patches/server/0670-Stinger-API.patch
+++ b/patches/server/0669-Stinger-API.patch
diff --git a/patches/server/0671-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0670-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 3f1afe6bf8..3f1afe6bf8 100644
--- a/patches/server/0671-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0670-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0672-Add-System.out-err-catcher.patch b/patches/server/0671-Add-System.out-err-catcher.patch
index 2a683a5cf1..2a683a5cf1 100644
--- a/patches/server/0672-Add-System.out-err-catcher.patch
+++ b/patches/server/0671-Add-System.out-err-catcher.patch
diff --git a/patches/server/0673-Fix-test-not-bootstrapping.patch b/patches/server/0672-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0673-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0672-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0674-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0673-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0674-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0673-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0675-Improve-boat-collision-performance.patch b/patches/server/0674-Improve-boat-collision-performance.patch
index 655f2366da..e4cc2289a0 100644
--- a/patches/server/0675-Improve-boat-collision-performance.patch
+++ b/patches/server/0674-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 4fce18c52c8144460ebf0c1e336dce712d796cc6..384ddb03af26ae360fd22e2e231d9d14
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6e2301f58f103b70b491fd59d5a6657593ac94b7..76ef3f561e3f8e0c0f9732feb64aacca93b57431 100644
+index cba73b4bf817a164726863aecada7c05c5975591..327dc44770656932879ffe58d9bbacb6ca3d0713 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1341,7 +1341,7 @@ public abstract class LivingEntity extends Entity {
@@ -44,7 +44,7 @@ index 6e2301f58f103b70b491fd59d5a6657593ac94b7..76ef3f561e3f8e0c0f9732feb64aacca
                          d0 = (Math.random() - Math.random()) * 0.01D;
                      }
  
-@@ -2163,7 +2164,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2166,7 +2167,7 @@ public abstract class LivingEntity extends Entity {
                  this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
                  Entity entity = damagesource.getDirectEntity();
  
diff --git a/patches/server/0676-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0675-Prevent-AFK-kick-while-watching-end-credits.patch
index e20f451739..e20f451739 100644
--- a/patches/server/0676-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0675-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0677-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0676-Allow-skipping-writing-of-comments-to-server.propert.patch
index b14eca2ac6..b14eca2ac6 100644
--- a/patches/server/0677-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0676-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0678-Add-PlayerSetSpawnEvent.patch b/patches/server/0677-Add-PlayerSetSpawnEvent.patch
index e91df03693..4f372eda86 100644
--- a/patches/server/0678-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0677-Add-PlayerSetSpawnEvent.patch
@@ -129,7 +129,7 @@ index c3e49a781f838e6a46cb89744f3f1846de182275..c2f3d3a09327e7cb7d3167609eb3ce68
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a979998b235dcd219f16a3d9c9f56a40cef12cfa..3ff0c79134c1c474bc1e55b879394939a345562e 100644
+index 9aa34da34b3a71c4c685ad5059f0bc69ce8352a0..8ac816295ce5bc9f2696fe790f4319e5ba16116f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1285,9 +1285,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0679-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0678-Make-hoppers-respect-inventory-max-stack-size.patch
index b4a083a5f7..b4a083a5f7 100644
--- a/patches/server/0679-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0678-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0680-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0679-Optimize-entity-tracker-passenger-checks.patch
index d3fef67200..d3fef67200 100644
--- a/patches/server/0680-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0679-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0681-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0680-Config-option-for-Piglins-guarding-chests.patch
index c66e6ea022..c66e6ea022 100644
--- a/patches/server/0681-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0680-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0682-Added-EntityDamageItemEvent.patch b/patches/server/0681-Added-EntityDamageItemEvent.patch
index ec43bd00c9..ec43bd00c9 100644
--- a/patches/server/0682-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0681-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0683-Optimize-indirect-passenger-iteration.patch b/patches/server/0682-Optimize-indirect-passenger-iteration.patch
index 24b6d99483..24b6d99483 100644
--- a/patches/server/0683-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0682-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0684-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0683-Fix-block-drops-position-losing-precision-millions-o.patch
index 6b5cd596c4..6b5cd596c4 100644
--- a/patches/server/0684-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0683-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0685-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0684-Configurable-item-frame-map-cursor-update-interval.patch
index 5e1d739a7c..5e1d739a7c 100644
--- a/patches/server/0685-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0684-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0686-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0685-Make-EntityUnleashEvent-cancellable.patch
index b16ad47f2f..77152eb4db 100644
--- a/patches/server/0686-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0685-Make-EntityUnleashEvent-cancellable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e08d69af81f4ca0535be522eef4792e4127f454c..5fb88a3b7242a2712a568aaccebe601f89bfee3a 100644
+index 513bfbd0775ee0a880a031baaaf1bfe1f3788dc3..b9685fa96bb59b4b080ffd0ac53e4c5581aaeb8b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1488,7 +1488,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0687-Clear-bucket-NBT-after-dispense.patch b/patches/server/0686-Clear-bucket-NBT-after-dispense.patch
index 52e26f4674..52e26f4674 100644
--- a/patches/server/0687-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0686-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0688-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0687-Change-EnderEye-target-without-changing-other-things.patch
index ce9dc32309..ce9dc32309 100644
--- a/patches/server/0688-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0687-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0689-Add-BlockBreakBlockEvent.patch b/patches/server/0688-Add-BlockBreakBlockEvent.patch
index a69de03ab7..a69de03ab7 100644
--- a/patches/server/0689-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0688-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0690-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0689-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0690-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0689-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0691-More-CommandBlock-API.patch b/patches/server/0690-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0691-More-CommandBlock-API.patch
+++ b/patches/server/0690-More-CommandBlock-API.patch
diff --git a/patches/server/0692-Add-missing-team-sidebar-display-slots.patch b/patches/server/0691-Add-missing-team-sidebar-display-slots.patch
index ee0f1ced64..ee0f1ced64 100644
--- a/patches/server/0692-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0691-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0693-Add-back-EntityPortalExitEvent.patch b/patches/server/0692-Add-back-EntityPortalExitEvent.patch
index cbc46bd951..cbc46bd951 100644
--- a/patches/server/0693-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0692-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0694-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0693-Add-methods-to-find-targets-for-lightning-strikes.patch
index cf815001a9..c444d8262a 100644
--- a/patches/server/0694-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0693-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 10abc211d4b5688de95066caccc7486acafd2858..a2a2042a9578af07d1f9399a97f13df5ea2ecf51 100644
+index 619105bd19d5aa78efc6527371646ee79caf2015..401ae035ac48791b3a7c20b6e3ed19baca1eda42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -813,6 +813,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0695-Get-entity-default-attributes.patch b/patches/server/0694-Get-entity-default-attributes.patch
index c2cbc0160d..c2cbc0160d 100644
--- a/patches/server/0695-Get-entity-default-attributes.patch
+++ b/patches/server/0694-Get-entity-default-attributes.patch
diff --git a/patches/server/0696-Left-handed-API.patch b/patches/server/0695-Left-handed-API.patch
index 3b4077b54a..3b4077b54a 100644
--- a/patches/server/0696-Left-handed-API.patch
+++ b/patches/server/0695-Left-handed-API.patch
diff --git a/patches/server/0697-Add-advancement-display-API.patch b/patches/server/0696-Add-advancement-display-API.patch
index dd860e3b4d..dd860e3b4d 100644
--- a/patches/server/0697-Add-advancement-display-API.patch
+++ b/patches/server/0696-Add-advancement-display-API.patch
diff --git a/patches/server/0698-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0697-Add-ItemFactory-getMonsterEgg-API.patch
index 1944914081..1944914081 100644
--- a/patches/server/0698-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0697-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0699-Add-critical-damage-API.patch b/patches/server/0698-Add-critical-damage-API.patch
index 980b435d42..adeb195cba 100644
--- a/patches/server/0699-Add-critical-damage-API.patch
+++ b/patches/server/0698-Add-critical-damage-API.patch
@@ -72,10 +72,10 @@ index f02fb03c63975e5c1ccdd848f5727559929cce00..8564ecd20578d907bcfa1b9c149da22e
          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 82d8a8c2199673315c7b52e694f798cc59c5f96c..03d389f3458cd77166a0319fa38c7207e8714e6f 100644
+index 2faefc58ac600fb6b374ef87c6f8f378d3883594..3bdde2057c9c2ac0e12cf3edab1c3150838dce01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -979,7 +979,7 @@ public class CraftEventFactory {
+@@ -969,7 +969,7 @@ public class CraftEventFactory {
                  } else {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
@@ -84,7 +84,7 @@ index 82d8a8c2199673315c7b52e694f798cc59c5f96c..03d389f3458cd77166a0319fa38c7207
              }
              event.setCancelled(cancelled);
  
-@@ -1008,7 +1008,7 @@ public class CraftEventFactory {
+@@ -998,7 +998,7 @@ public class CraftEventFactory {
                  cause = DamageCause.SONIC_BOOM;
              }
  
@@ -93,7 +93,7 @@ index 82d8a8c2199673315c7b52e694f798cc59c5f96c..03d389f3458cd77166a0319fa38c7207
          } else if (source == DamageSource.OUT_OF_WORLD) {
              EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
-@@ -1078,7 +1078,7 @@ public class CraftEventFactory {
+@@ -1068,7 +1068,7 @@ public class CraftEventFactory {
              } else {
                  throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
              }
@@ -102,7 +102,7 @@ index 82d8a8c2199673315c7b52e694f798cc59c5f96c..03d389f3458cd77166a0319fa38c7207
              event.setCancelled(cancelled);
              CraftEventFactory.callEvent(event);
              if (!event.isCancelled()) {
-@@ -1123,20 +1123,28 @@ public class CraftEventFactory {
+@@ -1113,20 +1113,28 @@ public class CraftEventFactory {
          }
  
          if (cause != null) {
diff --git a/patches/server/0700-Fix-issues-with-mob-conversion.patch b/patches/server/0699-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0700-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0699-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0701-Add-isCollidable-methods-to-various-places.patch b/patches/server/0700-Add-isCollidable-methods-to-various-places.patch
index 2b95e405a3..2b95e405a3 100644
--- a/patches/server/0701-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0700-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0702-Goat-ram-API.patch b/patches/server/0701-Goat-ram-API.patch
index 426746ea8f..c9eca7cb7e 100644
--- a/patches/server/0702-Goat-ram-API.patch
+++ b/patches/server/0701-Goat-ram-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Goat ram API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 1935db7bd6d0976fd0bb9e482cd8044b79b0a452..56dd01801f56c56d07101e7e22b58ac059f5f07f 100644
+index ebf462aa6431da05372200a2cae29449597267b1..4d6c3cb8eb2da05b7f0c8fba92e371cd440605b0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -359,4 +359,15 @@ public class Goat extends Animal {
diff --git a/patches/server/0703-Add-API-for-resetting-a-single-score.patch b/patches/server/0702-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0703-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0702-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0704-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0703-Add-Raw-Byte-Entity-Serialization.patch
index d7d990702b..d7d990702b 100644
--- a/patches/server/0704-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0703-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0705-Vanilla-command-permission-fixes.patch b/patches/server/0704-Vanilla-command-permission-fixes.patch
index 603bc9d5f0..603bc9d5f0 100644
--- a/patches/server/0705-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0704-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0706-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0705-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 3857124856..315194e06b 100644
--- a/patches/server/0706-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0705-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a2a2042a9578af07d1f9399a97f13df5ea2ecf51..5a8762bacf13818a98b9b85a618a6fe8ddf537a4 100644
+index 401ae035ac48791b3a7c20b6e3ed19baca1eda42..4fa19370e05600391e60b9b416f343834362cbac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1373,9 +1373,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0707-Fix-GameProfileCache-concurrency.patch b/patches/server/0706-Fix-GameProfileCache-concurrency.patch
index 694dd0fbaa..694dd0fbaa 100644
--- a/patches/server/0707-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0706-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0708-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0707-Log-when-the-async-catcher-is-tripped.patch
index b2c6aee8dc..b2c6aee8dc 100644
--- a/patches/server/0708-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0707-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0709-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0708-Add-paper-mobcaps-and-paper-playermobcaps.patch
index fc941b81b0..5423af0db6 100644
--- a/patches/server/0709-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0708-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -265,7 +265,7 @@ index 0000000000000000000000000000000000000000..2e02d94e2903c48f6d08e743c1cf8bad
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index fa23e9c476d4edc6176d8b8a6cb13c52d2f66a87..4150e8cd7197eac53042d56f0a53a4951f8824ce 100644
+index 9fdaf0aecb3c850be63ae9aae0879cb5584c5472..e0b6f7da138776be2892821b32a099c2d0e45038 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -191,6 +191,16 @@ public final class NaturalSpawner {
diff --git a/patches/server/0710-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0709-Sanitize-ResourceLocation-error-logging.patch
index c2ff3a02e4..c2ff3a02e4 100644
--- a/patches/server/0710-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0709-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0711-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0710-Allow-controlled-flushing-for-network-manager.patch
index a88de7918e..a88de7918e 100644
--- a/patches/server/0711-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0710-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0712-Optimise-general-POI-access.patch b/patches/server/0711-Optimise-general-POI-access.patch
index 482e6baf50..811f418f6b 100644
--- a/patches/server/0712-Optimise-general-POI-access.patch
+++ b/patches/server/0711-Optimise-general-POI-access.patch
@@ -975,7 +975,7 @@ index d0ce7b14d29459e276961c38cfc5b5da1cd15634..2e410b21564a067ed04f4179908fba83
      private boolean isValid;
      public final Optional<PoiSection> noAllocateOptional = Optional.of(this); // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index c886d461304ad19483eb92a25f5827a95b8cba98..1a0095b9dee1f708c4c3d32fd95b88120245f1e9 100644
+index 27f766fc72d779cff1b5a88a79961aa7ef91b11f..2d208f1b85193497027c4d04ab9e8cb16fed9b47 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -71,11 +71,11 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
diff --git a/patches/server/0713-Optimise-chunk-tick-iteration.patch b/patches/server/0712-Optimise-chunk-tick-iteration.patch
index 4d574dc627..2d346cd0dc 100644
--- a/patches/server/0713-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0712-Optimise-chunk-tick-iteration.patch
@@ -72,7 +72,7 @@ index 2add24517d38708a84e7f8ec25fbe9c62309375e..1fb298ff60b59a7074fb9d7a79709f05
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 37129601dfb8f2af897fb095786616b07e9acdd2..c5a76a6d589133f0f23a2b3b421399acaa7ceb8c 100644
+index 2a25d552612bf94c5f54249ae3cba549ea242488..3540ac6f99d724d91ff4e897f7e84ef03037f1bf 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
diff --git a/patches/server/0714-Execute-chunk-tasks-mid-tick.patch b/patches/server/0713-Execute-chunk-tasks-mid-tick.patch
index 974b755ba3..974b755ba3 100644
--- a/patches/server/0714-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0713-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0715-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index cea19c1410..cea19c1410 100644
--- a/patches/server/0715-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0716-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch
index 6cf6b743b6..6cf6b743b6 100644
--- a/patches/server/0716-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0717-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0716-Detail-more-information-in-watchdog-dumps.patch
index 9adf6bbea8..431931de96 100644
--- a/patches/server/0717-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0716-Detail-more-information-in-watchdog-dumps.patch
@@ -78,7 +78,7 @@ index acfa1907bfc9c29d261cfccc00d65bad9ad1a002..d6f3869f5725c7f081efb7f486f74dbb
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ade1478a6e85bad5a168e3ab8ea3b2744cf18dea..204d101c318cf60fd2e31b0d1b84f78f87d2f68d 100644
+index b4b7aa2f7d602fe996ebc320ab9641866b672abe..f7841aea38707cebaaab2637454a0db8f93065b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1039,7 +1039,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0718-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0717-Manually-inline-methods-in-BlockPosition.patch
index f8ac951367..f8ac951367 100644
--- a/patches/server/0718-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0717-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0719-Distance-manager-tick-timings.patch b/patches/server/0718-Distance-manager-tick-timings.patch
index 0fd96880f3..9889106ec3 100644
--- a/patches/server/0719-Distance-manager-tick-timings.patch
+++ b/patches/server/0718-Distance-manager-tick-timings.patch
@@ -19,7 +19,7 @@ index 5ec241d49ff5e3a161a39006f05823a5de847c5e..435b3b6d05e00803386d123c66f961c9
      public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
  
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
-index e28e083373261ab9fa3b015e294ee9f81b4d2f6e..192b52cb3205ea6bbf45bde9bc50324ad9815463 100644
+index d220507e1a432883d3092720e3634e8d1d961dbe..8dc1d2d15d571d1603a41dee13681a87841f5e23 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 @@ -901,7 +901,9 @@ public final class ChunkHolderManager {
diff --git a/patches/server/0720-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e2e0d713f0..e2e0d713f0 100644
--- a/patches/server/0720-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0721-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 07e018b6ef..07e018b6ef 100644
--- a/patches/server/0721-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0722-Add-packet-limiter-config.patch b/patches/server/0721-Add-packet-limiter-config.patch
index 3deb55309a..3deb55309a 100644
--- a/patches/server/0722-Add-packet-limiter-config.patch
+++ b/patches/server/0721-Add-packet-limiter-config.patch
diff --git a/patches/server/0723-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch
index 7b971869b8..7d89a66288 100644
--- a/patches/server/0723-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -24,7 +24,7 @@ index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e
          } else {
              Holder<E> holder = registry.getOrCreateHolderOrThrow(entryKey);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8e4b1d9d84c41b6f3b599c85e551f9f98025c917..9011dbbe6302deb7318d31b9db3d2419a1871c07 100644
+index 207c1fb92493757de90f1a583a66ae4ad18b0e3f..ce99c2f4f172baa96831b194b4289da02a244519 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -553,7 +553,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0724-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0723-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 112bd2a090..112bd2a090 100644
--- a/patches/server/0724-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0723-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0725-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0724-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 486fcc284b..486fcc284b 100644
--- a/patches/server/0725-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0724-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0726-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0725-Don-t-lookup-fluid-state-when-raytracing.patch
index e16e510297..e16e510297 100644
--- a/patches/server/0726-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0725-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0727-Time-scoreboard-search.patch b/patches/server/0726-Time-scoreboard-search.patch
index abfffa772e..abfffa772e 100644
--- a/patches/server/0727-Time-scoreboard-search.patch
+++ b/patches/server/0726-Time-scoreboard-search.patch
diff --git a/patches/server/0728-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0727-Send-full-pos-packets-for-hard-colliding-entities.patch
index b63f55bd81..b63f55bd81 100644
--- a/patches/server/0728-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0727-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0729-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0728-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0729-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0728-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0730-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0729-Oprimise-map-impl-for-tracked-players.patch
index 0b358c261e..0b358c261e 100644
--- a/patches/server/0730-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0729-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0731-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0730-Optimise-BlockSoil-nearby-water-lookup.patch
index bb523f58c5..bb523f58c5 100644
--- a/patches/server/0731-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0730-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0732-Optimise-random-block-ticking.patch b/patches/server/0731-Optimise-random-block-ticking.patch
index 53a23a8916..aeda674cb5 100644
--- a/patches/server/0732-Optimise-random-block-ticking.patch
+++ b/patches/server/0731-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 204d101c318cf60fd2e31b0d1b84f78f87d2f68d..6aea2e80aab7d2950c057e8523a954c71a05eb0a 100644
+index f7841aea38707cebaaab2637454a0db8f93065b4..4f32dff7ec2fc55b085b13464667707454413dac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -703,6 +703,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0733-Optimise-non-flush-packet-sending.patch b/patches/server/0732-Optimise-non-flush-packet-sending.patch
index 37e5332584..37e5332584 100644
--- a/patches/server/0733-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0732-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0734-Optimise-nearby-player-lookups.patch b/patches/server/0733-Optimise-nearby-player-lookups.patch
index c283aa0ebf..32af4deb36 100644
--- a/patches/server/0734-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0733-Optimise-nearby-player-lookups.patch
@@ -208,7 +208,7 @@ index 4f32dff7ec2fc55b085b13464667707454413dac..3fda64e9d530b85ddcfe4277f64286fc
  
          this.handlingTick = true;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 5fb88a3b7242a2712a568aaccebe601f89bfee3a..557e90e54439ce0430075403392b5052d5181feb 100644
+index b9685fa96bb59b4b080ffd0ac53e4c5581aaeb8b..fffa6ba329b38433a1df51df339df652d3fda828 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -808,7 +808,12 @@ public abstract class Mob extends LivingEntity {
@@ -300,7 +300,7 @@ index aa90454e70e5c25eb331ceb212df3128d64b1567..c1a3bcc8d9df2bf25a9c73faeac84652
      public abstract ResourceKey<LevelStem> getTypeKey();
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 4150e8cd7197eac53042d56f0a53a4951f8824ce..e31a2eea9a62ab2c0bed1a97dab6bae231b8cd8b 100644
+index e0b6f7da138776be2892821b32a099c2d0e45038..df83b6f0e217eec4c9e9707be0030c129fdeb545 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -259,7 +259,7 @@ public final class NaturalSpawner {
@@ -312,7 +312,7 @@ index 4150e8cd7197eac53042d56f0a53a4951f8824ce..e31a2eea9a62ab2c0bed1a97dab6bae2
  
                              if (entityhuman != null) {
                                  double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
-@@ -332,7 +332,7 @@ public final class NaturalSpawner {
+@@ -333,7 +333,7 @@ public final class NaturalSpawner {
      }
  
      private static boolean isRightDistanceToPlayerAndSpawnPoint(ServerLevel world, ChunkAccess chunk, BlockPos.MutableBlockPos pos, double squaredDistance) {
diff --git a/patches/server/0735-Remove-streams-for-villager-AI.patch b/patches/server/0734-Remove-streams-for-villager-AI.patch
index 7493d3ad6b..7493d3ad6b 100644
--- a/patches/server/0735-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0734-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0736-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch
index aabdb22ecd..78390bbbd3 100644
--- a/patches/server/0736-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch
@@ -341,7 +341,7 @@ index b80aedd2002959b4026c27ce76b3ed17f0acfb5b..2985271132c9ae822dcb0d7a7e6f0c26
                  protected void initChannel(Channel channel) {
                      try {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 76d6572429548d90b5efa3029f33923a81f54c3f..26781be1a01b0683f4d0f3cf565c3a623c987606 100644
+index fdd64b7bf24314a0d01444f0b074019b2031efdc..2bbf4096ec6c992a0369964efdd1375ae11b62d4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -305,12 +305,14 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0737-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index c8dd06ca73..c8dd06ca73 100644
--- a/patches/server/0737-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0738-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch
index 8f9a21c9d1..8f9a21c9d1 100644
--- a/patches/server/0738-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0739-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch
index fabf5a82e9..fabf5a82e9 100644
--- a/patches/server/0739-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0740-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 72253bffc5..72253bffc5 100644
--- a/patches/server/0740-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0741-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0741-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0742-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index b218b2916f..b218b2916f 100644
--- a/patches/server/0742-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0743-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 8bc6527cd8..8bc6527cd8 100644
--- a/patches/server/0743-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0744-Ensure-valid-vehicle-status.patch b/patches/server/0743-Ensure-valid-vehicle-status.patch
index f3e2c1b98b..f3e2c1b98b 100644
--- a/patches/server/0744-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0743-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0745-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch
index 2286afa5f2..2286afa5f2 100644
--- a/patches/server/0745-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0746-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0746-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0747-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0746-Don-t-log-debug-logging-being-disabled.patch
index 83460a961a..83460a961a 100644
--- a/patches/server/0747-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0746-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0748-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0747-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0748-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0747-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0749-Preserve-overstacked-loot.patch b/patches/server/0748-Preserve-overstacked-loot.patch
index e39eb87bbc..e39eb87bbc 100644
--- a/patches/server/0749-Preserve-overstacked-loot.patch
+++ b/patches/server/0748-Preserve-overstacked-loot.patch
diff --git a/patches/server/0750-Update-head-rotation-in-missing-places.patch b/patches/server/0749-Update-head-rotation-in-missing-places.patch
index 76b34081eb..76b34081eb 100644
--- a/patches/server/0750-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0749-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0751-prevent-unintended-light-block-manipulation.patch b/patches/server/0750-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0751-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0750-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0752-Fix-CraftCriteria-defaults-map.patch b/patches/server/0751-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..65eeffccea 100644
--- a/patches/server/0752-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0751-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0753-Fix-upstreams-block-state-factories.patch b/patches/server/0752-Fix-upstreams-block-state-factories.patch
index 221799c0b1..221799c0b1 100644
--- a/patches/server/0753-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0752-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0754-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch
index 695d8483fe..c9fde34347 100644
--- a/patches/server/0754-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,7 +49,7 @@ index 2985271132c9ae822dcb0d7a7e6f0c268d1736cc..cfdbcd024de6ad0f9d4e83b2f912b36e
  
                              networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), PacketSendListener.thenRun(() -> {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 26781be1a01b0683f4d0f3cf565c3a623c987606..c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d 100644
+index 2bbf4096ec6c992a0369964efdd1375ae11b62d4..b87bd1c2d3a371e2fca1d0bff6d0985188b22584 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -226,7 +226,10 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0755-Configurable-feature-seeds.patch b/patches/server/0754-Configurable-feature-seeds.patch
index 6e138bc312..6e138bc312 100644
--- a/patches/server/0755-Configurable-feature-seeds.patch
+++ b/patches/server/0754-Configurable-feature-seeds.patch
diff --git a/patches/server/0756-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0756-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0757-Add-root-admin-user-detection.patch b/patches/server/0756-Add-root-admin-user-detection.patch
index a3bdc6b127..a3bdc6b127 100644
--- a/patches/server/0757-Add-root-admin-user-detection.patch
+++ b/patches/server/0756-Add-root-admin-user-detection.patch
diff --git a/patches/server/0758-Always-allow-item-changing-in-Fireball.patch b/patches/server/0757-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0758-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0757-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0759-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch
index 9d1e544ed0..9d1e544ed0 100644
--- a/patches/server/0759-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch
index 51d947382e..d912af4b12 100644
--- a/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,10 +5,10 @@ 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 76ef3f561e3f8e0c0f9732feb64aacca93b57431..8ac7d25e6e1a22829d6c45522409763bbb1328a0 100644
+index 327dc44770656932879ffe58d9bbacb6ca3d0713..49718f6fbdd4ffe38afe4b5001d9de69097976f4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2648,14 +2648,27 @@ public abstract class LivingEntity extends Entity {
+@@ -2651,14 +2651,27 @@ public abstract class LivingEntity extends Entity {
          return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
      }
  
diff --git a/patches/server/0761-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch
index d96ebe539e..d96ebe539e 100644
--- a/patches/server/0761-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0762-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index be1ba0eb32..be1ba0eb32 100644
--- a/patches/server/0762-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0764-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 63ed303a2b..4bd83e942f 100644
--- a/patches/server/0764-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,10 +34,10 @@ index cc418554b655ea4111631e4a1abf69776e150e7c..319dfa82dff1fe188a52bed5aa2d3957
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8ac7d25e6e1a22829d6c45522409763bbb1328a0..e7560eb298b563231407de832a81bb2c97e3c4cf 100644
+index 49718f6fbdd4ffe38afe4b5001d9de69097976f4..8a393cc4165c2aec51dcb26f7447dcc796528241 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3134,7 +3134,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3137,7 +3137,10 @@ public abstract class LivingEntity extends Entity {
          equipmentChanges.forEach((enumitemslot, itemstack) -> {
              ItemStack itemstack1 = itemstack.copy();
  
@@ -49,7 +49,7 @@ index 8ac7d25e6e1a22829d6c45522409763bbb1328a0..e7560eb298b563231407de832a81bb2c
              switch (enumitemslot.getType()) {
                  case HAND:
                      this.setLastHandItem(enumitemslot, itemstack1);
-@@ -3147,6 +3150,34 @@ public abstract class LivingEntity extends Entity {
+@@ -3150,6 +3153,34 @@ public abstract class LivingEntity extends Entity {
          ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0765-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch
index 9442632b57..46b7980c35 100644
--- a/patches/server/0765-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,10 +33,10 @@ index 678c0b1c37b16e405205933a16f0d2d29359fd12..1d024bfbada440c93b1174568feaa675
                              }
                          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e7560eb298b563231407de832a81bb2c97e3c4cf..d6ecdeab398d7bfde3d760ada0374245f03014b3 100644
+index 8a393cc4165c2aec51dcb26f7447dcc796528241..1ef11297bc9017fd3c5ac661167c58617d06200b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3136,7 +3136,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3139,7 +3139,7 @@ public abstract class LivingEntity extends Entity {
  
              // Paper start - prevent oversized data
              ItemStack toSend = sanitizeItemStack(itemstack1, true);
@@ -45,7 +45,7 @@ index e7560eb298b563231407de832a81bb2c97e3c4cf..d6ecdeab398d7bfde3d760ada0374245
              // Paper end
              switch (enumitemslot.getType()) {
                  case HAND:
-@@ -3150,6 +3150,59 @@ public abstract class LivingEntity extends Entity {
+@@ -3153,6 +3153,59 @@ public abstract class LivingEntity extends Entity {
          ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0766-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0765-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index 60f87f5973..60f87f5973 100644
--- a/patches/server/0766-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0765-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0767-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0767-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0768-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0767-Add-PlayerItemFrameChangeEvent.patch
index f9ce7fc78c..f9ce7fc78c 100644
--- a/patches/server/0768-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0767-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0769-Add-player-health-update-API.patch b/patches/server/0768-Add-player-health-update-API.patch
index 717cd2e501..e3736feaac 100644
--- a/patches/server/0769-Add-player-health-update-API.patch
+++ b/patches/server/0768-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ff0c79134c1c474bc1e55b879394939a345562e..e02720435b6ed5f07a13d08a209caf6df49799ad 100644
+index 8ac816295ce5bc9f2696fe790f4319e5ba16116f..9b9fe738a20bfd2c9f954539362d35d7c83e8eb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2221,9 +2221,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0770-Optimize-HashMapPalette.patch b/patches/server/0769-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0770-Optimize-HashMapPalette.patch
+++ b/patches/server/0769-Optimize-HashMapPalette.patch
diff --git a/patches/server/0771-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch
index fc9c73e933..fc9c73e933 100644
--- a/patches/server/0771-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0772-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 95b76cc7a4..95b76cc7a4 100644
--- a/patches/server/0772-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0773-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch
index 5296115818..5296115818 100644
--- a/patches/server/0773-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0774-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index ffb998758e..ffb998758e 100644
--- a/patches/server/0774-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0775-Update-Log4j.patch b/patches/server/0774-Update-Log4j.patch
index 41cc02c122..48d47942a8 100644
--- a/patches/server/0775-Update-Log4j.patch
+++ b/patches/server/0774-Update-Log4j.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fb6bfd4967b4ec113463cfaa77e621183f93e441..effc19371309a1af44e1b660b547b58530a8df3c 100644
+index 30a600ef1dfedc1a050268af593074659382bc36..039891cc7ffd355f2d4c1cd202a042bf061ddfa8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -20,10 +20,11 @@ dependencies {
diff --git a/patches/server/0776-Add-more-Campfire-API.patch b/patches/server/0775-Add-more-Campfire-API.patch
index 5381096620..5381096620 100644
--- a/patches/server/0776-Add-more-Campfire-API.patch
+++ b/patches/server/0775-Add-more-Campfire-API.patch
diff --git a/patches/server/0777-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index b7ed484259..b7ed484259 100644
--- a/patches/server/0777-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0778-Fix-tripwire-state-inconsistency.patch b/patches/server/0777-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0778-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0777-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0779-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch
index 1f9012a293..1f9012a293 100644
--- a/patches/server/0779-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0780-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0779-Forward-CraftEntity-in-teleport-command.patch
index 69c880d99c..69c880d99c 100644
--- a/patches/server/0780-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0779-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0781-Improve-scoreboard-entries.patch b/patches/server/0780-Improve-scoreboard-entries.patch
index 2a65cbf36c..2a65cbf36c 100644
--- a/patches/server/0781-Improve-scoreboard-entries.patch
+++ b/patches/server/0780-Improve-scoreboard-entries.patch
diff --git a/patches/server/0782-Entity-powdered-snow-API.patch b/patches/server/0781-Entity-powdered-snow-API.patch
index e3764b4811..e3764b4811 100644
--- a/patches/server/0782-Entity-powdered-snow-API.patch
+++ b/patches/server/0781-Entity-powdered-snow-API.patch
diff --git a/patches/server/0783-Add-API-for-item-entity-health.patch b/patches/server/0782-Add-API-for-item-entity-health.patch
index d923270a18..d923270a18 100644
--- a/patches/server/0783-Add-API-for-item-entity-health.patch
+++ b/patches/server/0782-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0784-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch
index ca29c1bbf2..0a907df304 100644
--- a/patches/server/0784-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 6fdbe747645eb83f31b56bca77a9d7962237aed8..dd0143f319d4adef8834c513af34b1cce7a94a84 100644
+index 90d5d1de2f00be97e3ea0ff50caa7e7ba9438408..0d140dd7d55407b57fc3394ceb2eba5136e4fcaf 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -412,4 +412,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
diff --git a/patches/server/0785-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch
index baf913d352..baf913d352 100644
--- a/patches/server/0785-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0786-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 698fbc2d5e..698fbc2d5e 100644
--- a/patches/server/0786-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0787-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch
index 768bf70b1f..768bf70b1f 100644
--- a/patches/server/0787-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0788-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0788-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0789-Fix-bees-aging-inside-hives.patch b/patches/server/0788-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0789-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0788-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0790-Bucketable-API.patch b/patches/server/0789-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0790-Bucketable-API.patch
+++ b/patches/server/0789-Bucketable-API.patch
diff --git a/patches/server/0791-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
index a5edd3fe44..a5edd3fe44 100644
--- a/patches/server/0791-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0792-Validate-usernames.patch b/patches/server/0791-Validate-usernames.patch
index 299e6235a5..af37250ab9 100644
--- a/patches/server/0792-Validate-usernames.patch
+++ b/patches/server/0791-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d..ef6a55a9f0055e23e8887eb3efd17cc21a7dc004 100644
+index b87bd1c2d3a371e2fca1d0bff6d0985188b22584..64e2004e023f79d28c400f7182b0ffa93789620d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0793-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0792-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0793-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0792-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0794-Make-water-animal-spawn-height-configurable.patch b/patches/server/0793-Make-water-animal-spawn-height-configurable.patch
index dea45f0b70..dea45f0b70 100644
--- a/patches/server/0794-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0793-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0795-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0794-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 4e8650b1ea..a9805b24fc 100644
--- a/patches/server/0795-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0794-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9011dbbe6302deb7318d31b9db3d2419a1871c07..2310b0314cc8a0f298eb82839dbf601901415dea 100644
+index ce99c2f4f172baa96831b194b4289da02a244519..efe7a3afaf5ef548bded4dc2957375fdbc605d63 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0796-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0795-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0796-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0795-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0797-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0796-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0797-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0796-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0798-Multiple-Entries-with-Scoreboards.patch b/patches/server/0797-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0798-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0797-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0799-Reset-placed-block-on-exception.patch b/patches/server/0798-Reset-placed-block-on-exception.patch
index 3881c0d6de..3881c0d6de 100644
--- a/patches/server/0799-Reset-placed-block-on-exception.patch
+++ b/patches/server/0798-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0800-Add-configurable-height-for-slime-spawn.patch b/patches/server/0799-Add-configurable-height-for-slime-spawn.patch
index a05bae35ee..a05bae35ee 100644
--- a/patches/server/0800-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0799-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0801-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0800-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 4963f056c2..1f0e3525bd 100644
--- a/patches/server/0801-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0800-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ef6a55a9f0055e23e8887eb3efd17cc21a7dc004..5fe9442810a354cde4516304cdee1ea80dc1e9e4 100644
+index 64e2004e023f79d28c400f7182b0ffa93789620d..dff440dc51724e85d9fea88a9602efcbb5450776 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -411,7 +411,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0802-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0801-Fix-xp-reward-for-baby-zombies.patch
index 42920471c5..42920471c5 100644
--- a/patches/server/0802-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0801-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0803-Kick-on-main-for-illegal-chat.patch b/patches/server/0802-Kick-on-main-for-illegal-chat.patch
index 054da69477..054da69477 100644
--- a/patches/server/0803-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0802-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0804-Multi-Block-Change-API-Implementation.patch b/patches/server/0803-Multi-Block-Change-API-Implementation.patch
index 616320f748..ffb3e44334 100644
--- a/patches/server/0804-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0803-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 285da70a15f6e4c868747af9d40ac30bd4e42ef4..a0aeac9c29300a0cf6bad55133019e8c
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e02720435b6ed5f07a13d08a209caf6df49799ad..674b7ff0c1e372ffb06336841e129d5c2130b6f9 100644
+index 9b9fe738a20bfd2c9f954539362d35d7c83e8eb1..2dc1f092576a2432563224d895729ad7c4cfc3bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -923,6 +923,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0805-Fix-NotePlayEvent.patch b/patches/server/0804-Fix-NotePlayEvent.patch
index 83040e523a..83040e523a 100644
--- a/patches/server/0805-Fix-NotePlayEvent.patch
+++ b/patches/server/0804-Fix-NotePlayEvent.patch
diff --git a/patches/server/0806-Freeze-Tick-Lock-API.patch b/patches/server/0805-Freeze-Tick-Lock-API.patch
index 99aa867eaa..2de3d4f80f 100644
--- a/patches/server/0806-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0805-Freeze-Tick-Lock-API.patch
@@ -46,10 +46,10 @@ index 8958c95105394601ca91b4318b598e45ced9e706..fd536e670036a365f6d0e8c168ef4b5f
  
          } 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 d6ecdeab398d7bfde3d760ada0374245f03014b3..73d931489c76f2effe71362a46a69087a1a09463 100644
+index 1ef11297bc9017fd3c5ac661167c58617d06200b..66a566af1dd6684bd7c0dd8b3104543e20b64295 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3376,7 +3376,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3379,7 +3379,7 @@ public abstract class LivingEntity extends Entity {
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
          int i;
  
diff --git a/patches/server/0807-Dolphin-API.patch b/patches/server/0806-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0807-Dolphin-API.patch
+++ b/patches/server/0806-Dolphin-API.patch
diff --git a/patches/server/0808-More-PotionEffectType-API.patch b/patches/server/0807-More-PotionEffectType-API.patch
index 5d8c4415d3..5d8c4415d3 100644
--- a/patches/server/0808-More-PotionEffectType-API.patch
+++ b/patches/server/0807-More-PotionEffectType-API.patch
diff --git a/patches/server/0809-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0808-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 02ee15a8e1..02ee15a8e1 100644
--- a/patches/server/0809-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0808-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0810-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0809-API-for-creating-command-sender-which-forwards-feedb.patch
index c06c0406b5..c06c0406b5 100644
--- a/patches/server/0810-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0809-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0811-Add-config-for-stronghold-seed.patch b/patches/server/0810-Add-config-for-stronghold-seed.patch
index d052da6c16..d052da6c16 100644
--- a/patches/server/0811-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0810-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0812-Implement-regenerateChunk.patch b/patches/server/0811-Implement-regenerateChunk.patch
index 52ed98a62f..52ed98a62f 100644
--- a/patches/server/0812-Implement-regenerateChunk.patch
+++ b/patches/server/0811-Implement-regenerateChunk.patch
diff --git a/patches/server/0813-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0812-Fix-cancelled-powdered-snow-bucket-placement.patch
index c6754ee3e6..c6754ee3e6 100644
--- a/patches/server/0813-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0812-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0814-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0813-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 4e491d2b35..4e491d2b35 100644
--- a/patches/server/0814-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0813-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0815-Add-GameEvent-tags.patch b/patches/server/0814-Add-GameEvent-tags.patch
index bcde64da83..bcde64da83 100644
--- a/patches/server/0815-Add-GameEvent-tags.patch
+++ b/patches/server/0814-Add-GameEvent-tags.patch
diff --git a/patches/server/0816-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0815-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b39e446490..b39e446490 100644
--- a/patches/server/0816-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0815-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0817-Furnace-RecipesUsed-API.patch b/patches/server/0816-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0817-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0816-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0818-Configurable-sculk-sensor-listener-range.patch b/patches/server/0817-Configurable-sculk-sensor-listener-range.patch
index f19796285a..f19796285a 100644
--- a/patches/server/0818-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0817-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0819-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0818-Add-missing-block-data-mins-and-maxes.patch
index 83ba5f6bc1..83ba5f6bc1 100644
--- a/patches/server/0819-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0818-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0820-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0819-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 9055e5c403..b4b2dbda38 100644
--- a/patches/server/0820-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0819-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 161560836fd8a53cdf899205905e4e83f420a614..ab87b5c7c24e033f760d8619e7b0f728d7787073 100644
+index 8a51a5da86e3e9b277109b0acf2982197292682e..f45f82b5d08b9ce9517866d9f2575552cb3df95f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -589,7 +589,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0821-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0820-Put-world-into-worldlist-before-initing-the-world.patch
index 555d470b26..678a666fc4 100644
--- a/patches/server/0821-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0820-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ab87b5c7c24e033f760d8619e7b0f728d7787073..0c375349e2489e2904ef53e5aa96f5f2c91353ec 100644
+index f45f82b5d08b9ce9517866d9f2575552cb3df95f..56c49187c63fd124738ed1efe634ddfcd0f846f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0822-Fix-Entity-Position-Desync.patch b/patches/server/0821-Fix-Entity-Position-Desync.patch
index f4b0a0dc54..f4b0a0dc54 100644
--- a/patches/server/0822-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0821-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0823-Custom-Potion-Mixes.patch b/patches/server/0822-Custom-Potion-Mixes.patch
index 83f97585c5..83f97585c5 100644
--- a/patches/server/0823-Custom-Potion-Mixes.patch
+++ b/patches/server/0822-Custom-Potion-Mixes.patch
diff --git a/patches/server/0824-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0823-Fix-Fluid-tags-isTagged-method.patch
index 0ce876073c..0ce876073c 100644
--- a/patches/server/0824-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0823-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0825-Force-close-world-loading-screen.patch b/patches/server/0824-Force-close-world-loading-screen.patch
index 9294146475..9294146475 100644
--- a/patches/server/0825-Force-close-world-loading-screen.patch
+++ b/patches/server/0824-Force-close-world-loading-screen.patch
diff --git a/patches/server/0826-Fix-falling-block-spawn-methods.patch b/patches/server/0825-Fix-falling-block-spawn-methods.patch
index 7aaafc2cf1..7aaafc2cf1 100644
--- a/patches/server/0826-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0825-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0827-Expose-furnace-minecart-push-values.patch b/patches/server/0826-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0827-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0826-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0828-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0827-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index a9cdda7a75..a9cdda7a75 100644
--- a/patches/server/0828-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0827-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0829-More-Projectile-API.patch b/patches/server/0828-More-Projectile-API.patch
index d15949da57..d15949da57 100644
--- a/patches/server/0829-More-Projectile-API.patch
+++ b/patches/server/0828-More-Projectile-API.patch
diff --git a/patches/server/0830-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0829-Fix-swamp-hut-cat-generation-deadlock.patch
index ae8f7dbdb2..ae8f7dbdb2 100644
--- a/patches/server/0830-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0829-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0831-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0830-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 77c8b0c110..77c8b0c110 100644
--- a/patches/server/0831-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0830-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0832-Implement-getComputedBiome-API.patch b/patches/server/0831-Implement-getComputedBiome-API.patch
index b6a274bb77..b6a274bb77 100644
--- a/patches/server/0832-Implement-getComputedBiome-API.patch
+++ b/patches/server/0831-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0833-Make-some-itemstacks-nonnull.patch b/patches/server/0832-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0833-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0832-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0834-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0833-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index fe6855e900..fe6855e900 100644
--- a/patches/server/0834-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/server/0833-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0835-Implement-enchantWithLevels-API.patch b/patches/server/0834-Implement-enchantWithLevels-API.patch
index 204d4534fb..204d4534fb 100644
--- a/patches/server/0835-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0834-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0836-Fix-saving-in-unloadWorld.patch b/patches/server/0835-Fix-saving-in-unloadWorld.patch
index 0011be143d..0011be143d 100644
--- a/patches/server/0836-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0835-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0837-Buffer-OOB-setBlock-calls.patch b/patches/server/0836-Buffer-OOB-setBlock-calls.patch
index 62e5606e17..62e5606e17 100644
--- a/patches/server/0837-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0836-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0838-Add-TameableDeathMessageEvent.patch b/patches/server/0837-Add-TameableDeathMessageEvent.patch
index 8bbbaffa2c..8bbbaffa2c 100644
--- a/patches/server/0838-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0837-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0839-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0838-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8ecf55d257..8ecf55d257 100644
--- a/patches/server/0839-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/server/0838-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0840-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0839-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 8dd4659462..8dd4659462 100644
--- a/patches/server/0840-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0839-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0841-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0840-Ensure-entity-passenger-world-matches-ridden-entity.patch
index e28f96f729..e28f96f729 100644
--- a/patches/server/0841-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0840-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0842-Guard-against-invalid-entity-positions.patch b/patches/server/0841-Guard-against-invalid-entity-positions.patch
index 0a21359168..0a21359168 100644
--- a/patches/server/0842-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0841-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0843-cache-resource-keys.patch b/patches/server/0842-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0843-cache-resource-keys.patch
+++ b/patches/server/0842-cache-resource-keys.patch
diff --git a/patches/server/0844-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0843-Allow-to-change-the-podium-for-the-EnderDragon.patch
index ca79a2f05b..ca79a2f05b 100644
--- a/patches/server/0844-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0843-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0845-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0844-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 9ef13e101f..9ef13e101f 100644
--- a/patches/server/0845-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0844-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0846-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0845-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 4b39ce4dc3..4b39ce4dc3 100644
--- a/patches/server/0846-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0845-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0847-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0846-Prevent-tile-entity-copies-loading-chunks.patch
index 3c5eabbf49..3c5eabbf49 100644
--- a/patches/server/0847-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0846-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0848-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0847-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 0d9a571f4d..0d9a571f4d 100644
--- a/patches/server/0848-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0847-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0849-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0848-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 951baf9062..951baf9062 100644
--- a/patches/server/0849-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0848-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0850-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0849-Pass-ServerLevel-for-gamerule-callbacks.patch
index e309f68ed2..e309f68ed2 100644
--- a/patches/server/0850-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0849-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0851-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0850-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index fff84c5a62..fff84c5a62 100644
--- a/patches/server/0851-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0850-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0852-WorldCreator-keepSpawnLoaded.patch b/patches/server/0851-WorldCreator-keepSpawnLoaded.patch
index 83b3e1ff72..83b3e1ff72 100644
--- a/patches/server/0852-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0851-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0853-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0852-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..d33dabf6c9 100644
--- a/patches/server/0853-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0852-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0854-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0853-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 79c74b0a57..79c74b0a57 100644
--- a/patches/server/0854-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0853-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0855-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0854-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 8eacb2217e..8eacb2217e 100644
--- a/patches/server/0855-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0854-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0856-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0855-Fire-CauldronLevelChange-on-initial-fill.patch
index c0fcd53f55..c0fcd53f55 100644
--- a/patches/server/0856-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0855-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0857-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0856-fix-powder-snow-cauldrons-not-turning-to-water.patch
index aef5bd0551..aef5bd0551 100644
--- a/patches/server/0857-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0856-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0858-Add-PlayerStopUsingItemEvent.patch b/patches/server/0857-Add-PlayerStopUsingItemEvent.patch
index 90dcaae6a1..0257c5ae82 100644
--- a/patches/server/0858-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0857-Add-PlayerStopUsingItemEvent.patch
@@ -5,10 +5,10 @@ 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 73d931489c76f2effe71362a46a69087a1a09463..33c22f908440664dc9d67f1678a3c4bd8b862457 100644
+index 66a566af1dd6684bd7c0dd8b3104543e20b64295..780cff9638fe717e98a97f1241cf65337b55382c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3926,6 +3926,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3930,6 +3930,7 @@ public abstract class LivingEntity extends Entity {
  
      public void releaseUsingItem() {
          if (!this.useItem.isEmpty()) {
diff --git a/patches/server/0859-FallingBlock-auto-expire-setting.patch b/patches/server/0858-FallingBlock-auto-expire-setting.patch
index a7b0c20dd6..a7b0c20dd6 100644
--- a/patches/server/0859-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0858-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0860-Don-t-tick-markers.patch b/patches/server/0859-Don-t-tick-markers.patch
index 8fb4313275..8fb4313275 100644
--- a/patches/server/0860-Don-t-tick-markers.patch
+++ b/patches/server/0859-Don-t-tick-markers.patch
diff --git a/patches/server/0861-Do-not-accept-invalid-client-settings.patch b/patches/server/0860-Do-not-accept-invalid-client-settings.patch
index 88c7e8c514..88c7e8c514 100644
--- a/patches/server/0861-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0860-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0862-Add-support-for-Proxy-Protocol.patch b/patches/server/0861-Add-support-for-Proxy-Protocol.patch
index 1cf43fbbe8..51687b36e9 100644
--- a/patches/server/0862-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0861-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index effc19371309a1af44e1b660b547b58530a8df3c..2374cc9bab5039d0a0dc11d4b2ec573ab75778a7 100644
+index 039891cc7ffd355f2d4c1cd202a042bf061ddfa8..44e0f265432487fe5c3c00c5245041298ade16a0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -22,6 +22,7 @@ dependencies {
diff --git a/patches/server/0863-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0862-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..b11ce011a5 100644
--- a/patches/server/0863-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0862-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0864-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0863-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0864-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0863-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0864-Sanitize-Sent-BlockEntity-NBT.patch
index fb3c8b1818..fb3c8b1818 100644
--- a/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0864-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0866-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0865-Prevent-entity-loading-causing-async-lookups.patch
index 947ae1b307..947ae1b307 100644
--- a/patches/server/0866-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0865-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0867-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0866-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0867-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0866-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0868-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0867-Throw-exception-on-world-create-while-being-ticked.patch
index 92792493ee..92792493ee 100644
--- a/patches/server/0868-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0867-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0869-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0868-Add-Alternate-Current-redstone-implementation.patch
index 95e4e6c122..95e4e6c122 100644
--- a/patches/server/0869-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0868-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0870-Dont-resent-entity-on-art-update.patch b/patches/server/0869-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0870-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0869-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0871-Add-missing-spawn-eggs.patch b/patches/server/0870-Add-missing-spawn-eggs.patch
index ba88344787..ba88344787 100644
--- a/patches/server/0871-Add-missing-spawn-eggs.patch
+++ b/patches/server/0870-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0872-Add-WardenAngerChangeEvent.patch b/patches/server/0871-Add-WardenAngerChangeEvent.patch
index cfe1a98c72..cfe1a98c72 100644
--- a/patches/server/0872-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0871-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0873-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0872-Add-option-for-strict-advancement-dimension-checks.patch
index 400526a4d4..400526a4d4 100644
--- a/patches/server/0873-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0872-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0874-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0873-Add-missing-important-BlockStateListPopulator-method.patch
index 2296cce864..2296cce864 100644
--- a/patches/server/0874-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0873-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0875-Nameable-Banner-API.patch b/patches/server/0874-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0875-Nameable-Banner-API.patch
+++ b/patches/server/0874-Nameable-Banner-API.patch
diff --git a/patches/server/0876-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0875-Don-t-broadcast-messages-to-command-blocks.patch
index fd94342154..fd94342154 100644
--- a/patches/server/0876-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0875-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0877-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0876-Prevent-empty-items-from-being-added-to-world.patch
index 6d09d8f5e3..f719ae5d0c 100644
--- a/patches/server/0877-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0876-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 87b59687f8b484f08c43a10d42460e827eb9a62a..d3767b4db89b9f067c02b412e75b5944b9c353da 100644
+index 09aae0e2c958506d93dc6bb3e655f3036c362c41..b396e9b35f315db37ba070ad4baeec1f098d0cb8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1464,6 +1464,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0878-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0877-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index ad894dbcce..ad894dbcce 100644
--- a/patches/server/0878-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0877-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0879-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0878-Don-t-print-component-in-resource-pack-rejection-mes.patch
index e39a508723..e39a508723 100644
--- a/patches/server/0879-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0878-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0880-Add-Player-getFishHook.patch b/patches/server/0879-Add-Player-getFishHook.patch
index bf5ccb5986..bf5ccb5986 100644
--- a/patches/server/0880-Add-Player-getFishHook.patch
+++ b/patches/server/0879-Add-Player-getFishHook.patch
diff --git a/patches/server/0881-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0880-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index f9cbdd0899..f9cbdd0899 100644
--- a/patches/server/0881-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0880-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0882-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0881-Add-various-missing-EntityDropItemEvent-calls.patch
index 3fa83bdca7..afcfece262 100644
--- a/patches/server/0882-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0881-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -58,7 +58,7 @@ index 8f294f10aca2df007830b12da0506f7614206a89..6a66b5d1a3d8615dcc15057f03476e9c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 56dd01801f56c56d07101e7e22b58ac059f5f07f..31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5 100644
+index 4d6c3cb8eb2da05b7f0c8fba92e371cd440605b0..c17d9a7cb69d3b6ea6e17b689921fa239db3552b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -329,8 +329,7 @@ public class Goat extends Animal {
diff --git a/patches/server/0883-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0882-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 2cbecbfbe0..2cbecbfbe0 100644
--- a/patches/server/0883-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0882-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0884-Fix-Bee-flower-NPE.patch b/patches/server/0883-Fix-Bee-flower-NPE.patch
index d1fca0922f..d1fca0922f 100644
--- a/patches/server/0884-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0883-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0885-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0884-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 90422ebe0b..90422ebe0b 100644
--- a/patches/server/0885-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0884-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
index 596e867634..596e867634 100644
--- a/patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0887-More-Teleport-API.patch b/patches/server/0886-More-Teleport-API.patch
index 74b25b2e20..e2e71abd9a 100644
--- a/patches/server/0887-More-Teleport-API.patch
+++ b/patches/server/0886-More-Teleport-API.patch
@@ -69,7 +69,7 @@ index c4ffccddce33cf461d9b04ccbb90026544f16b7d..99b99fae67e53a688b3519d8a8d0cc5f
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 674b7ff0c1e372ffb06336841e129d5c2130b6f9..374c01f22aa677017ff3d9971e0f1026f53a447e 100644
+index 2dc1f092576a2432563224d895729ad7c4cfc3bd..3834952589a0becf88a4fdc328ca4f3e6c5b1aa6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1178,13 +1178,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0888-Add-EntityPortalReadyEvent.patch b/patches/server/0887-Add-EntityPortalReadyEvent.patch
index 24ff0a2a02..24ff0a2a02 100644
--- a/patches/server/0888-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0887-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0889-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0888-Don-t-use-level-random-in-entity-constructors.patch
index aea2ef2591..aea2ef2591 100644
--- a/patches/server/0889-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0888-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0890-Send-block-entities-after-destroy-prediction.patch b/patches/server/0889-Send-block-entities-after-destroy-prediction.patch
index 0d7cf43457..0d7cf43457 100644
--- a/patches/server/0890-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0889-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0891-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0890-Warn-on-plugins-accessing-faraway-chunks.patch
index fd9a449523..fd9a449523 100644
--- a/patches/server/0891-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0890-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0892-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0891-Custom-Chat-Completion-Suggestions-API.patch
index 38f390a0e5..0a4575bacf 100644
--- a/patches/server/0892-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0891-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 374c01f22aa677017ff3d9971e0f1026f53a447e..f2e5164b0651963cb26e4d776ec5c6e30647790f 100644
+index 3834952589a0becf88a4fdc328ca4f3e6c5b1aa6..781c0e10b523c55989f368b4507137343dcffdab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -659,6 +659,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0893-Add-missing-BlockFadeEvents.patch b/patches/server/0892-Add-missing-BlockFadeEvents.patch
index 6b887deccf..6b887deccf 100644
--- a/patches/server/0893-Add-missing-BlockFadeEvents.patch
+++ b/patches/server/0892-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0894-Collision-API.patch b/patches/server/0893-Collision-API.patch
index e1980a48f2..e1980a48f2 100644
--- a/patches/server/0894-Collision-API.patch
+++ b/patches/server/0893-Collision-API.patch
diff --git a/patches/server/0895-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0894-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 3a5bf3be59..3a5bf3be59 100644
--- a/patches/server/0895-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0894-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0896-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0895-Fix-command-preprocess-cancelling-and-command-changi.patch
index 501d00e40b..501d00e40b 100644
--- a/patches/server/0896-Fix-command-preprocess-cancelling-and-command-changi.patch
+++ b/patches/server/0895-Fix-command-preprocess-cancelling-and-command-changi.patch
diff --git a/patches/server/0897-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0896-Remove-invalid-signature-login-stacktrace.patch
index 44d9c41c00..af4b5e1aec 100644
--- a/patches/server/0897-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0896-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 5fe9442810a354cde4516304cdee1ea80dc1e9e4..90ad59b8f387be37311dd3874c96568e2fb812e6 100644
+index dff440dc51724e85d9fea88a9602efcbb5450776..dfebe4ae6f19a36f2802195f2989a562c5570526 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -167,7 +167,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0898-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0897-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 05e9d349b8..05e9d349b8 100644
--- a/patches/server/0898-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0897-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0899-Block-Ticking-API.patch b/patches/server/0898-Block-Ticking-API.patch
index 43db29d605..43db29d605 100644
--- a/patches/server/0899-Block-Ticking-API.patch
+++ b/patches/server/0898-Block-Ticking-API.patch
diff --git a/patches/server/0900-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0899-Add-Velocity-IP-Forwarding-Support.patch
index 8e25ed523f..d651ad3104 100644
--- a/patches/server/0900-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0899-Add-Velocity-IP-Forwarding-Support.patch
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..5de2dabbc076a9482b1d6c299f1cff74
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 90ad59b8f387be37311dd3874c96568e2fb812e6..79d2bb3170c51e4c83a054eb8d47f894829a94d9 100644
+index dfebe4ae6f19a36f2802195f2989a562c5570526..36802586717613abfce9f23e0d2a405f0590ae6e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0901-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0900-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 73c43682a4..5d5ebb5ffd 100644
--- a/patches/server/0901-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0900-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 79d2bb3170c51e4c83a054eb8d47f894829a94d9..855eac5e6f3a99a2fc31ad0e02c496d4b5c60622 100644
+index 36802586717613abfce9f23e0d2a405f0590ae6e..b607f5ccbce10570f827dd21eb38504f42781d2f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -52,7 +52,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0902-Add-NamespacedKey-biome-methods.patch b/patches/server/0901-Add-NamespacedKey-biome-methods.patch
index 3266ac0fb2..3266ac0fb2 100644
--- a/patches/server/0902-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0901-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0903-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0902-Fix-plugin-loggers-on-server-shutdown.patch
index c1b345f505..1ebabbd92c 100644
--- a/patches/server/0903-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0902-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aad7ebbfce1bd42a3e61e5336f57aec26d82dad8..10327586027c8acab99afa90475de2c1a76c40c3 100644
+index 60a84de276885009310904afc90516d6106458d1..ce81ba5345c8d2fde8a2534b9673275c7e86af8b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -997,6 +997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0904-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0903-Workaround-for-client-lag-spikes-MC-162253.patch
index ca03701582..ca03701582 100644
--- a/patches/server/0904-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/server/0903-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0905-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0904-Stop-large-look-changes-from-crashing-the-server.patch
index 136e71286b..430fec0edb 100644
--- a/patches/server/0905-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0904-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,10 +6,10 @@ 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 33c22f908440664dc9d67f1678a3c4bd8b862457..1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c 100644
+index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e6398186bc3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3008,37 +3008,15 @@ public abstract class LivingEntity extends Entity {
+@@ -3011,37 +3011,15 @@ public abstract class LivingEntity extends Entity {
          this.level.getProfiler().pop();
          this.level.getProfiler().push("rangeChecks");
  
diff --git a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0905-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index 6a427b822d..f5809b775f 100644
--- a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/server/0905-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f2e5164b0651963cb26e4d776ec5c6e30647790f..a508619e6855ee0b96a9bf61526b1b88abf0e732 100644
+index 781c0e10b523c55989f368b4507137343dcffdab..968aa80b57a31d89852c6f4bc0ec5ed4a98c6530 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1008,13 +1008,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0907-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0906-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
index 0bdc6667a6..0bdc6667a6 100644
--- a/patches/server/0907-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
+++ b/patches/server/0906-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0908-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0907-Fire-EntityChangeBlockEvent-in-more-places.patch
index 35c92f85b3..35c92f85b3 100644
--- a/patches/server/0908-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0907-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0909-Missing-eating-regain-reason.patch b/patches/server/0908-Missing-eating-regain-reason.patch
index 1f8bd2bc7b..1f8bd2bc7b 100644
--- a/patches/server/0909-Missing-eating-regain-reason.patch
+++ b/patches/server/0908-Missing-eating-regain-reason.patch
diff --git a/patches/server/0910-Missing-effect-cause.patch b/patches/server/0909-Missing-effect-cause.patch
index 70a763eeb3..70a763eeb3 100644
--- a/patches/server/0910-Missing-effect-cause.patch
+++ b/patches/server/0909-Missing-effect-cause.patch
diff --git a/patches/server/0911-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0910-Added-byte-array-serialization-deserialization-for-P.patch
index 3553cbd00c..3553cbd00c 100644
--- a/patches/server/0911-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0910-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0912-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0911-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 8e7053e1f5..8e7053e1f5 100644
--- a/patches/server/0912-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0911-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0913-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0912-Call-BlockPhysicsEvent-more-often.patch
index 532418a20f..532418a20f 100644
--- a/patches/server/0913-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0912-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0914-Configurable-chat-thread-limit.patch b/patches/server/0913-Configurable-chat-thread-limit.patch
index a5344da3a6..a5344da3a6 100644
--- a/patches/server/0914-Configurable-chat-thread-limit.patch
+++ b/patches/server/0913-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0915-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0914-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index b571f18f1d..b571f18f1d 100644
--- a/patches/server/0915-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0914-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0915-Set-position-before-player-sending-on-dimension-chan.patch
index ecc49e7279..ecc49e7279 100644
--- a/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/server/0915-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0917-fix-Jigsaw-block-kicking-user.patch b/patches/server/0916-fix-Jigsaw-block-kicking-user.patch
index 846e244a93..846e244a93 100644
--- a/patches/server/0917-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0916-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0918-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0917-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 9e935dca74..9e935dca74 100644
--- a/patches/server/0918-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0917-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0918-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
index 517828b9b3..517828b9b3 100644
--- a/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
+++ b/patches/server/0918-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0920-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0919-Fix-a-bunch-of-vanilla-bugs.patch
index 58087b1dd3..ff0ed12381 100644
--- a/patches/server/0920-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0919-Fix-a-bunch-of-vanilla-bugs.patch
@@ -45,7 +45,7 @@ index 43e77cef0fce75f59aeb05e161668bebb8fca229..ef50fbf8cb3f008827850b5ed3342200
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5..962a6dfed8496959b3f7eac12c7f55fb1b9c57d1 100644
+index c17d9a7cb69d3b6ea6e17b689921fa239db3552b..a4690391df0aa26abea1ad92e6143eb19c5d1143 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -211,9 +211,10 @@ public class Goat extends Animal {
diff --git a/work/Bukkit b/work/Bukkit
-Subproject c7c11188610b4b0a59d090b06cabdc239337dcb
+Subproject 0994345029c4d127696616de3bab3e8044b0374
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject c2c39089eb639479327acb2c9f58bdfb69bc6b8
+Subproject aaf484f6fdb052306f7612bc0e721fa440d1b84