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

270 files changed, 57 insertions, 200 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